Commit 2514ade7 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

Merge branch 'dev' into 'master' 

Merge for release 2.1.0b2

See merge request swe/tools/t3tools/t3q!3
parents 357fd2bd b0f9d341

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ 
variables:

  # CI_TARGET_BRANCH: $CI_DEFAULT_BRANCH

  # CI_TARGET_BRANCH: "ttf-022"

  # DEV_CI_TARGET_BRANCH: "dev"

  DEV_CI_TARGET_BRANCH: "maven-integration"

  DEV_CI_TARGET_BRANCH: "dev"

#  DEV_CI_TARGET_BRANCH: "maven-integration"

  MAIN_CI_TARGET_BRANCH: "master"

  CI_TARGET_BRANCH: "${DEV_CI_TARGET_BRANCH}"

  SITE_LOCATION: "de.ugoe.cs.swe.TTCN3.repository/target"

de.ugoe.cs.swe.T3Q/T3Q (sample).launch

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="no"?>

<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">

    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>

    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

        <listEntry value="/de.ugoe.cs.swe.T3Q/src/de/ugoe/cs/swe/T3Q/T3Q.java"/>

    </listAttribute>

    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

        <listEntry value="1"/>

    </listAttribute>

    <stringAttribute key="org.eclipse.debug.ui.ATTR_CAPTURE_IN_FILE" value="${workspace_loc:/de.ugoe.cs.swe.T3Q/config}/XtextStandalone.log"/>

    <listAttribute key="org.eclipse.debug.ui.favoriteGroups">

        <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>

        <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>

    </listAttribute>

    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>

    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>

    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>

    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>

    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="de.ugoe.cs.swe.T3Q.T3Q"/>

    <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="de.ugoe.cs.swe.T3Q"/>

    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--config config/t3q.cfg --profile defaultProfile"/>

    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="de.ugoe.cs.swe.T3Q"/>

    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx4g"/>

    <stringAttribute key="yk-options" value="&#13;&#10;additional-options2=onexit\=snapshot&#13;&#10;"/>

</launchConfiguration>

de.ugoe.cs.swe.T3Q/T3Q.launch

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="no"?>

<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">

    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>

    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

        <listEntry value="/de.ugoe.cs.swe.T3Q/src/de/ugoe/cs/swe/T3Q/T3Q.java"/>

    </listAttribute>

    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

        <listEntry value="1"/>

    </listAttribute>

    <stringAttribute key="org.eclipse.debug.ui.ATTR_CAPTURE_IN_FILE" value="${workspace_loc:/de.ugoe.cs.swe.T3Q/config}/XtextStandalone.log"/>

    <listAttribute key="org.eclipse.debug.ui.favoriteGroups">

        <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>

        <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>

    </listAttribute>

    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>

    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>

    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>

    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>

    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="de.ugoe.cs.swe.T3Q.T3Q"/>

    <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="de.ugoe.cs.swe.T3Q"/>

    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--config config/t3q.cfg --profile defaultProfile"/>

    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="de.ugoe.cs.swe.T3Q"/>

    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx4g"/>

    <stringAttribute key="yk-options" value="&#13;&#10;additional-options2=onexit\=snapshot&#13;&#10;"/>

</launchConfiguration>

de.ugoe.cs.swe.T3Q/config/t3q-tf160-latest-next-new-features.xml

