Various fixes so that SLC example works again

[gpl/argeo-slc.git] / org.argeo.slc.core / src / main / java / org / argeo / slc / unit / test / tree / UnitTestTreeUtil.java

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java
index 2e1ef8a77a49d22ef39d87dba9ce718f8f089db7..1862055fa7607fa413fdbd3ead8e0e0e3c8a2431 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java
@@ -74,15 +74,10 @@ public class UnitTestTreeUtil {
                }\r
        }\r
 \r
-       /**\r
-        * Assert one part of a tree test result.\r
-        * \r
-        * @deprecated use {@link #assertPart(TestResultPart, TestResultPart)}\r
-        *             instead\r
-        */\r
+       /** Asserts one part of a tree test result */\r
        public static void assertPart(TreeTestResult testResult, String pathStr,\r
                        int index, Integer status, String message) {\r
-               TreeSPath path = TreeSPath.parseToCreatePath(pathStr);\r
+               TreeSPath path = new TreeSPath(pathStr);\r
                PartSubList list = testResult.getResultParts().get(path);\r
                if (list == null) {\r
                        fail("No result for path " + path);\r
@@ -92,7 +87,7 @@ public class UnitTestTreeUtil {
                        fail("Not enough parts.");\r
                }\r
                SimpleResultPart part = (SimpleResultPart) list.getParts().get(index);\r
-               assertPart(part, status, message, null, part.getTestRunUuid());\r
+               assertPart(part, status, message, null, part.getTestRunUuid(), true);\r
        }\r
 \r
        public static void assertPart(TestResultPart expected,\r
@@ -104,13 +99,13 @@ public class UnitTestTreeUtil {
                }\r
 \r
                assertPart(reached, expected.getStatus(), expected.getMessage(),\r
-                               expected.getExceptionMessage(), expectedTestRunUuid);\r
+                               expected.getExceptionMessage(), expectedTestRunUuid, false);\r
        }\r
 \r
        /** Assert one part of a tree test result. */\r
        private static void assertPart(TestResultPart part, Integer status,\r
                        String message, String exceptionDescription,\r
-                       String expectedTestRunUuid) {\r
+                       String expectedTestRunUuid, boolean skipExceptionMessage) {\r
                assertEquals(status, part.getStatus());\r
 \r
                if (log.isTraceEnabled()) {\r
@@ -118,16 +113,19 @@ public class UnitTestTreeUtil {
                        log.trace("Reached message:" + part.getMessage());\r
                }\r
                assertEquals(message, part.getMessage());\r
-               if (exceptionDescription == null) {\r
-                       assertNull(part.getExceptionMessage());\r
-               } else {\r
-                       if (log.isTraceEnabled()) {\r
-                               log.trace("Expected exception message:" + exceptionDescription);\r
-                               log.trace("Reached exception message:"\r
-                                               + part.getExceptionMessage());\r
+               if (!skipExceptionMessage) {\r
+                       if (exceptionDescription == null) {\r
+                               assertNull(part.getExceptionMessage());\r
+                       } else {\r
+                               if (log.isTraceEnabled()) {\r
+                                       log.trace("Expected exception message:"\r
+                                                       + exceptionDescription);\r
+                                       log.trace("Reached exception message:"\r
+                                                       + part.getExceptionMessage());\r
+                               }\r
+\r
+                               assertEquals(exceptionDescription, part.getExceptionMessage());\r
                        }\r
-\r
-                       assertEquals(exceptionDescription, part.getExceptionMessage());\r
                }\r
 \r
                if (expectedTestRunUuid != null) {\r