backup me

.github/PULL_REQUEST_TEMPLATE/pull-request-template.md

@@ -37,13 +37,16 @@ If the issue is not fully described in Github, add more information here (justif
 Provide a clear description of how this change was tested.
 At minimum this should include proof that a computer has executed the changed lines.
 Ideally this should include an automated test or an explanation as to why this change has no tests.
+To execute all automated regressions tests start the script /WinCC_OA_Test/executeTests.cmd
+
 Note that automated test coverage is less than complete, so a successful PR build does not necessarily imply that a computer has executed the changed lines.
 If automated test coverage does not exist for the lines you are changing, **you must describe** the scenario(s) in which you manually tested the change.
 Currently is not possible to start automatic tests on every PR. Therefore provide the tests manually and paste the result (screenshot) here.
 
 For frontend changes, include screenshots of the relevant page(s) before and after the change.
 
 For refactoring and code cleanup changes, exercise the code before and after the change and verify the behavior remains the same.
+
 -->
 
 ### Proposed upgrade guidelines
@@ -70,6 +73,7 @@ N/A
 - [ ] There is automated testing or an explanation that explains why this change has no tests.
 - [ ] For dependency updates, there are links to external changelogs and, if possible, full differentials.
 - [ ] Any localizations are transferred to /msg/ files.
+- [ ] Automated tests has been executed and valid
 <!-- TBD
 - [ ] Changes in the interface are documented also as [examples](docs/examples/readme.md).
 -->

.gitignore

@@ -2,3 +2,10 @@ WinCCOA_QualityChecks/bin/ctrlppcheck/
 ctrlppcheck/build/
 # astyle backup files
 *.ctl.orig
+
+# WinCC OA Tests
+WinCC_OA_Test/Projects/Stored/
+WinCC_OA_Test/Results/
+WinCC_OA_Test/Projects/TfCustomizedQG/log/
+WinCC_OA_Test/Projects/TfCustomizedQG/config/config
+*.dump

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,7 @@
 00001,QualityGates does not run successfully !!!
 00010,Assertion return error: $1
 00011,Assertion works: $1
+00012,Assertion return an acceptable error (known bug): $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/QgStaticCheck_FunctionData.cat

@@ -4,5 +4,5 @@ assert.function.NLOC,NLOC (No. Lines Of Code)
 reason.function.NLOC,The function '$function.name()' has invalid lines of code ($function.NLOC)
 assert.function.countOfLines,Count of lines
 reason.function.countOfLines,The function '$function.name()' has invalid count of lines ($function.countOfLines)
-assert.function.paramCount,Count of parameters
+assert.function.paramCount,The function '$function.name()' has $function.paramCount parameter(s)
 reason.function.paramCount,The function '$function.name()' has too much parameters ($function.paramCount)

WinCCOA_QualityChecks/msg/en_US.utf8/QgBase.cat

@@ -1,6 +1,7 @@
 00001,QualityGates does not run successfully !!!
 00010,Assertion return error: $1
 00011,Assertion works: $1
+00012,Assertion returns an acceptable error (known bug): $1
 00020,The function $1 is not implemented.
 00021,Start quality gate $1.
 00022,Calculate sources for quality gate $1.

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,11 +58,17 @@ 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);
     }
 
+    throwError(makeError("", PRIO_INFO, ERR_CONTROL, 0, "Path to check", this.checkedPath));
+
     if (!_scriptsData.exists())
       setMinValidScore(Qg::getId(), "assert.missingScripts", "reason.missingScripts");
 

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,20 +99,17 @@ 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;
   }