+9 −3
Original line number Diff line number Diff line
@@ -2,11 +2,12 @@ 
  <ConfigurationProfiles>

    <QualityCheckProfile>

      <profileName>stf160Profile</profileName>

      <profileVersion>v2.1.0b1</profileVersion>

      <profileVersion>v2.1.0b2</profileVersion>

      <!--  <resourceExtensionsRegExp>ttcn|ttcn3|3mp</resourceExtensionsRegExp> -->

      <!--    <projectExtension>t3p</projectExtension> -->

      <ignoredResourceRegExp>((.*[/\\]Common[/\\](IMS_LibSip|IMS_XSD)[/\\].*[.]ttcn)|(.*[/\\]Common[/\\](HTTP)[/\\]uri.*[.]ttcn)|(.*[/\\]LTE_A_R12[/\\](D2D_ProSe)[/\\]urn.*[.]ttcn)|(.*[/\\]IMS[/\\]XCAP_XSD[/\\].*[.]ttcn)|(.*[/\\]MCX[/\\]CommonXSD[/\\].*[.]ttcn)|(.*[/\\].*[/\\][Cc]ommon[/\\]TestcaseProperties.*[.]ttcn))</ignoredResourceRegExp>   

      <!--   <settingRecursiveProcessing>true</settingRecursiveProcessing>  -->

      <checkNoUninitializedFieldsInTemplates>true</checkNoUninitializedFieldsInTemplates>

      <checkNoUninitialisedVariables>false</checkNoUninitialisedVariables>

      <checkNoUninitialisedVariablesExclude>  <!--  to be discarded if checkNoUninitialisedVariables is true. If list is empty, no restrictions   -->

        <string>enumerated</string>
@@ -45,6 +46,7 @@ 
      <maximumAllowedNestingDepth>1</maximumAllowedNestingDepth>     <!-- value on defaultProfile of t3q: 0 -->

      <checkNoPermutationKeyword>false</checkNoPermutationKeyword>   <!-- value on defaultProfile of t3q: true -->

      <checkNoAnyTypeKeyword>true</checkNoAnyTypeKeyword>

      <checkNoAnyValueOrNoneInListValues>true</checkNoAnyValueOrNoneInListValues>

      <checkNoModifiedTemplateOfModifiedTemplate>true</checkNoModifiedTemplateOfModifiedTemplate>

      <checkNoAllKeywordInPortDefinitions>true</checkNoAllKeywordInPortDefinitions>

      <checkImportsComeFirst>true</checkImportsComeFirst>
@@ -142,7 +144,7 @@ 
    </QualityCheckProfile>

    <QualityCheckProfile>

      <profileName>defaultProfile</profileName>

      <profileVersion>v2.1.0b1</profileVersion>

      <profileVersion>v2.1.0b2</profileVersion>

      <ignoredResourceRegExp>(.*[/\\]Common[/\\](IMS_LibSip|IMS_XSD)[/\\].*[.]ttcn)</ignoredResourceRegExp>

      <settingAbortOnError>true</settingAbortOnError>

      <loggingConfiguration>
@@ -170,6 +172,7 @@ 
      <maximumAllowedNestingDepth>0</maximumAllowedNestingDepth>

      <checkNoPermutationKeyword>true</checkNoPermutationKeyword>

      <checkNoAnyTypeKeyword>true</checkNoAnyTypeKeyword>

      <checkNoAnyValueOrNoneInListValues>true</checkNoAnyValueOrNoneInListValues>

      <checkNoModifiedTemplateOfModifiedTemplate>true</checkNoModifiedTemplateOfModifiedTemplate>

      <checkNoAllKeywordInPortDefinitions>true</checkNoAllKeywordInPortDefinitions>

      <checkImportsComeFirst>true</checkImportsComeFirst>
@@ -195,6 +198,7 @@ 
      <checkNoUnusedImports>true</checkNoUnusedImports>

      <checkNoUnusedFormalParameters>true</checkNoUnusedFormalParameters>

      <checkNoUnusedLocalDefinitions>true</checkNoUnusedLocalDefinitions>

      <checkNoUninitializedFieldsInTemplates>true</checkNoUninitializedFieldsInTemplates>

      <checkNoUninitialisedVariables>true</checkNoUninitialisedVariables>

      <checkNoUninitialisedVariablesExclude>

        <string>enumerated</string>
