You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2015/09/22 19:42:45 UTC
svn commit: r1704674 - in /qpid/java/trunk/perftests/src:
main/java/org/apache/qpid/disttest/results/ResultsXmlWriter.java
test/java/org/apache/qpid/disttest/results/ResultsXmlWriterTest.java
Author: kwall
Date: Tue Sep 22 17:42:42 2015
New Revision: 1704674
URL: http://svn.apache.org/viewvc?rev=1704674&view=rev
Log:
QPID-6732: [Java Perf Tests] Fix failing unit test on IBM JDK
Modified:
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/results/ResultsXmlWriter.java
qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsXmlWriterTest.java
Modified: qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/results/ResultsXmlWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/results/ResultsXmlWriter.java?rev=1704674&r1=1704673&r2=1704674&view=diff
==============================================================================
--- qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/results/ResultsXmlWriter.java (original)
+++ qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/results/ResultsXmlWriter.java Tue Sep 22 17:42:42 2015
@@ -84,6 +84,7 @@ public class ResultsXmlWriter implements
{
DocumentBuilder docBuilder = _docFactory.newDocumentBuilder();
Document doc = docBuilder.newDocument();
+ doc.setXmlStandalone(true);
Element root = doc.createElement("testsuite");
root.setAttribute("tests", Integer.toString(resultsForAllTests.getTestResults().size()));
@@ -118,6 +119,7 @@ public class ResultsXmlWriter implements
Transformer transformer = _transformerFactory.newTransformer();
transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+ transformer.setOutputProperty(OutputKeys.DOCTYPE_PUBLIC, "yes");
transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
DOMSource source = new DOMSource(doc);
StreamResult result = new StreamResult(new File(outputFile));
Modified: qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsXmlWriterTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsXmlWriterTest.java?rev=1704674&r1=1704673&r2=1704674&view=diff
==============================================================================
--- qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsXmlWriterTest.java (original)
+++ qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsXmlWriterTest.java Tue Sep 22 17:42:42 2015
@@ -47,14 +47,14 @@ public class ResultsXmlWriterTest extend
{
ResultsForAllTests resultsForAllTests = mock(ResultsForAllTests.class);
- String expectedCsvContents = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
- + "<testsuite tests=\"0\"/>\n";
+ String expectedXmlContent = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+ + "<testsuite tests=\"0\"/>\n";
_resultsFileWriter.writeResults(resultsForAllTests, "config.json");
File resultsFile = new File(_outputDir, "config.xml");
- assertEquals(expectedCsvContents, FileUtils.readFileAsString(resultsFile));
+ assertEquals(expectedXmlContent, FileUtils.readFileAsString(resultsFile));
}
public void testResultForOneTest()
@@ -65,16 +65,16 @@ public class ResultsXmlWriterTest extend
ResultsForAllTests resultsForAllTests = mock(ResultsForAllTests.class);
when(resultsForAllTests.getTestResults()).thenReturn(Collections.singletonList(test));
- String expectedCsvContents = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
- + "<testsuite tests=\"1\">\n"
- + " <testcase classname=\"config.json\" name=\"mytest\"/>\n"
- + "</testsuite>\n";
+ String expectedXmlContent = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+ + "<testsuite tests=\"1\">\n"
+ + " <testcase classname=\"config.json\" name=\"mytest\"/>\n"
+ + "</testsuite>\n";
_resultsFileWriter.writeResults(resultsForAllTests, "config.json");
File resultsFile = new File(_outputDir, "config.xml");
- assertEquals(expectedCsvContents, FileUtils.readFileAsString(resultsFile));
+ assertEquals(expectedXmlContent, FileUtils.readFileAsString(resultsFile));
}
public void testResultForOneTestWithError()
@@ -91,7 +91,7 @@ public class ResultsXmlWriterTest extend
ResultsForAllTests resultsForAllTests = mock(ResultsForAllTests.class);
when(resultsForAllTests.getTestResults()).thenReturn(Collections.singletonList(test));
- String expectedCsvContents = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
+ String expectedXmlContent = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+ "<testsuite tests=\"1\">\n"
+ " <testcase classname=\"config.json\" name=\"mytest\">\n"
+ " <error message=\"something went wrong\"/>\n"
@@ -102,7 +102,7 @@ public class ResultsXmlWriterTest extend
File resultsFile = new File(_outputDir, "config.xml");
- assertEquals(expectedCsvContents, FileUtils.readFileAsString(resultsFile));
+ assertEquals(expectedXmlContent, FileUtils.readFileAsString(resultsFile));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org