Update SimpleResultPart structure

[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 cecb57cbeb91db190fc75b8e11abdb3dab5b62d6..2e1ef8a77a49d22ef39d87dba9ce718f8f089db7 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
@@ -1,6 +1,7 @@
 package org.argeo.slc.unit.test.tree;\r
 \r
-import java.util.List;\r
+import org.apache.commons.logging.Log;\r
+import org.apache.commons.logging.LogFactory;\r
 \r
 import static junit.framework.Assert.assertEquals;\r
 import static junit.framework.Assert.assertNotNull;\r
@@ -17,6 +18,8 @@ import org.argeo.slc.core.test.tree.TreeTestResult;
 \r
 /** Utilities for unit tests. */\r
 public class UnitTestTreeUtil {\r
+       private final static Log log = LogFactory.getLog(UnitTestTreeUtil.class);\r
+\r
        public static void assertTreeTestResult(TreeTestResult expected,\r
                        TreeTestResult reached) {\r
                assertEquals(expected.getUuid(), reached.getUuid());\r
@@ -89,7 +92,7 @@ public class UnitTestTreeUtil {
                        fail("Not enough parts.");\r
                }\r
                SimpleResultPart part = (SimpleResultPart) list.getParts().get(index);\r
-               assertPart(part, status, message, null, null, part.getTestRunUuid());\r
+               assertPart(part, status, message, null, part.getTestRunUuid());\r
        }\r
 \r
        public static void assertPart(TestResultPart expected,\r
@@ -101,22 +104,30 @@ public class UnitTestTreeUtil {
                }\r
 \r
                assertPart(reached, expected.getStatus(), expected.getMessage(),\r
-                               expected.getExceptionMessage(), expected\r
-                                               .getExceptionStackLines(), expectedTestRunUuid);\r
+                               expected.getExceptionMessage(), expectedTestRunUuid);\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
-                       List<String> stackLines, String expectedTestRunUuid) {\r
+                       String expectedTestRunUuid) {\r
                assertEquals(status, part.getStatus());\r
+\r
+               if (log.isTraceEnabled()) {\r
+                       log.trace("Expected message:" + message);\r
+                       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
+                       }\r
+\r
                        assertEquals(exceptionDescription, part.getExceptionMessage());\r
-                       assertEquals(stackLines.size(), part.getExceptionStackLines()\r
-                                       .size());\r
                }\r
 \r
                if (expectedTestRunUuid != null) {\r