stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8274606: Fix jaxp/javax/xml/jaxp/unittest/transform/SurrogateTest.java test

Browse Source 
Reviewed-by: joehw, shade
This commit is contained in:
Alex Kasko 2021-10-04 12:38:34 +00:00 committed by Aleksey Shipilev
parent 47bfc8aa93
commit 7eb0372e55
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/jaxp/javax/xml/jaxp/unittest/transform/SurrogateTest.java
View File

@ -26,8 +26,9 @@ package transform;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.InputStream; import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory; import javax.xml.parsers.SAXParserFactory;
@ -43,7 +44,7 @@ import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler; import org.xml.sax.helpers.DefaultHandler;
import static jaxp.library.JAXPTestUtilities.compareWithGold; import static jaxp.library.JAXPTestUtilities.compareWithGold;
import static jaxp.library.JAXPTestUtilities.compareStringWithGold; import static jaxp.library.JAXPTestUtilities.compareLinesWithGold;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.Listeners; import org.testng.annotations.Listeners;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -64,10 +65,11 @@ public class SurrogateTest {
public void toHTMLTest() throws Exception { public void toHTMLTest() throws Exception {
String out = "SurrogateTest1out.html"; String out = "SurrogateTest1out.html";
String expected = TEST_SRC + File.separator + "SurrogateTest1.html"; String expected = TEST_SRC + File.separator + "SurrogateTest1.html";
String xml = TEST_SRC + File.separator + "SurrogateTest1.xml";
String xsl = TEST_SRC + File.separator + "SurrogateTest1.xsl"; String xsl = TEST_SRC + File.separator + "SurrogateTest1.xsl";
try (FileInputStream tFis = new FileInputStream(xsl); try (FileInputStream tFis = new FileInputStream(xsl);
InputStream fis = this.getClass().getResourceAsStream("SurrogateTest1.xml"); InputStream fis = new FileInputStream(xml);
FileOutputStream fos = new FileOutputStream(out)) { FileOutputStream fos = new FileOutputStream(out)) {
Source tSrc = new StreamSource(tFis); Source tSrc = new StreamSource(tFis);
@ -79,7 +81,7 @@ public class SurrogateTest {
Result res = new StreamResult(fos); Result res = new StreamResult(fos);
t.transform(src, res); t.transform(src, res);
} }
compareWithGold(expected, out); Assert.assertTrue(compareWithGold(expected, out));
} }
@Test @Test
@ -90,15 +92,15 @@ public class SurrogateTest {
SAXParser sp = spf.newSAXParser(); SAXParser sp = spf.newSAXParser();
TestHandler th = new TestHandler(); TestHandler th = new TestHandler();
sp.parse(xmlFile, th); sp.parse(xmlFile, th);
compareStringWithGold(TEST_SRC + File.separator + "SurrogateTest2.txt", th.sb.toString()); Assert.assertTrue(compareLinesWithGold(TEST_SRC + File.separator + "SurrogateTest2.txt", th.lines));
} }
private static class TestHandler extends DefaultHandler { private static class TestHandler extends DefaultHandler {
private StringBuilder sb = new StringBuilder(); private List<String> lines = new ArrayList<>();
@Override @Override
public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
sb.append( localName + "@attr:" + attributes.getValue("attr") + '\n'); lines.add( localName + "@attr:" + attributes.getValue("attr"));
} }
} }
} }