MID-8842 ninja - removed obsolete test files

Evolveum · Jul 28, 2023 · 620bc6c · 620bc6c
1 parent e1010d2
commit 620bc6c
Show file tree

Hide file tree

Showing 34 changed files with 18 additions and 5,759 deletions.
diff --git a/tools/ninja/src/test/java/com/evolveum/midpoint/ninja/NinjaTestMixin.java b/tools/ninja/src/test/java/com/evolveum/midpoint/ninja/NinjaTestMixin.java
@@ -65,18 +65,18 @@ interface StreamValidator {
      * or for Native repository, but {@link #clearMidpointTestDatabase(ApplicationContext)} can be used in the preExecute block.
      */
     default void setupMidpointHome() throws IOException {
-        FileUtils.deleteDirectory(TARGET_HOME);
-
-        File baseHome = new File(RESOURCES_DIRECTORY, "midpoint-home");
-
-        FileUtils.copyDirectory(baseHome, TARGET_HOME);
-
-        // This tells Ninja to use the right config XML for Native repo.
-        // Ninja tests don't support test.config.file property as other midPoint tests.
-        String testConfigFile = System.getProperty("test.config.file");
-        if (testConfigFile != null) {
-            System.setProperty(MidpointConfiguration.MIDPOINT_CONFIG_FILE_PROPERTY, testConfigFile);
-        }
+//        FileUtils.deleteDirectory(TARGET_HOME);
+//
+//        File baseHome = new File(RESOURCES_DIRECTORY, "midpoint-home");
+//
+//        FileUtils.copyDirectory(baseHome, TARGET_HOME);
+//
+//        // This tells Ninja to use the right config XML for Native repo.
+//        // Ninja tests don't support test.config.file property as other midPoint tests.
+//        String testConfigFile = System.getProperty("test.config.file");
+//        if (testConfigFile != null) {
+//            System.setProperty(MidpointConfiguration.MIDPOINT_CONFIG_FILE_PROPERTY, testConfigFile);
+//        }
     }
 
     default void clearMidpointTestDatabase(ApplicationContext context) {

diff --git a/tools/ninja/src/test/java/com/evolveum/midpoint/ninja/VerifyUpgradeTest.java b/tools/ninja/src/test/java/com/evolveum/midpoint/ninja/VerifyUpgradeTest.java
@@ -52,7 +52,7 @@ public void test100VerifyFiles() throws Exception {
 
         when();
 
-        VerifyResult result = (VerifyResult) executeTest(NOOP_STREAM_VALIDATOR, EMPTY_STREAM_VALIDATOR,
+        MainResult mainResult = executeTest(NOOP_STREAM_VALIDATOR, EMPTY_STREAM_VALIDATOR,
                 "-v",
                 "-m", getMidpointHome(),
                 "verify",
@@ -63,6 +63,8 @@ public void test100VerifyFiles() throws Exception {
 
         then();
 
+        VerifyResult result = (VerifyResult) mainResult.getObject();
+
         Assertions.assertThat(result).isNotNull();
         Assertions.assertThat(result.getItemPriorityCount(UpgradePriority.OPTIONAL)).isEqualTo(1L);
 
@@ -134,14 +136,16 @@ public void test300VerifyObjects() throws Exception {
 
         when();
 
-        VerifyResult result = (VerifyResult) executeTest(NOOP_STREAM_VALIDATOR, EMPTY_STREAM_VALIDATOR,
+        MainResult mainResult = executeTest(NOOP_STREAM_VALIDATOR, EMPTY_STREAM_VALIDATOR,
                 "-v",
                 "-m", getMidpointHome(),
                 "verify",
                 "--report-style", "csv",
                 "--overwrite",
                 "--output", OUTPUT.getPath());
 
+        VerifyResult result = (VerifyResult) mainResult.getObject();
+
         Assertions.assertThat(result).isNotNull();
         Assertions.assertThat(result.getItemPriorityCount(UpgradePriority.OPTIONAL)).isEqualTo(1L);
 

diff --git a/tools/ninja/src/test/resources/midpoint-home/config.xml b/tools/ninja/src/test/resources/midpoint-home/config.xml
diff --git a/tools/ninja/src/test/resources/midpoint-home/keystore.jceks b/tools/ninja/src/test/resources/midpoint-home/keystore.jceks
diff --git a/tools/ninja/src/test/resources/midpoint-home/test-config-new-repo.xml b/tools/ninja/src/test/resources/midpoint-home/test-config-new-repo.xml
diff --git a/tools/ninja/src/test/resources/upgrade/midpoint-home/config.xml b/tools/ninja/src/test/resources/upgrade/midpoint-home/config.xml