Merge origin/master

cerberustesting · Dec 14, 2023 · f51c670 · f51c670
2 parents 87d473a + 04daf69
commit f51c670
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/.github/workflows/build_deploy_qa.yml b/.github/workflows/build_deploy_qa.yml
@@ -16,6 +16,13 @@ jobs:
     name: build and deploy
     runs-on: ubuntu-latest
     steps:
+    - name: Public IP
+      id: ip
+      uses: haythem/[email protected]
+    - name: Print Public IP
+      run: |
+        echo ${{ steps.ip.outputs.ipv4 }}
+        echo ${{ steps.ip.outputs.ipv6 }}
     - uses: actions/checkout@v2
     - name: Set up JDK 11
       uses: actions/setup-java@v2

diff --git a/source/src/main/java/org/cerberus/core/crud/dao/impl/TestCaseDAO.java b/source/src/main/java/org/cerberus/core/crud/dao/impl/TestCaseDAO.java
@@ -50,12 +50,7 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
 
 /**
@@ -845,7 +840,7 @@ public AnswerList<TestCase> readByVarious(String[] test, String[] app, String[]
                     testCase=this.loadFromResultSet(resultSet);
                     testCaseHashMap.put(testCase.getTest()+testCase.getTestcase(),testCase);
                 }
-                if (length <= 0) {
+                if (length > 0) {
                     for (Map.Entry mapentry : testCaseHashMap.entrySet()) {
                         if (testCaseList.size() < length) {
                             testCaseList.add((TestCase) mapentry.getValue());
@@ -856,6 +851,18 @@ public AnswerList<TestCase> readByVarious(String[] test, String[] app, String[]
                             testCaseList.add((TestCase) mapentry.getValue());
                     }
                 }
+                Collections.sort(testCaseList, new Comparator<TestCase>() {
+                    @Override
+                    public int compare(TestCase testCase1, TestCase testCase2) {
+                        int compareResult = String.valueOf(testCase1.getTest()).compareTo(String.valueOf(testCase2.getTest()));
+
+                        if (compareResult == 0) {
+                            compareResult = testCase1.getTestcase().compareTo(testCase2.getTestcase());
+                        }
+
+                        return compareResult;
+                    }
+                });
 
                 if (testCaseList.size() >= MAX_ROW_SELECTED) { // Result of SQl was limited by MAX_ROW_SELECTED constrain. That means that we may miss some lines in the resultList.
                     LOG.error("Partial Result in the query.");

diff --git a/source/src/main/java/org/cerberus/core/database/DocumentationDatabaseService.java b/source/src/main/java/org/cerberus/core/database/DocumentationDatabaseService.java
@@ -2982,7 +2982,8 @@ public ArrayList<String> getSqlDocumentation() {
         b.append(",('page_runtest','TargetMinor','','en','Target Minor','',NULL)");
         b.append(",('page_runtest','TargetMinor','','fa','هدف جزئی','',NULL)");
         b.append(",('page_runtest','TargetMinor','','fr','Version mineure Cible','',NULL)");
-        b.append(",('page_runtest','TargetMajor','','en','هدف اصلی','',NULL)");
+        b.append(",('page_runtest','TargetMajor','','en','TargetMajor','',NULL)");
+        b.append(",('page_runtest','TargetMajor','','fa','هدف اصلی','',NULL)");
         b.append(",('page_runtest','TargetMajor','','fr','Version majeure cible','',NULL)");
         b.append(",('page_runtest','test','','en','Test Folder','',NULL)");
         b.append(",('page_runtest','test','','fa','پوشه آزمون','',NULL)");