another fix for test initial objects test

Evolveum · Jan 18, 2023 · 8c09c65 · 8c09c65
1 parent d64a91f
commit 8c09c65
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/model/model-intest/pom.xml b/model/model-intest/pom.xml
@@ -259,6 +259,11 @@
             <artifactId>test-ng</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>

diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestInitialObjects.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestInitialObjects.java
@@ -7,8 +7,8 @@
 
 package com.evolveum.midpoint.model.intest;
 
-import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
@@ -47,16 +47,13 @@ public void testInitialObjects() throws Exception {
                 .getResources(INITIAL_OBJECTS_RESOURCE_PATTERN);
 
         for (Resource resource : resources) {
-            File file = resource.getFile();
-            if (file.isFile()) {
-                try {
-                    testInitialObject(validator, errorsSb, file);
-                } catch (Throwable e) {
-                    String msg = "Error processing file " + file.getName() + ": " + e.getMessage();
-                    logger.error(msg, e);
-                    displayException(msg, e);
-                    throw e;
-                }
+            try (InputStream is = resource.getInputStream()) {
+                testInitialObject(validator, errorsSb, is, resource.getFilename());
+            } catch (Throwable e) {
+                String msg = "Error processing file " + resource.getFilename() + ": " + e.getMessage();
+                logger.error(msg, e);
+                displayException(msg, e);
+                throw e;
             }
         }
 
@@ -65,16 +62,16 @@ public void testInitialObjects() throws Exception {
         }
     }
 
-    private <O extends ObjectType> void testInitialObject(ObjectValidator validator, StringBuilder errorsSb, File file) throws SchemaException, IOException {
-        PrismObject<O> object = prismContext.parseObject(file);
+    private <O extends ObjectType> void testInitialObject(ObjectValidator validator, StringBuilder errorsSb, InputStream is, String fileName) throws SchemaException, IOException {
+        PrismObject<O> object = prismContext.parserFor(is).xml().parse();
         ValidationResult validationResult = validator.validate(object);
         if (validationResult.isEmpty() || isIgnoredWarning(validationResult)) {
             display("Checked " + object + ": no warnings");
             return;
         }
         displayDumpable("Validation warnings for " + object, validationResult);
         for (ValidationItem valItem : validationResult.getItems()) {
-            errorsSb.append(file.getName());
+            errorsSb.append(fileName);
             errorsSb.append(" ");
             errorsSb.append(object);
             errorsSb.append(" ");