@@ -260,7 +264,7 @@ 
    </QualityCheckProfile>

    <QualityCheckProfile>

      <profileName>nothing</profileName>

      <profileVersion>v2.1.0b1</profileVersion>

      <profileVersion>v2.1.0b2</profileVersion>

      <ignoredResourceRegExp>(.*[/\\]Common[/\\](IMS_LibSip|IMS_XSD)[/\\].*[.]ttcn)</ignoredResourceRegExp>

      <settingAbortOnError>true</settingAbortOnError>

      <loggingConfiguration>
@@ -288,6 +292,7 @@ 
      <maximumAllowedNestingDepth>0</maximumAllowedNestingDepth>

      <checkNoPermutationKeyword>false</checkNoPermutationKeyword>

      <checkNoAnyTypeKeyword>false</checkNoAnyTypeKeyword>

      <checkNoAnyValueOrNoneInListValues>true</checkNoAnyValueOrNoneInListValues>

      <checkNoModifiedTemplateOfModifiedTemplate>true</checkNoModifiedTemplateOfModifiedTemplate>

      <checkNoAllKeywordInPortDefinitions>false</checkNoAllKeywordInPortDefinitions>

      <checkImportsComeFirst>false</checkImportsComeFirst>
@@ -311,6 +316,7 @@ 
      <checkNoUnusedImports>false</checkNoUnusedImports>

      <checkNoUnusedFormalParameters>false</checkNoUnusedFormalParameters>

      <checkNoUnusedLocalDefinitions>false</checkNoUnusedLocalDefinitions>

      <checkNoUninitializedFieldsInTemplates>true</checkNoUninitializedFieldsInTemplates>

      <checkNoUninitialisedVariables>true</checkNoUninitialisedVariables>

      <checkNoUninitialisedVariablesExclude>

        <string>enumerated</string>

de.ugoe.cs.swe.T3Q/config/t3q-tf160-latest-next.xml

+9 −3
Original line number Diff line number Diff line
@@ -2,11 +2,12 @@ 
  <ConfigurationProfiles>

    <QualityCheckProfile>

      <profileName>stf160Profile</profileName>

      <profileVersion>v2.1.0b1</profileVersion>

      <profileVersion>v2.1.0b2</profileVersion>

      <!--  <resourceExtensionsRegExp>ttcn|ttcn3|3mp</resourceExtensionsRegExp> -->

      <!--    <projectExtension>t3p</projectExtension> -->

      <ignoredResourceRegExp>((.*[/\\]Common[/\\](IMS_LibSip|IMS_XSD)[/\\].*[.]ttcn)|(.*[/\\]Common[/\\](HTTP)[/\\]uri.*[.]ttcn)|(.*[/\\]LTE_A_R12[/\\](D2D_ProSe)[/\\]urn.*[.]ttcn)|(.*[/\\]IMS[/\\]XCAP_XSD[/\\].*[.]ttcn)|(.*[/\\]MCX[/\\]CommonXSD[/\\].*[.]ttcn)|(.*[/\\].*[/\\][Cc]ommon[/\\]TestcaseProperties.*[.]ttcn))</ignoredResourceRegExp>   

      <!--   <settingRecursiveProcessing>true</settingRecursiveProcessing>  -->

      <checkNoUninitializedFieldsInTemplates>false</checkNoUninitializedFieldsInTemplates>

      <checkNoUninitialisedVariables>false</checkNoUninitialisedVariables>

      <checkNoUninitialisedVariablesExclude>  <!--  to be discarded if checkNoUninitialisedVariables is true. If list is empty, no restrictions   -->

        <string>enumerated</string>
@@ -45,6 +46,7 @@ 
      <maximumAllowedNestingDepth>1</maximumAllowedNestingDepth>     <!-- value on defaultProfile of t3q: 0 -->

      <checkNoPermutationKeyword>false</checkNoPermutationKeyword>   <!-- value on defaultProfile of t3q: true -->

      <checkNoAnyTypeKeyword>true</checkNoAnyTypeKeyword>

      <checkNoAnyValueOrNoneInListValues>false</checkNoAnyValueOrNoneInListValues> <!-- new feature, turn off by default -->

      <checkNoModifiedTemplateOfModifiedTemplate>true</checkNoModifiedTemplateOfModifiedTemplate>

      <checkNoAllKeywordInPortDefinitions>true</checkNoAllKeywordInPortDefinitions>

      <checkImportsComeFirst>true</checkImportsComeFirst>
