Oracle and SQL Server test adjustments

* Split app DeploymentCollectionResourceTest to test sorting and querying separately * Make sure that surefire reports are uploaded with unique names
flowable · Aug 1, 2024 · 936433b · 936433b
1 parent f70f947
commit 936433b
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/.github/workflows/oracle.yml b/.github/workflows/oracle.yml
@@ -74,5 +74,5 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ failure() && steps.test.conclusion == 'failure' }}
         with:
-          name: surefire-test-reports
+          name: surefire-test-reports-${{ matrix.oracle }}
           path: '**/target/surefire-reports/*'
diff --git a/.github/workflows/sql-server.yml b/.github/workflows/sql-server.yml
@@ -71,5 +71,5 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ failure() && steps.test.conclusion == 'failure' }}
         with:
-          name: surefire-test-reports
+          name: surefire-test-reports-${{ matrix.mssql }}
           path: '**/target/surefire-reports/*'
diff --git a/...t/java/org/flowable/app/rest/service/api/repository/DeploymentCollectionResourceTest.java b/...t/java/org/flowable/app/rest/service/api/repository/DeploymentCollectionResourceTest.java
@@ -87,6 +87,33 @@ public void testGetDeployments() throws Exception {
             // Check without tenantId filtering
             url = baseUrl + "?withoutTenantId=true";
             assertResultsPresentInDataResponse(url, firstDeployment.getId());
+        } finally {
+            // Always cleanup any created deployments, even if the test failed
+            List<AppDeployment> deployments = repositoryService.createDeploymentQuery().list();
+            for (AppDeployment deployment : deployments) {
+                repositoryService.deleteDeployment(deployment.getId(), true);
+            }
+        }
+    }
+
+    public void testGetDeploymentsSorting() throws Exception {
+
+        try {
+            // Alter time to ensure different deployTimes
+            Calendar yesterday = Calendar.getInstance();
+            yesterday.add(Calendar.DAY_OF_MONTH, -1);
+            appEngineConfiguration.getClock().setCurrentTime(yesterday.getTime());
+
+            AppDeployment firstDeployment = repositoryService.createDeployment().name("Deployment 1").category("DEF")
+                    .addClasspathResource("org/flowable/app/rest/service/api/repository/oneApp.app")
+                    .tenantId("acme")
+                    .deploy();
+
+            appEngineConfiguration.getClock().setCurrentTime(Calendar.getInstance().getTime());
+            AppDeployment secondDeployment = repositoryService.createDeployment().name("Deployment 2").category("ABC")
+                    .addClasspathResource("org/flowable/app/rest/service/api/repository/oneApp.app")
+                    .tenantId("myTenant")
+                    .deploy();
 
             // Check ordering by name
             CloseableHttpResponse response = executeRequest(