Commit 3da34d7f authored by Philip Makedonski's avatar Philip Makedonski
Browse files

+ updated version

parent 43417408

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

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
  <ConfigurationProfiles>

    <QualityCheckProfile>

      <profileName>stf160Profile</profileName>

      <profileVersion>v2.1.0b4</profileVersion>

      <profileVersion>v2.1.0b5</profileVersion>

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

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

      <!-- added pattern for files generated from ASN.1 -->
@@ -149,7 +149,7 @@ 
    </QualityCheckProfile>

    <QualityCheckProfile>

      <profileName>defaultProfile</profileName>

      <profileVersion>v2.1.0b4</profileVersion>

      <profileVersion>v2.1.0b5</profileVersion>

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

      <settingAbortOnError>true</settingAbortOnError>

      <loggingConfiguration>
@@ -273,7 +273,7 @@ 
    </QualityCheckProfile>

    <QualityCheckProfile>

      <profileName>nothing</profileName>

      <profileVersion>v2.1.0b4</profileVersion>

      <profileVersion>v2.1.0b5</profileVersion>

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

      <settingAbortOnError>true</settingAbortOnError>

      <loggingConfiguration>

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

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
  <ConfigurationProfiles>

    <QualityCheckProfile>

      <profileName>stf160Profile</profileName>

      <profileVersion>v2.1.0b4</profileVersion>

      <profileVersion>v2.1.0b5</profileVersion>

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

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

      <!-- added pattern for files generated from ASN.1 -->
@@ -149,7 +149,7 @@ 
    </QualityCheckProfile>

    <QualityCheckProfile>

      <profileName>defaultProfile</profileName>

      <profileVersion>v2.1.0b4</profileVersion>

      <profileVersion>v2.1.0b5</profileVersion>

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

      <settingAbortOnError>true</settingAbortOnError>

      <loggingConfiguration>
@@ -273,7 +273,7 @@ 
    </QualityCheckProfile>

    <QualityCheckProfile>

      <profileName>nothing</profileName>

      <profileVersion>v2.1.0b4</profileVersion>

      <profileVersion>v2.1.0b5</profileVersion>

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

      <settingAbortOnError>true</settingAbortOnError>

      <loggingConfiguration>

de.ugoe.cs.swe.T3Q/config/t3q.cfg

