Next clean up

WinCCOA_QualityChecks/data/ctrlPpCheck/rule/ctrl.xml

@@ -177,7 +177,7 @@
 </rule>
 <rule version="1">
 	<tokenlist>raw</tokenlist>
-	<pattern>makeError \( \S+ , \S+ , \S+ , 0 </pattern>
+	<pattern>makeError \( \S+ , 0 </pattern>
 	<message>
 	    <id>fatal_program_exit</id>
 		<severity>warning</severity>

WinCCOA_QualityChecks/msg/de_AT.utf8/QgBase.cat

@@ -1,6 +1,4 @@
 00001,QualityGates does not run successfully !!!
-00010,Assertion return error: $1
-00011,Assertion works: $1
 00020,The function $1 is not implemented.
 00021,Start quality gate $1.
 00022,Calculate sources for quality gate $1.

WinCCOA_QualityChecks/msg/de_AT.utf8/QgCtrlppCheck.cat

@@ -1,2 +1,26 @@
-assert.hasErr,$file
-reason.hasErr,$errText
+# an Ctrlppcheck error may contains following keys
+# possible values
+# id
+# severity
+# msg
+# verbose
+# path
+# path0
+# line
+# cwe
+# special case for logging
+# relPath - relative path in unix format
+
+#assertions are per severity (error, warning, style, performance, portability or information)
+assert.has_error,ERROR in $relPath at line $line
+reason.has_error,$msg ($id)
+assert.has_warning,WARNING in $relPath at line $line
+reason.has_warning,$msg ($id)
+assert.has_style,STYLE in $relPath at line $line
+reason.has_style,$msg ($id)
+assert.has_performance,PERFORMANCE in $relPath at line $line
+reason.has_performance,$msg ($id)
+assert.has_portability,PORTABILITY in $relPath at line $line
+reason.has_portability,$msg ($id)
+assert.has_information,INFO in $relPath at line $line
+reason.has_information,$msg ($id)

WinCCOA_QualityChecks/msg/de_AT.utf8/QgResult.cat

@@ -0,0 +1,3 @@
+00001,Assertion return error: $1
+00002,Assertion works: $1
+00003,Assertion return an acceptable error (known bug): $1

WinCCOA_QualityChecks/msg/de_AT.utf8/QgStaticCheck_OverloadedFiles.cat

@@ -1,6 +1,8 @@
-assert.isCheater,Check if file $location is overloaded.
-reason.isCheater,It is not allowed to overwrite WinCCOA-license check files: $file.name
-filesList,Files
+filesList,Check files in $projectPath
+# possible dollars
+# location - checked file relative path in Linux format
+# file.name - file name
+# file.isOverloadedFrom - the overloaded file (form sub project or WinCC OA)
 assert.isOverloaded,Check if file $location is overloaded.
 reason.isOverloaded,The file '$file.name' is overloaded from '$file.isOverloadedFrom'.
 assert.isOverloadedAllowed,Check if file $location is overloaded (allowed overloads).

WinCCOA_QualityChecks/msg/de_AT.utf8/QgSyntaxCheck.cat

@@ -1,3 +1,6 @@
+
+syntaxMsgs
+
 assert.missingFiles,Has files
 reason.missingFiles,Application doesn´t contain any scripts, libs or panels.
 syntaxMsgs,Details

WinCCOA_QualityChecks/msg/en_US.utf8/QgBase.cat

@@ -1,6 +1,4 @@
 00001,QualityGates does not run successfully !!!
-00010,Assertion return error: $1
-00011,Assertion works: $1
 00020,The function $1 is not implemented.
 00021,Start quality gate $1.
 00022,Calculate sources for quality gate $1.

WinCCOA_QualityChecks/msg/en_US.utf8/QgCtrlppCheck.cat

@@ -1,2 +1,26 @@
-assert.hasErr,$file
-reason.hasErr,$errText
+# an Ctrlppcheck error may contains following keys
+# possible values
+# id
+# severity
+# msg
+# verbose
+# path
+# path0
+# line
+# cwe
+# special case for logging
+# relPath - relative path in unix format
+
+#assertions are per severity (error, warning, style, performance, portability or information)
+assert.has_error,ERROR in $relPath at line $line
+reason.has_error,$msg ($id)
+assert.has_warning,WARNING in $relPath at line $line
+reason.has_warning,$msg ($id)
+assert.has_style,STYLE in $relPath at line $line
+reason.has_style,$msg ($id)
+assert.has_performance,PERFORMANCE in $relPath at line $line
+reason.has_performance,$msg ($id)
+assert.has_portability,PORTABILITY in $relPath at line $line
+reason.has_portability,$msg ($id)
+assert.has_information,INFO in $relPath at line $line
+reason.has_information,$msg ($id)

WinCCOA_QualityChecks/msg/en_US.utf8/QgResult.cat

@@ -0,0 +1,3 @@
+00001,Assertion return error: $1
+00002,Assertion works: $1
+00003,Assertion return an acceptable error (known bug): $1

WinCCOA_QualityChecks/msg/en_US.utf8/QgStaticCheck_OverloadedFiles.cat

@@ -1,6 +1,8 @@
-assert.isCheater,Check if file $location is overloaded.
-reason.isCheater,It is not allowed to overwrite WinCCOA-license check files: $file.name
-filesList,Files
+filesList,Check files in $projectPath
+# possible dollars
+# location - checked file relative path in Linux format
+# file.name - file name
+# file.isOverloadedFrom - the overloaded file (form sub project or WinCC OA)
 assert.isOverloaded,Check if file $location is overloaded.
 reason.isOverloaded,The file '$file.name' is overloaded from '$file.isOverloadedFrom'.
 assert.isOverloadedAllowed,Check if file $location is overloaded (allowed overloads).

WinCCOA_QualityChecks/scripts/QualityGates/StaticTests/QgOverloadedFilesCheck.ctl

@@ -12,6 +12,7 @@
 #uses "classes/QualityGates/Qg"
 #uses "classes/QualityGates/QgBase"
 #uses "classes/QualityGates/QgOverloadedFilesCheck/QgOverloadedFilesCheck"
+#uses "classes/QualityGates/QgResult"
 
 //--------------------------------------------------------------------------------
 // declare variables and constans
@@ -32,7 +33,7 @@ class QgStaticCheck_OverloadedFiles : QgBase
     if (QgBase::setUp())
       return -1;
 
-    QgVersionResult::showErrorsOnly = TRUE;
+    QgResult::showErrorsOnly = TRUE;
     return 0;
   }
 

WinCCOA_QualityChecks/scripts/QualityGates/StaticTests/QgPanelsCheck.ctl

@@ -44,7 +44,7 @@ class QgStaticPanelCheck : QgBase
     _panels.setDir(this.checkedPath + PANELS_REL_PATH);
 
     if (!_panels.exists())
-      setMinValidScore("QgStaticCheck_Panels", "assert.missingPanels", "reason.missingPanels");
+      this.setMinValidScore("QgStaticCheck_Panels", "missingPanels");
 
     return 0;
   }

