Skip to content

Commit 359e6ae

Browse files
LarsEckartJayBazuziisidore
committed
. t simplify test
Co-authored-by: Jay Bazuzi <[email protected]> Co-authored-by: Llewellyn Falco <[email protected]>
1 parent f454e4f commit 359e6ae

File tree

1 file changed

+3
-37
lines changed

1 file changed

+3
-37
lines changed

approvaltests-tests/src/test/java/org/approvaltests/XmlFormattingTest.java

Lines changed: 3 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,9 @@
44
import org.junit.jupiter.api.Disabled;
55
import org.junit.jupiter.api.Test;
66

7-
import javax.xml.transform.OutputKeys;
8-
import javax.xml.transform.Source;
9-
import javax.xml.transform.Transformer;
10-
import javax.xml.transform.TransformerException;
11-
import javax.xml.transform.TransformerFactory;
12-
import javax.xml.transform.stream.StreamResult;
13-
import javax.xml.transform.stream.StreamSource;
14-
import java.io.IOException;
15-
import java.io.StringReader;
16-
import java.io.StringWriter;
17-
import java.io.Writer;
18-
197
class XmlFormattingTest
208
{
21-
@Disabled("SPIKE - continue next time")
9+
@Disabled("SPIKE for #466 - continue next time")
2210
@Test
2311
void xmlWithEmojiesAndAmpersands()
2412
{
@@ -29,29 +17,7 @@ void xmlWithEmojiesAndAmpersands()
2917
<emoji>😸</emoji>
3018
</a>
3119
""";
32-
String input = expected.replaceAll("\n", "").replace(" ", "");
33-
Approvals.verify(prettyPrint(input, 2), new Options().inline(expected));
34-
}
35-
private static String prettyPrint(String expected, int tabSize)
36-
{
37-
try
38-
{
39-
Source xmlInput = new StreamSource(new StringReader(expected));
40-
StringWriter stringWriter = new StringWriter();
41-
StreamResult xmlOutput = new StreamResult(stringWriter);
42-
TransformerFactory transformerFactory = TransformerFactory.newInstance();
43-
transformerFactory.setAttribute("indent-number", tabSize);
44-
Transformer transformer = transformerFactory.newTransformer();
45-
transformer.setOutputProperty(OutputKeys.INDENT, "yes");
46-
transformer.transform(xmlInput, xmlOutput);
47-
try (Writer writer = xmlOutput.getWriter())
48-
{
49-
return writer.toString();
50-
}
51-
}
52-
catch (TransformerException | IOException e)
53-
{
54-
return expected;
55-
}
20+
String minimizedXml = expected.replaceAll("\n", "").replace(" ", "");
21+
Approvals.verifyXml(minimizedXml, new Options().inline(expected));
5622
}
5723
}

0 commit comments

Comments
 (0)