+60 −47
Original line number Diff line number Diff line
@@ -2,15 +2,28 @@ 
  <ConfigurationProfiles>

    <QualityCheckProfile>

      <profileName>stf160Profile</profileName>

      <profileVersion>v2.1.0b2</profileVersion>

      <profileVersion>v2.1.0b5</profileVersion>

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

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

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

      <!-- added pattern for files generated from ASN.1 -->

      <ignoredResourceRegExp>((.*asn[.]json[.].*ttcn)|(.*[/\\]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>

      <checkNoUninitializedFieldsInTemplatesRecursion>true</checkNoUninitializedFieldsInTemplatesRecursion>

      <checkNoZeroOrMultipleFieldsInUnionTemplates>false</checkNoZeroOrMultipleFieldsInUnionTemplates>

      <checkNoUninitialisedVariables>false</checkNoUninitialisedVariables>

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

        <string>enumerated</string>

        <string>union</string> 

        <string>record of</string>

        <string>record</string>

        <string>set</string>

        <string>set of</string>

      </checkNoUninitialisedVariablesExclude>

      <checkLevelOfNestedCalls>true</checkLevelOfNestedCalls>

      <maxLevelOfNestedCalls>4</maxLevelOfNestedCalls>

      <maxLevelOfNestedCalls>5</maxLevelOfNestedCalls>

      <checkListedVariableDeclarations>true</checkListedVariableDeclarations>

      <checkInlineTemplates>true</checkInlineTemplates> <!-- this functionality MUST be revisited... -->

      <checkInlineTemplates>true</checkInlineTemplates>

      <settingAbortOnError>true</settingAbortOnError>

      <loggingConfiguration>

        <showFullPath>true</showFullPath>
@@ -25,16 +38,16 @@ 
      <featureListImportedModuleFileNames>false</featureListImportedModuleFileNames>

      <featureListImportingModuleNames>false</featureListImportingModuleNames>

      <featureListImportingModuleFileNames>false</featureListImportingModuleFileNames>

      <checkLogItemFormat>false</checkLogItemFormat>     <!-- original value: true -->

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

      <checkLogStatementFormat>true</checkLogStatementFormat>

      <processSubsequentLogStatementsAsOne>true</processSubsequentLogStatementsAsOne>

      <logFormatRegExp>[\*]{3}\s([fta]_[a-zA-Z0-9]+?):\s(INFO|WARNING|ERROR|PASS|FAIL|INCONC|TIMEOUT):\s.*?[\*]{3}</logFormatRegExp>

      <checkExternalFunctionInvocationPrecededByLogStatement>false</checkExternalFunctionInvocationPrecededByLogStatement>      <!-- original value: true -->

      <checkInconcOrFailSetVerdictPrecededByLog>false</checkInconcOrFailSetVerdictPrecededByLog>                                <!-- original value: true -->

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

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

      <checkNoLabelsOrGotoStatements>true</checkNoLabelsOrGotoStatements>

      <checkNoNestedAltStatements>true</checkNoNestedAltStatements>

      <maximumAllowedNestingDepth>1</maximumAllowedNestingDepth>     <!-- original value: 0 -->

      <checkNoPermutationKeyword>false</checkNoPermutationKeyword>   <!-- original value: true -->

      <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>
@@ -47,47 +60,37 @@ 
        <string>TimerInstance</string>

        <string>PortInstance</string>

      </localDefinitionTypes>

      <checkTypeDefOrderInGroup>false</checkTypeDefOrderInGroup>         <!-- original value: true -->

      <checkPortMessageGrouping>false</checkPortMessageGrouping>         <!-- original value: true -->

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

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

      <checkNoDuplicatedModuleDefinitionIdentifiers>true</checkNoDuplicatedModuleDefinitionIdentifiers>

      <checkZeroReferencedModuleDefinitions>false</checkZeroReferencedModuleDefinitions>        <!-- original value: true -->

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

      <zeroReferencedModuleDefinitionsExcludedRegExp></zeroReferencedModuleDefinitionsExcludedRegExp>

      <checkNoInlineTemplates>true</checkNoInlineTemplates>

      <checkNoOverSpecificRunsOnClauses>true</checkNoOverSpecificRunsOnClauses>

      

      <checkNoValueOfForValues>true</checkNoValueOfForValues> <!-- new feature, turn off by default -->

      

      <recursionInCheckNoOverSpecificRunsOnClauses>true</recursionInCheckNoOverSpecificRunsOnClauses>

      <aliasInCheckNoOverSpecificRunsOnClauses>true</aliasInCheckNoOverSpecificRunsOnClauses>

      <checkNoUnusedImports>true</checkNoUnusedImports>

      <checkNoUnusedFormalParameters>true</checkNoUnusedFormalParameters>

      <checkNoUnusedLocalDefinitions>true</checkNoUnusedLocalDefinitions>

      <checkNoUninitializedFieldsInTemplates>true</checkNoUninitializedFieldsInTemplates>

      <checkNoUninitialisedVariables>true</checkNoUninitialisedVariables>

      <checkNoUninitialisedVariablesExclude>

		<!--

        <string>enumerated</string>

        <string>union</string>

        <string>record of</string>

        <string>record</string>

        <string>set of</string>

        <string>set</string>

        -->

      </checkNoUninitialisedVariablesExclude>

      <checkNoValueOfForValues>true</checkNoValueOfForValues>

      <checkNoLiterals>false</checkNoLiterals>   <!-- original value: true -->

      <checkTypesAndValuesModuleContainmentCheck>false</checkTypesAndValuesModuleContainmentCheck>                      <!-- original value: true -->

      <checkTemplatesModuleContainmentCheck>false</checkTemplatesModuleContainmentCheck>                                <!-- original value: true -->

      <checkFunctionsModuleContainmentCheck>false</checkFunctionsModuleContainmentCheck>                                <!-- original value: true -->

      <checkFunctionsModuleContainmentCheckAllowExtFunction>true</checkFunctionsModuleContainmentCheckAllowExtFunction>

      <checkTestcasesModuleContainmentCheck>false</checkTestcasesModuleContainmentCheck>                                <!-- original value: true -->

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

      <checkModuleParamsModuleContainmentCheck>true</checkModuleParamsModuleContainmentCheck>

      <checkInterfaceModuleContainmentCheck>false</checkInterfaceModuleContainmentCheck>                                <!-- original value: true -->

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

      <checkTestSystemModuleContainmentCheck>true</checkTestSystemModuleContainmentCheck>

      <checkTestControlModuleContainmentCheck>true</checkTestControlModuleContainmentCheck>

      <checkTypesAndValuesModuleImportsLibNames>true</checkTypesAndValuesModuleImportsLibNames>                        <!-- original value: true -->

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

      <typesAndValuesImportsLibNamesRegExp>.*?LibCommon.*</typesAndValuesImportsLibNamesRegExp>

      <typesAndValuesImportsLibNamesExcludedRegExp>(.*?LibCommon.*)</typesAndValuesImportsLibNamesExcludedRegExp>       <!-- original value: true -->

      <checkTestcasesModuleImportsLibCommon__Sync>true</checkTestcasesModuleImportsLibCommon__Sync>

      <typesAndValuesImportsLibNamesExcludedRegExp>(.*?LibCommon.*)</typesAndValuesImportsLibNamesExcludedRegExp>       <!-- value on defaultProfile of t3q: true -->

      <checkTestcasesModuleImportsLibCommon__Sync>false</checkTestcasesModuleImportsLibCommon__Sync>

      <checkModuleSize>true</checkModuleSize>

      <maximumAllowedModuleSizeInBytes>200000</maximumAllowedModuleSizeInBytes>

      <maximumAllowedModuleSizeInBytes>350000</maximumAllowedModuleSizeInBytes>

      <checkNoTabs>true</checkNoTabs>

      <checkNamingConventions>true</checkNamingConventions>

      <namingConventionsConfig>
@@ -98,10 +101,10 @@ 
        <messageTemplateWithWildcardsRegExp></messageTemplateWithWildcardsRegExp>

        <derivedMessageTemplateRegExp></derivedMessageTemplateRegExp>

        <derivedMessageTemplateWithWildcardsRegExp></derivedMessageTemplateWithWildcardsRegExp>

        <stf160sendTemplateRegExp>(cs|cas|cms|crs)_(508|108|[A-Z]).*</stf160sendTemplateRegExp>

        <stf160receiveTemplateRegExp>(cr|car|cmr)_(508|108|[A-Z]).*</stf160receiveTemplateRegExp>

        <derivedStf160sendTemplateRegExp>(cds|cads|cdrs)_(508|108|[A-Z]).*</derivedStf160sendTemplateRegExp>

        <derivedStf160receiveTemplateRegExp>(cdr|cadr)_(508|108|[A-Z]).*</derivedStf160receiveTemplateRegExp>

        <stf160sendTemplateRegExp>(cs|cas|cms|crs)_(508|108|38508|[A-Z]).*</stf160sendTemplateRegExp>

        <stf160receiveTemplateRegExp>(cr|car|cmr)_(508|108|38508|[A-Z]).*</stf160receiveTemplateRegExp>

        <derivedStf160sendTemplateRegExp>(cds|cads|cdrs)_(508|108|38508|[A-Z]).*</derivedStf160sendTemplateRegExp>

        <derivedStf160receiveTemplateRegExp>(cdr|cadr)_(508|108|38508|[A-Z]).*</derivedStf160receiveTemplateRegExp>

        <signatureTemplateRegExp>s_[a-z].*</signatureTemplateRegExp>

        <portInstanceRegExp>[A-Z].*</portInstanceRegExp>

        <componentInstanceRegExp>[a-z].*</componentInstanceRegExp>
@@ -115,13 +118,15 @@ 
        <variableRegExp>(v_[A-Z].*|[i-nI-N])</variableRegExp>

        <componentVariableRegExp>vc_[A-Z].*</componentVariableRegExp>

        <timerRegExp>t_[A-Z].*</timerRegExp>

        <componentTimerRegExp>tc_[a-z].*</componentTimerRegExp>

        <componentTimerRegExp>tc_[A-Z].*</componentTimerRegExp>

        <moduleParameterRegExp>(pc|px)_.*</moduleParameterRegExp>

        <formalParameterRegExp>p_[A-Z].*</formalParameterRegExp>

        <enumeratedValueRegExp>.*</enumeratedValueRegExp>

      </namingConventionsConfig>

      <dependencyOutputPath>DOCUMENTATION</dependencyOutputPath>

      <pathFormattedOutputPath>FORMATTED</pathFormattedOutputPath>

      <titanCompilerPath>compiler</titanCompilerPath>      

      <jsonSchemaPath></jsonSchemaPath>

      <!-- formattingParameters>

        <tabs>false</tabs>

        <unixNewline>false</unixNewline>
@@ -144,8 +149,8 @@ 
    </QualityCheckProfile>

    <QualityCheckProfile>

      <profileName>defaultProfile</profileName>

      <profileVersion>v2.1.0b2</profileVersion>

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

      <profileVersion>v2.1.0b5</profileVersion>

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

      <settingAbortOnError>true</settingAbortOnError>

      <loggingConfiguration>

        <showFullPath>false</showFullPath>
@@ -190,6 +195,9 @@ 
      <zeroReferencedModuleDefinitionsExcludedRegExp></zeroReferencedModuleDefinitionsExcludedRegExp>

      <checkNoInlineTemplates>true</checkNoInlineTemplates>

      <checkNoOverSpecificRunsOnClauses>true</checkNoOverSpecificRunsOnClauses>

      

	  <checkNoValueOfForValues>true</checkNoValueOfForValues> <!-- new feature, turn off by default -->

      

      <recursionInCheckNoOverSpecificRunsOnClauses>true</recursionInCheckNoOverSpecificRunsOnClauses>

      <aliasInCheckNoOverSpecificRunsOnClauses>true</aliasInCheckNoOverSpecificRunsOnClauses>

      <checkNoUnusedImports>true</checkNoUnusedImports>
@@ -205,10 +213,9 @@ 
        <string>set of</string>

        <string>set</string>

      </checkNoUninitialisedVariablesExclude>

      <checkNoValueOfForValues>true</checkNoValueOfForValues>

      <checkNoLiterals>false</checkNoLiterals>

      <checkLevelOfNestedCalls>true</checkLevelOfNestedCalls>

      <maxLevelOfNestedCalls>4</maxLevelOfNestedCalls>

      <maxLevelOfNestedCalls>5</maxLevelOfNestedCalls>

      <checkInlineTemplates>true</checkInlineTemplates>

      <checkListedVariableDeclarations>false</checkListedVariableDeclarations>

      <checkTypesAndValuesModuleContainmentCheck>true</checkTypesAndValuesModuleContainmentCheck>
@@ -227,7 +234,7 @@ 
      <checkModuleSize>true</checkModuleSize>

      <maximumAllowedModuleSizeInBytes>10000</maximumAllowedModuleSizeInBytes>

      <checkNoTabs>true</checkNoTabs>

      <checkNamingConventions>false</checkNamingConventions>

      <checkNamingConventions>true</checkNamingConventions>

      <namingConventionsConfig>

        <moduleRegExp>[A-Z].*</moduleRegExp>

        <groupRegExp>[a-z].*</groupRegExp>
@@ -259,11 +266,13 @@ 
        <enumeratedValueRegExp>e_[a-z].*</enumeratedValueRegExp>

      </namingConventionsConfig>

      <pathFormattedOutputPath>FORMATTED</pathFormattedOutputPath>

      <titanCompilerPath>compiler</titanCompilerPath>

      <jsonSchemaPath></jsonSchemaPath>

    </QualityCheckProfile>

    <QualityCheckProfile>

      <profileName>nothing</profileName>

      <profileVersion>v2.1.0b2</profileVersion>

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

      <profileVersion>v2.1.0b5</profileVersion>

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

      <settingAbortOnError>true</settingAbortOnError>

      <loggingConfiguration>

        <showFullPath>false</showFullPath>
@@ -310,10 +319,13 @@ 
      <checkNoOverSpecificRunsOnClauses>false</checkNoOverSpecificRunsOnClauses>

      <recursionInCheckNoOverSpecificRunsOnClauses>false</recursionInCheckNoOverSpecificRunsOnClauses>

      <aliasInCheckNoOverSpecificRunsOnClauses>true</aliasInCheckNoOverSpecificRunsOnClauses>

      <checkNoValueOfForValues>false</checkNoValueOfForValues> <!-- new feature-->

      <checkNoUnusedImports>false</checkNoUnusedImports>

      <checkNoUnusedFormalParameters>false</checkNoUnusedFormalParameters>

      <checkNoUnusedLocalDefinitions>false</checkNoUnusedLocalDefinitions>

      <checkNoUninitializedFieldsInTemplates>true</checkNoUninitializedFieldsInTemplates>

      <checkNoUninitializedFieldsInTemplatesRecursion>false</checkNoUninitializedFieldsInTemplatesRecursion>

      <checkNoZeroOrMultipleFieldsInUnionTemplates>false</checkNoZeroOrMultipleFieldsInUnionTemplates>

      <checkNoUninitialisedVariables>true</checkNoUninitialisedVariables>

      <checkNoUninitialisedVariablesExclude>

        <string>enumerated</string>
@@ -323,10 +335,9 @@ 
        <string>set of</string>

        <string>set</string>

      </checkNoUninitialisedVariablesExclude>

      <checkNoValueOfForValues>false</checkNoValueOfForValues>

      <checkNoLiterals>false</checkNoLiterals>

      <checkLevelOfNestedCalls>false</checkLevelOfNestedCalls>

      <maxLevelOfNestedCalls>4</maxLevelOfNestedCalls>

      <maxLevelOfNestedCalls>5</maxLevelOfNestedCalls>

      <checkInlineTemplates>true</checkInlineTemplates>

      <checkListedVariableDeclarations>false</checkListedVariableDeclarations>

      <checkTypesAndValuesModuleContainmentCheck>false</checkTypesAndValuesModuleContainmentCheck>
@@ -377,6 +388,8 @@ 
        <enumeratedValueRegExp>e_[a-z].*</enumeratedValueRegExp>

      </namingConventionsConfig>

      <pathFormattedOutputPath>FORMATTED</pathFormattedOutputPath>

      <titanCompilerPath>compiler</titanCompilerPath>      

      <jsonSchemaPath></jsonSchemaPath>

    </QualityCheckProfile>    

  </ConfigurationProfiles>

  <defaultConfigurationProfile>all</defaultConfigurationProfile>

de.ugoe.cs.swe.T3Q/src/de/ugoe/cs/swe/T3Q/T3Q.java

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ import de.ugoe.cs.swe.scoping.TTCN3GlobalScopeProvider; 


public class T3Q {

	//TODO: externalise meta-data

	private static String versionNumber = "v2.1.0b4";

	private static String versionNumber = "v2.1.0b5";

	private static String supportedTTCN3Version = "4.10.1";

	// set during automated server builds -> no longer displayed or used..

	private static String buildStamp = "---BUILD_STAMP---";