@@ -142,7 +144,7 @@ 
    </QualityCheckProfile>

    <QualityCheckProfile>

      <profileName>defaultProfile</profileName>

      <profileVersion>v2.1.0b1</profileVersion>

      <profileVersion>v2.1.0b2</profileVersion>

      <ignoredResourceRegExp>(.*[/\\]Common[/\\](IMS_LibSip|IMS_XSD)[/\\].*[.]ttcn)</ignoredResourceRegExp>

      <settingAbortOnError>true</settingAbortOnError>

      <loggingConfiguration>
@@ -170,6 +172,7 @@ 
      <maximumAllowedNestingDepth>0</maximumAllowedNestingDepth>

      <checkNoPermutationKeyword>true</checkNoPermutationKeyword>

      <checkNoAnyTypeKeyword>true</checkNoAnyTypeKeyword>

      <checkNoAnyValueOrNoneInListValues>false</checkNoAnyValueOrNoneInListValues> <!-- new feature, turn off by default -->

      <checkNoModifiedTemplateOfModifiedTemplate>true</checkNoModifiedTemplateOfModifiedTemplate>

      <checkNoAllKeywordInPortDefinitions>true</checkNoAllKeywordInPortDefinitions>

      <checkImportsComeFirst>true</checkImportsComeFirst>
@@ -195,6 +198,7 @@ 
      <checkNoUnusedImports>true</checkNoUnusedImports>

      <checkNoUnusedFormalParameters>true</checkNoUnusedFormalParameters>

      <checkNoUnusedLocalDefinitions>true</checkNoUnusedLocalDefinitions>

      <checkNoUninitializedFieldsInTemplates>false</checkNoUninitializedFieldsInTemplates>

      <checkNoUninitialisedVariables>true</checkNoUninitialisedVariables>

      <checkNoUninitialisedVariablesExclude>

        <string>enumerated</string>
@@ -260,7 +264,7 @@ 
    </QualityCheckProfile>

    <QualityCheckProfile>

      <profileName>nothing</profileName>

      <profileVersion>v2.1.0b1</profileVersion>

      <profileVersion>v2.1.0b2</profileVersion>

      <ignoredResourceRegExp>(.*[/\\]Common[/\\](IMS_LibSip|IMS_XSD)[/\\].*[.]ttcn)</ignoredResourceRegExp>

      <settingAbortOnError>true</settingAbortOnError>

      <loggingConfiguration>
@@ -288,6 +292,7 @@ 
      <maximumAllowedNestingDepth>0</maximumAllowedNestingDepth>

      <checkNoPermutationKeyword>false</checkNoPermutationKeyword>

      <checkNoAnyTypeKeyword>false</checkNoAnyTypeKeyword>

      <checkNoAnyValueOrNoneInListValues>false</checkNoAnyValueOrNoneInListValues> <!-- new feature, turn off by default -->

      <checkNoModifiedTemplateOfModifiedTemplate>true</checkNoModifiedTemplateOfModifiedTemplate>

      <checkNoAllKeywordInPortDefinitions>false</checkNoAllKeywordInPortDefinitions>

      <checkImportsComeFirst>false</checkImportsComeFirst>
@@ -311,6 +316,7 @@ 
      <checkNoUnusedImports>false</checkNoUnusedImports>

      <checkNoUnusedFormalParameters>false</checkNoUnusedFormalParameters>

      <checkNoUnusedLocalDefinitions>false</checkNoUnusedLocalDefinitions>

      <checkNoUninitializedFieldsInTemplates>false</checkNoUninitializedFieldsInTemplates>

      <checkNoUninitialisedVariables>true</checkNoUninitialisedVariables>

      <checkNoUninitialisedVariablesExclude>

        <string>enumerated</string>