diff --git a/test/nonreg/graphml/GraphmlTest.java b/test/nonreg/graphml/GraphmlTest.java index b411ceafe..6ee1431c7 100644 --- a/test/nonreg/graphml/GraphmlTest.java +++ b/test/nonreg/graphml/GraphmlTest.java @@ -25,7 +25,7 @@ public class GraphmlTest { private static final String TRIPLE_QUOTE = "\"\"\""; - protected String getXmlAndCheckXmlAndDescription(final String expectedDescription) + protected void checkXmlAndDescription(final String expectedDescription) throws IOException, UnsupportedEncodingException { final String actualResult = runPlantUML(expectedDescription); final String xmlExpected = readStringFromSourceFile(getDiagramFile(), "{{{", "}}}"); @@ -38,8 +38,6 @@ public class GraphmlTest { if (sortString(actualResult).equals(sortString(xmlExpected)) == false) { assertEquals(xmlExpected, actualResult, "Generated GraphML is not ok"); } - - return actualResult; } private String sortString(String s) { diff --git a/test/nonreg/graphml/component/GML0000_Test.java b/test/nonreg/graphml/component/GML0000_Test.java index 1defb06cb..40018e16f 100644 --- a/test/nonreg/graphml/component/GML0000_Test.java +++ b/test/nonreg/graphml/component/GML0000_Test.java @@ -33,12 +33,7 @@ public class GML0000_Test extends GraphmlTest { @Test void testSimple() throws IOException { - final String xml = getXmlAndCheckXmlAndDescription("(1 entities)"); - - // Those tests are ULGY: please improve them! - assertTrue(xml.contains("")); - assertTrue(xml.contains("")); + checkXmlAndDescription("(1 entities)"); } } diff --git a/test/nonreg/graphml/component/GML0001_Test.java b/test/nonreg/graphml/component/GML0001_Test.java index d139f9d8c..1ddf83368 100644 --- a/test/nonreg/graphml/component/GML0001_Test.java +++ b/test/nonreg/graphml/component/GML0001_Test.java @@ -35,13 +35,7 @@ public class GML0001_Test extends GraphmlTest { @Test void testSimple() throws IOException { - final String xml = getXmlAndCheckXmlAndDescription("(2 entities)"); - - // Those tests are ULGY: please improve them! - assertTrue(xml.contains("")); - assertTrue(xml.contains("")); - assertTrue(xml.contains("")); + checkXmlAndDescription("(2 entities)"); } }