WinCCOA_QualityChecks/scripts/QualityGates/StaticTests/QgPicturesCheck.ctl

@@ -43,7 +43,7 @@ class QgStaticCheck_Pictures : QgBase
     _pictures.setDir(this.checkedPath);
 
     if (!_pictures.exists())
-      setMinValidScore("QgStaticCheck_Pictures", "assert.missingPictures", "reason.missingPictures");
+      this.setMinValidScore("QgStaticCheck_Pictures", "missingPictures");
 
     return 0;
   }

WinCCOA_QualityChecks/scripts/QualityGates/StaticTests/QgScriptsCheck.ctl

@@ -44,6 +44,10 @@ class QgStaticCheck_Scripts : QgBase
       {
         this.checkedPath = PROJ_PATH + SCRIPTS_REL_PATH;
       }
+      else if (isdir(this.checkedPath + SCRIPTS_REL_PATH))
+      {
+        this.checkedPath = this.checkedPath + SCRIPTS_REL_PATH;
+      }
 
       _scriptsData.setDir(this.checkedPath);
       _scriptsData.setType(ScriptsDataType::scripts);
@@ -54,13 +58,19 @@ class QgStaticCheck_Scripts : QgBase
       {
         this.checkedPath = PROJ_PATH + LIBS_REL_PATH;
       }
+      else if (isdir(this.checkedPath + LIBS_REL_PATH))
+      {
+        this.checkedPath = this.checkedPath + LIBS_REL_PATH;
+      }
 
       _scriptsData.setDir(this.checkedPath);
       _scriptsData.setType(ScriptsDataType::libs);
     }
 
+    ogger.info(0, "Path to check", this.checkedPath));
+
     if (!_scriptsData.exists())
-      setMinValidScore(Qg::getId(), "assert.missingScripts", "reason.missingScripts");
+      this.setMinValidScore(Qg::getId(), "missingScripts");
 
     return 0;
   }
@@ -81,7 +91,7 @@ class QgStaticCheck_Scripts : QgBase
         isdir(this.checkedPath + LIBS_REL_PATH) && (_scriptsData.getCountOfSubDirs() <= 0))
     {
       // there are no scripts. Libs only and libs are checked in QgStaticCheck_Libs
-      setMinValidScore("QgStaticCheck_Scripts", "assert.missingScripts", "reason.missingScripts");
+      this.setMinValidScore("QgStaticCheck_Scripts", "missingScripts");
       return 0;
     }
 

WinCCOA_QualityChecks/scripts/libs/classes/QualityGates/AddOn/FileSys/QgAddOnResultsDir.ctl

@@ -10,8 +10,7 @@
 
 #uses "classes/FileSys/QgDir"
 #uses "classes/QualityGates/Qg"
-#uses "classes/QualityGates/QgApp"
-#uses "classes/QualityGates/AddOn/FileSys/QgAddOnSourceDir"
+#uses "classes/QualityGates/QgTest"
 
 class QgAddOnResultsDir
 {
@@ -100,18 +99,15 @@ class QgAddOnResultsDir
 
   public string getDirPath()
   {
-    if (_resultDir == "")
+    if (_resultDir != "")
+      return _resultDir;
+
+    if (!QgTest::isStartedByTestFramework())
     {
-      if (!Qg::isRunningOnJenkins())
-      {
-        // projPath should be used, when Jenkins is not used
-        _resultDir = makeNativePath(PROJ_PATH + DATA_REL_PATH + "QualityGates/" + _qgId + "/" + _buildNo + "/");
-      }
-      else
-      {
-        QgApp app  = QgApp::getAppFromProjName(PROJ);
-        _resultDir = makeNativePath(app.getSourcePath() + "QgResult/" + Qg::getId() + "/");
-      }
+      // When you start some locale tests, proj path will be used
+      // the test-framework does not need it, because results are stored in
+      // test-framework comform format automatically.
+      _resultDir = makeNativePath(PROJ_PATH + DATA_REL_PATH + "QualityGates/" + _qgId + "/" + _buildNo + "/");
     }
 
     return _resultDir;