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
\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
}\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
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(), true);\r
}\r
\r
public static void assertPart(TestResultPart expected,\r
}\r
\r
assertPart(reached, expected.getStatus(), expected.getMessage(),\r
- expected.getExceptionMessage(), expected\r
- .getExceptionStackLines(), 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
- List<String> stackLines, String expectedTestRunUuid) {\r
+ String expectedTestRunUuid, boolean skipExceptionMessage) {\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
- assertEquals(exceptionDescription, part.getExceptionMessage());\r
- assertEquals(stackLines.size(), part.getExceptionStackLines()\r
- .size());\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
\r
if (expectedTestRunUuid != null) {\r