Repository: vxquery Updated Branches: refs/heads/master 53776ee95 -> 020a16a68
Adding the name for each test case Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/020a16a6 Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/020a16a6 Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/020a16a6 Branch: refs/heads/master Commit: 020a16a68a231370aa2a56ca6b1d15285cad97f0 Parents: 53776ee Author: Christina Pavlopoulou <[email protected]> Authored: Wed Jun 22 16:04:07 2016 -0700 Committer: Preston Carman <[email protected]> Committed: Thu Jun 23 13:44:51 2016 -0700 ---------------------------------------------------------------------- pom.xml | 2 +- .../main/java/org/apache/vxquery/xtest/TestCase.java | 15 +-------------- .../java/org/apache/vxquery/xtest/VXQueryTest.java | 2 +- .../org/apache/vxquery/xtest/VXQueryXMarkTest.java | 2 +- .../java/org/apache/vxquery/xtest/XMarkTest.java | 2 +- .../test/java/org/apache/vxquery/xtest/XQTSTest.java | 2 +- 6 files changed, 6 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/vxquery/blob/020a16a6/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0d06a71..feabafe 100644 --- a/pom.xml +++ b/pom.xml @@ -392,7 +392,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.7</version> + <version>4.11</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/vxquery/blob/020a16a6/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCase.java ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCase.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCase.java index b7295c7..1fd051a 100644 --- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCase.java +++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCase.java @@ -93,19 +93,6 @@ public class TestCase { } public String toString() { - StringBuilder buffer = new StringBuilder(); - buffer.append("TestCase {\n"); - buffer.append(" name = ").append(name).append('\n'); - buffer.append(" vars = {\n"); - for (Map.Entry<QName, File> e : extVars.entrySet()) { - try { - buffer.append(" ").append(e.getKey()).append(" = ").append(e.getValue().getCanonicalPath()) - .append('\n'); - } catch (IOException ex) { - } - } - buffer.append(" }\n"); - buffer.append("}"); - return buffer.toString(); + return getXQueryDisplayName(); } } http://git-wip-us.apache.org/repos/asf/vxquery/blob/020a16a6/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java index 3679aba..1b76e16 100644 --- a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java +++ b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java @@ -40,7 +40,7 @@ public class VXQueryTest extends AbstractXQueryTest { super(tc); } - @Parameters + @Parameters(name = "VXQueryTest {index}: {0}") public static Collection<Object[]> tests() throws Exception { JUnitTestCaseFactory jtcf_vxquery = new JUnitTestCaseFactory(getOptions()); Collection<Object[]> tests = jtcf_vxquery.getList(); http://git-wip-us.apache.org/repos/asf/vxquery/blob/020a16a6/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryXMarkTest.java ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryXMarkTest.java b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryXMarkTest.java index ac35a0c..0264e49 100644 --- a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryXMarkTest.java +++ b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryXMarkTest.java @@ -34,7 +34,7 @@ public class VXQueryXMarkTest extends AbstractXQueryTest { super(tc); } - @Parameters + @Parameters(name = "VXQueryXMarkTest {index}: {0}") public static Collection<Object[]> tests() throws Exception { JUnitTestCaseFactory jtcf_vxquery = new JUnitTestCaseFactory(getOptions()); Collection<Object[]> tests = jtcf_vxquery.getList(); http://git-wip-us.apache.org/repos/asf/vxquery/blob/020a16a6/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XMarkTest.java ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XMarkTest.java b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XMarkTest.java index 0753a79..18b84c8 100644 --- a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XMarkTest.java +++ b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XMarkTest.java @@ -34,7 +34,7 @@ public class XMarkTest extends AbstractXQueryTest { super(tc); } - @Parameters + @Parameters(name = "XMarkTest {index}: {0}") public static Collection<Object[]> tests() throws Exception { JUnitTestCaseFactory jtcf_vxquery = new JUnitTestCaseFactory(getOptions()); Collection<Object[]> tests = jtcf_vxquery.getList(); http://git-wip-us.apache.org/repos/asf/vxquery/blob/020a16a6/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XQTSTest.java ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XQTSTest.java b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XQTSTest.java index 0dc356b..1de0e2b 100644 --- a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XQTSTest.java +++ b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XQTSTest.java @@ -34,7 +34,7 @@ public class XQTSTest extends AbstractXQueryTest { super(tc); } - @Parameters + @Parameters(name = "XQTSTest {index}: {0}") public static Collection<Object[]> tests() throws Exception { JUnitTestCaseFactory jtcf_vxquery = new JUnitTestCaseFactory(getOptions()); Collection<Object[]> tests = jtcf_vxquery.getList();
