Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package plexus-xml for openSUSE:Factory
checked in at 2024-06-06 12:33:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plexus-xml (Old)
and /work/SRC/openSUSE:Factory/.plexus-xml.new.24587 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plexus-xml"
Thu Jun 6 12:33:08 2024 rev:2 rq:1178803 version:3.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/plexus-xml/plexus-xml.changes 2024-03-14
17:47:38.955128783 +0100
+++ /work/SRC/openSUSE:Factory/.plexus-xml.new.24587/plexus-xml.changes
2024-06-06 12:33:18.981999833 +0200
@@ -1,0 +2,17 @@
+Wed Jun 5 11:54:36 UTC 2024 - Fridrich Strba <fst...@suse.com>
+
+- Update to upstream version 3.0.1
+ * Bug Fixes
+ + Allow nulls for write elements in MXSerializer
+ + Remove special chars from xml output
+ * Dependency updates
+ + Bump org.codehaus.plexus:plexus from 17 to 18
+ + Bump release-drafter/release-drafter from 5 to 6
+ + Bump parent to 17 and updates
+ * Maintenance
+ + Switch to Junit 5
+ + Switch to shared gh actions setup from master branch
+ * Build
+ + Deploy snapshots for 3.x branch
+
+-------------------------------------------------------------------
Old:
----
plexus-xml-3.0.0.tar.gz
New:
----
plexus-xml-3.0.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plexus-xml.spec ++++++
--- /var/tmp/diff_new_pack.uToH44/_old 2024-06-06 12:33:19.746027676 +0200
+++ /var/tmp/diff_new_pack.uToH44/_new 2024-06-06 12:33:19.750027822 +0200
@@ -17,7 +17,7 @@
Name: plexus-xml
-Version: 3.0.0
+Version: 3.0.1
Release: 0
Summary: Plexus XML Utilities
License: Apache-2.0
++++++ plexus-xml-3.0.0.tar.gz -> plexus-xml-3.0.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plexus-xml-plexus-xml-3.0.0/.github/release-drafter.yml
new/plexus-xml-plexus-xml-3.0.1/.github/release-drafter.yml
--- old/plexus-xml-plexus-xml-3.0.0/.github/release-drafter.yml 2023-09-11
19:52:41.000000000 +0200
+++ new/plexus-xml-plexus-xml-3.0.1/.github/release-drafter.yml 1970-01-01
01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-_extends: .github
-tag-template: plexus-utils-$NEXT_MINOR_VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plexus-xml-plexus-xml-3.0.0/.github/workflows/maven.yml
new/plexus-xml-plexus-xml-3.0.1/.github/workflows/maven.yml
--- old/plexus-xml-plexus-xml-3.0.0/.github/workflows/maven.yml 2023-09-11
19:52:41.000000000 +0200
+++ new/plexus-xml-plexus-xml-3.0.1/.github/workflows/maven.yml 2024-05-21
23:12:07.000000000 +0200
@@ -22,4 +22,12 @@
jobs:
build:
name: Build it
- uses: codehaus-plexus/.github/.github/workflows/maven.yml@v0.0.5
+ uses: codehaus-plexus/.github/.github/workflows/maven.yml@master
+
+ deploy:
+ name: Deploy
+ needs: build
+ uses: codehaus-plexus/.github/.github/workflows/maven-deploy.yml@master
+ with:
+ branch-to-deploy: 'refs/heads/3.x'
+ secrets: inherit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plexus-xml-plexus-xml-3.0.0/.github/workflows/release-drafter.yml
new/plexus-xml-plexus-xml-3.0.1/.github/workflows/release-drafter.yml
--- old/plexus-xml-plexus-xml-3.0.0/.github/workflows/release-drafter.yml
2023-09-11 19:52:41.000000000 +0200
+++ new/plexus-xml-plexus-xml-3.0.1/.github/workflows/release-drafter.yml
2024-05-21 23:12:07.000000000 +0200
@@ -1,12 +1,14 @@
-name: Release Drafter
+name: Release Drafter 3.x
on:
push:
branches:
- - master
+ - 3.x
jobs:
update_release_draft:
runs-on: ubuntu-latest
steps:
- - uses: release-drafter/release-drafter@v5
+ - uses: release-drafter/release-drafter@v6
+ with:
+ config-name: 'release-drafter-3.x.yml' # located in .github/ in
default branch
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plexus-xml-plexus-xml-3.0.0/pom.xml
new/plexus-xml-plexus-xml-3.0.1/pom.xml
--- old/plexus-xml-plexus-xml-3.0.0/pom.xml 2023-09-11 19:52:41.000000000
+0200
+++ new/plexus-xml-plexus-xml-3.0.1/pom.xml 2024-05-21 23:12:07.000000000
+0200
@@ -20,11 +20,11 @@
<parent>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus</artifactId>
- <version>13</version>
+ <version>18</version>
</parent>
<artifactId>plexus-xml</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1</version>
<name>Plexus XML Utilities</name>
<description>A collection of various utility classes to ease working with
XML in Maven 3.</description>
@@ -32,8 +32,8 @@
<scm>
<connection>scm:git:https://github.com/codehaus-plexus/plexus-xml.git</connection>
-
<developerConnection>scm:git:https://github.com/codehaus-plexus/plexus-xml.git</developerConnection>
- <tag>plexus-xml-3.0.0</tag>
+ <developerConnection>${project.scm.connection}</developerConnection>
+ <tag>plexus-xml-3.0.1</tag>
<url>https://github.com/codehaus-plexus/plexus-xml/tree/${project.scm.tag}/</url>
</scm>
<issueManagement>
@@ -48,32 +48,31 @@
</distributionManagement>
<properties>
-
<project.build.outputTimestamp>2023-09-11T17:52:31Z</project.build.outputTimestamp>
+
<project.build.outputTimestamp>2024-05-21T21:11:54Z</project.build.outputTimestamp>
</properties>
<dependencies>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>4.0.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
- <version>1.36</version>
+ <version>1.37</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId>
- <version>1.36</version>
+ <version>1.37</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.2</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>4.0.1</version>
<scope>test</scope>
</dependency>
</dependencies>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plexus-xml-plexus-xml-3.0.0/src/main/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriter.java
new/plexus-xml-plexus-xml-3.0.1/src/main/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriter.java
---
old/plexus-xml-plexus-xml-3.0.0/src/main/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriter.java
2023-09-11 19:52:41.000000000 +0200
+++
new/plexus-xml-plexus-xml-3.0.1/src/main/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriter.java
2024-05-21 23:12:07.000000000 +0200
@@ -23,9 +23,9 @@
import java.util.regex.Pattern;
/**
- * Implementation of XMLWriter which emits nicely formatted documents.
- *
+ * <p>Implementation of XMLWriter which emits nicely formatted documents.</p>
*
+ * <p>C0n control characters except <code>\n</code>, <code>\r</code>, and
<code>\t</code> are omitted from output</p>
*/
public class PrettyPrintXMLWriter implements XMLWriter {
/** Line separator ("\n" on UNIX) */
@@ -185,7 +185,7 @@
finishTag();
if (escapeXml) {
- text = escapeXml(text);
+ text = escapeXmlText(text);
}
write(StringUtils.unifyLineSeparators(text, lineSeparator));
@@ -225,10 +225,12 @@
private static final Pattern crlf = Pattern.compile(crlf_str);
- private static final Pattern lowers = Pattern.compile("([\000-\037])");
+ private static final Pattern lowers = Pattern.compile("([\\x00-\\x1F])");
+
+ private static final Pattern illegalC0Characters =
Pattern.compile("([\\x00-\\x08\\x0B-\\x0C\\x0E-\\x1F])");
private static String escapeXmlAttribute(String text) {
- text = escapeXml(text);
+ text = escapeXmlText(text);
// Windows
Matcher crlfmatcher = crlf.matcher(text);
@@ -245,6 +247,19 @@
return b.toString();
}
+
+ private static String escapeXmlText(String text) {
+ text = escapeXml(text);
+
+ Matcher matcher = illegalC0Characters.matcher(text);
+ StringBuffer b = new StringBuffer();
+ while (matcher.find()) {
+ matcher = matcher.appendReplacement(b, "");
+ }
+ matcher.appendTail(b);
+
+ return b.toString();
+ }
/** {@inheritDoc} */
@Override
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plexus-xml-plexus-xml-3.0.0/src/main/java/org/codehaus/plexus/util/xml/pull/MXSerializer.java
new/plexus-xml-plexus-xml-3.0.1/src/main/java/org/codehaus/plexus/util/xml/pull/MXSerializer.java
---
old/plexus-xml-plexus-xml-3.0.0/src/main/java/org/codehaus/plexus/util/xml/pull/MXSerializer.java
2023-09-11 19:52:41.000000000 +0200
+++
new/plexus-xml-plexus-xml-3.0.1/src/main/java/org/codehaus/plexus/util/xml/pull/MXSerializer.java
2024-05-21 23:12:07.000000000 +0200
@@ -24,6 +24,7 @@
* <li>PROPERTY_SERIALIZER_INDENTATION
* <li>PROPERTY_SERIALIZER_LINE_SEPARATOR
* </ul>
+ * <p>C0n control characters except <code>\n</code>, <code>\r</code>, and
<code>\t</code> are omitted from output</p>
*/
public class MXSerializer implements XmlSerializer {
protected static final String XML_URI =
"http://www.w3.org/XML/1998/namespace";;
@@ -853,6 +854,9 @@
// --- utility methods
protected void writeAttributeValue(String value, Writer out) throws
IOException {
+ if (value == null) {
+ return;
+ }
// .[apostrophe and <, & escaped],
final char quot = attributeUseApostrophe ? '\'' : '"';
final String quotEntity = attributeUseApostrophe ? "'" : """;
@@ -907,6 +911,9 @@
}
protected void writeElementContent(String text, Writer out) throws
IOException {
+ if (text == null) {
+ return;
+ }
// escape '<', '&', ']]>', <32 if necessary
int pos = 0;
for (int i = 0; i < text.length(); i++) {
@@ -943,19 +950,9 @@
// out.write(';');
// pos = i + 1;
} else {
- throw new IllegalStateException(
- "character " + Integer.toString(ch) + " is not
allowed in output" + getLocation());
- // in XML 1.1 legal are [#x1-#xD7FF]
- // if(ch > 0) {
- // if(i > pos) out.write(text.substring(pos, i));
- // out.write("&#");
- // out.write(Integer.toString(ch));
- // out.write(';');
- // pos = i + 1;
- // } else {
- // throw new IllegalStateException(
- // "character zero is not allowed in XML 1.1
output"+getLocation());
- // }
+ // skip special char
+ if (i > pos) out.write(text.substring(pos, i));
+ pos = i + 1;
}
}
if (seenBracket) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriterTest.java
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriterTest.java
---
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriterTest.java
2023-09-11 19:52:41.000000000 +0200
+++
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriterTest.java
2024-05-21 23:12:07.000000000 +0200
@@ -26,13 +26,13 @@
import java.util.NoSuchElementException;
import org.codehaus.plexus.util.StringUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Test of {@link org.codehaus.plexus.util.xml.PrettyPrintXMLWriter}
@@ -50,7 +50,7 @@
/**
* <p>setUp.</p>
*/
- @Before
+ @BeforeEach
public void setUp() {
initWriter();
}
@@ -58,7 +58,7 @@
/**
* <p>tearDown.</p>
*/
- @After
+ @AfterEach
public void tearDown() {
writer = null;
w = null;
@@ -175,7 +175,7 @@
public void testIssue51DetectJava7ConcatenationBug() throws IOException {
File dir = new File("target/test-xml");
if (!dir.exists()) {
- assertTrue("cannot create directory test-xml", dir.mkdir());
+ assertTrue(dir.mkdir(), "cannot create directory test-xml");
}
File xmlFile = new File(dir, "test-issue-51.xml");
OutputStreamWriter osw = new
OutputStreamWriter(Files.newOutputStream(xmlFile.toPath()), "UTF-8");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/XmlStreamReaderTest.java
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/XmlStreamReaderTest.java
---
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/XmlStreamReaderTest.java
2023-09-11 19:52:41.000000000 +0200
+++
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/XmlStreamReaderTest.java
2024-05-21 23:12:07.000000000 +0200
@@ -21,9 +21,12 @@
import java.io.InputStream;
import java.io.SequenceInputStream;
-import junit.framework.ComparisonFailure;
-import junit.framework.TestCase;
import org.codehaus.plexus.util.IOUtil;
+import org.junit.jupiter.api.Test;
+import org.opentest4j.AssertionFailedError;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* <p>XmlStreamReaderTest class.</p>
@@ -32,7 +35,7 @@
* @version $Id: $Id
* @since 3.4.0
*/
-public class XmlStreamReaderTest extends TestCase {
+public class XmlStreamReaderTest {
/** french */
private static final String TEXT_LATIN1 = "eacute: \u00E9";
@@ -111,6 +114,7 @@
*
* @throws java.io.IOException if any.
*/
+ @Test
public void testNoXmlHeader() throws IOException {
String xml = "<text>text with no XML header</text>";
checkXmlContent(xml, "UTF-8");
@@ -122,6 +126,7 @@
*
* @throws java.io.IOException if any.
*/
+ @Test
public void testDefaultEncoding() throws IOException {
checkXmlStreamReader(TEXT_UNICODE, null, "UTF-8");
checkXmlStreamReader(TEXT_UNICODE, null, "UTF-8", BOM_UTF8);
@@ -132,6 +137,7 @@
*
* @throws java.io.IOException if any.
*/
+ @Test
public void testUTF8Encoding() throws IOException {
checkXmlStreamReader(TEXT_UNICODE, "UTF-8");
checkXmlStreamReader(TEXT_UNICODE, "UTF-8", BOM_UTF8);
@@ -142,6 +148,7 @@
*
* @throws java.io.IOException if any.
*/
+ @Test
public void testUTF16Encoding() throws IOException {
checkXmlStreamReader(TEXT_UNICODE, "UTF-16", "UTF-16BE", null);
checkXmlStreamReader(TEXT_UNICODE, "UTF-16", "UTF-16LE", BOM_UTF16LE);
@@ -153,6 +160,7 @@
*
* @throws java.io.IOException if any.
*/
+ @Test
public void testUTF16BEEncoding() throws IOException {
checkXmlStreamReader(TEXT_UNICODE, "UTF-16BE");
}
@@ -162,6 +170,7 @@
*
* @throws java.io.IOException if any.
*/
+ @Test
public void testUTF16LEEncoding() throws IOException {
checkXmlStreamReader(TEXT_UNICODE, "UTF-16LE");
}
@@ -171,6 +180,7 @@
*
* @throws java.io.IOException if any.
*/
+ @Test
public void testLatin1Encoding() throws IOException {
checkXmlStreamReader(TEXT_LATIN1, "ISO-8859-1");
}
@@ -180,6 +190,7 @@
*
* @throws java.io.IOException if any.
*/
+ @Test
public void testLatin7Encoding() throws IOException {
checkXmlStreamReader(TEXT_LATIN7, "ISO-8859-7");
}
@@ -189,6 +200,7 @@
*
* @throws java.io.IOException if any.
*/
+ @Test
public void testLatin15Encoding() throws IOException {
checkXmlStreamReader(TEXT_LATIN15, "ISO-8859-15");
}
@@ -198,6 +210,7 @@
*
* @throws java.io.IOException if any.
*/
+ @Test
public void testEUC_JPEncoding() throws IOException {
checkXmlStreamReader(TEXT_EUC_JP, "EUC-JP");
}
@@ -207,6 +220,7 @@
*
* @throws java.io.IOException if any.
*/
+ @Test
public void testEBCDICEncoding() throws IOException {
checkXmlStreamReader("simple text in EBCDIC", "CP1047");
}
@@ -216,13 +230,13 @@
*
* @throws java.io.IOException if any.
*/
+ @Test
public void testInappropriateEncoding() throws IOException {
- try {
- checkXmlStreamReader(TEXT_UNICODE, "ISO-8859-2");
- fail("Check should have failed, since some characters are not
available in the specified encoding");
- } catch (ComparisonFailure cf) {
- // expected failure, since the encoding does not contain some
characters
- }
+ // expected failure, since the encoding does not contain some
characters
+ assertThrows(
+ AssertionFailedError.class,
+ () -> checkXmlStreamReader(TEXT_UNICODE, "ISO-8859-2"),
+ "Check should have failed, since some characters are not
available in the specified encoding");
}
/**
@@ -230,6 +244,7 @@
*
* @throws java.io.IOException if any.
*/
+ @Test
public void testEncodingAttribute() throws IOException {
String xml = "<?xml version='1.0' encoding='US-ASCII'?><element
encoding='attribute value'/>";
checkXmlContent(xml, "US-ASCII");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/XmlStreamWriterTest.java
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/XmlStreamWriterTest.java
---
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/XmlStreamWriterTest.java
2023-09-11 19:52:41.000000000 +0200
+++
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/XmlStreamWriterTest.java
2024-05-21 23:12:07.000000000 +0200
@@ -19,9 +19,9 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* <p>XmlStreamWriterTest class.</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/XmlUtilTest.java
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/XmlUtilTest.java
---
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/XmlUtilTest.java
2023-09-11 19:52:41.000000000 +0200
+++
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/XmlUtilTest.java
2024-05-21 23:12:07.000000000 +0200
@@ -27,10 +27,9 @@
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
/**
* Test the {@link org.codehaus.plexus.util.xml.XmlUtil} class.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/XmlWriterUtilTest.java
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/XmlWriterUtilTest.java
---
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/XmlWriterUtilTest.java
2023-09-11 19:52:41.000000000 +0200
+++
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/XmlWriterUtilTest.java
2024-05-21 23:12:07.000000000 +0200
@@ -21,12 +21,11 @@
import java.io.Writer;
import org.codehaus.plexus.util.StringUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
/**
* <p>XmlWriterUtilTest class.</p>
@@ -47,7 +46,7 @@
*
* @throws java.lang.Exception if any.
*/
- @Before
+ @BeforeEach
public void setUp() throws Exception {
output = new ByteArrayOutputStream();
writer = WriterFactory.newXmlWriter(output);
@@ -59,7 +58,7 @@
*
* @throws java.lang.Exception if any.
*/
- @After
+ @AfterEach
public void tearDown() throws Exception {
xmlWriter = null;
writer = null;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomBuilderTest.java
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomBuilderTest.java
---
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomBuilderTest.java
2023-09-11 19:52:41.000000000 +0200
+++
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomBuilderTest.java
2024-05-21 23:12:07.000000000 +0200
@@ -23,11 +23,9 @@
import org.codehaus.plexus.util.xml.pull.MXParser;
import org.codehaus.plexus.util.xml.pull.XmlPullParser;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
/**
* Test the Xpp3DomBuilder.
@@ -52,7 +50,7 @@
Xpp3Dom expectedDom = createExpectedDom();
- assertEquals("check DOMs match", expectedDom, dom);
+ assertEquals(expectedDom, dom, "check DOMs match");
}
/**
@@ -66,12 +64,11 @@
Xpp3Dom dom = Xpp3DomBuilder.build(new StringReader(domString), true);
- assertEquals("test with trimming on", "element1",
dom.getChild("el1").getValue());
+ assertEquals("element1", dom.getChild("el1").getValue(), "test with
trimming on");
dom = Xpp3DomBuilder.build(new StringReader(domString), false);
- assertEquals(
- "test with trimming off", " element1\n ",
dom.getChild("el1").getValue());
+ assertEquals(" element1\n ", dom.getChild("el1").getValue(), "test
with trimming off");
}
/**
@@ -116,10 +113,10 @@
eventType = parser.next();
}
- assertEquals("Check DOM matches", expectedDom, dom);
- assertFalse("Check closing root was consumed", rootClosed);
- assertTrue("Check continued to parse configuration",
configurationClosed);
- assertTrue("Check continued to parse newRoot", newRootClosed);
+ assertEquals(expectedDom, dom, "Check DOM matches");
+ assertFalse(rootClosed, "Check closing root was consumed");
+ assertTrue(configurationClosed, "Check continued to parse
configuration");
+ assertTrue(newRootClosed, "Check continued to parse newRoot");
}
/**
@@ -149,15 +146,13 @@
public void testEscapingInContent() throws IOException,
XmlPullParserException {
Xpp3Dom dom = Xpp3DomBuilder.build(new
StringReader(getEncodedString()));
- assertEquals("Check content value", "\"text\"",
dom.getChild("el").getValue());
- assertEquals(
- "Check content value", "<b>\"text\"</b>",
dom.getChild("ela").getValue());
- assertEquals(
- "Check content value", "<b>\"text\"</b>",
dom.getChild("elb").getValue());
+ assertEquals("\"text\"", dom.getChild("el").getValue(), "Check content
value");
+ assertEquals("<b>\"text\"</b>", dom.getChild("ela").getValue(), "Check
content value");
+ assertEquals("<b>\"text\"</b>", dom.getChild("elb").getValue(), "Check
content value");
StringWriter w = new StringWriter();
Xpp3DomWriter.write(w, dom);
- assertEquals("Compare stringified DOMs", getExpectedString(),
w.toString());
+ assertEquals(getExpectedString(), w.toString(), "Compare stringified
DOMs");
}
/**
@@ -171,12 +166,12 @@
String s = getAttributeEncodedString();
Xpp3Dom dom = Xpp3DomBuilder.build(new StringReader(s));
- assertEquals("Check attribute value", "<foo>",
dom.getChild("el").getAttribute("att"));
+ assertEquals("<foo>", dom.getChild("el").getAttribute("att"), "Check
attribute value");
StringWriter w = new StringWriter();
Xpp3DomWriter.write(w, dom);
String newString = w.toString();
- assertEquals("Compare stringified DOMs", newString, s);
+ assertEquals(newString, s, "Compare stringified DOMs");
}
/**
@@ -194,16 +189,16 @@
};
Xpp3Dom dom = Xpp3DomBuilder.build(new
StringReader(createDomString()), true, ilb);
Xpp3Dom expectedDom = createExpectedDom();
- assertEquals("root input location", expectedDom.getInputLocation(),
dom.getInputLocation());
+ assertEquals(expectedDom.getInputLocation(), dom.getInputLocation(),
"root input location");
for (int i = 0; i < dom.getChildCount(); i++) {
Xpp3Dom elt = dom.getChild(i);
Xpp3Dom expectedElt = expectedDom.getChild(i);
- assertEquals(elt.getName() + " input location",
expectedElt.getInputLocation(), elt.getInputLocation());
+ assertEquals(expectedElt.getInputLocation(),
elt.getInputLocation(), elt.getName() + " input location");
if ("el2".equals(elt.getName())) {
Xpp3Dom el3 = elt.getChild(0);
Xpp3Dom expectedEl3 = expectedElt.getChild(0);
- assertEquals(el3.getName() + " input location",
expectedEl3.getInputLocation(), el3.getInputLocation());
+ assertEquals(expectedEl3.getInputLocation(),
el3.getInputLocation(), el3.getName() + " input location");
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomTest.java
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomTest.java
---
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomTest.java
2023-09-11 19:52:41.000000000 +0200
+++
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomTest.java
2024-05-21 23:12:07.000000000 +0200
@@ -22,14 +22,9 @@
import org.codehaus.plexus.util.xml.pull.XmlPullParser;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
/**
* <p>Xpp3DomTest class.</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomUtilsTest.java
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomUtilsTest.java
---
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomUtilsTest.java
2023-09-11 19:52:41.000000000 +0200
+++
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomUtilsTest.java
2024-05-21 23:12:07.000000000 +0200
@@ -21,9 +21,9 @@
import org.codehaus.plexus.util.xml.pull.XmlPullParser;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* <p>Xpp3DomUtilsTest class.</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomWriterTest.java
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomWriterTest.java
---
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomWriterTest.java
2023-09-11 19:52:41.000000000 +0200
+++
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomWriterTest.java
2024-05-21 23:12:07.000000000 +0200
@@ -18,9 +18,9 @@
import java.io.StringWriter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* <p>Xpp3DomWriterTest class.</p>
@@ -41,7 +41,7 @@
Xpp3DomWriter.write(writer, createXpp3Dom());
- assertEquals("Check if output matches", createExpectedXML(true),
writer.toString());
+ assertEquals(createExpectedXML(true), writer.toString(), "Check if
output matches");
}
/**
@@ -53,7 +53,7 @@
Xpp3DomWriter.write(new PrettyPrintXMLWriter(writer), createXpp3Dom(),
false);
- assertEquals("Check if output matches", createExpectedXML(false),
writer.toString());
+ assertEquals(createExpectedXML(false), writer.toString(), "Check if
output matches");
}
private String createExpectedXML(boolean escape) {
@@ -82,6 +82,12 @@
buf.append(LS);
buf.append(" </el6>");
buf.append(LS);
+ if (escape) {
+ buf.append(" <el8>special-char-</el8>");
+ } else {
+ buf.append(" <el8>special-char-" + (char) 7 + "</el8>");
+ }
+ buf.append(LS);
buf.append("</root>");
return buf.toString();
@@ -95,7 +101,7 @@
dom.addChild(el1);
Xpp3Dom el2 = new Xpp3Dom("el2");
- el2.setAttribute("att2", "attribute2\nnextline");
+ el2.setAttribute("att2", "attribute2\nnextline" + (char) 7);
dom.addChild(el2);
Xpp3Dom el3 = new Xpp3Dom("el3");
@@ -119,6 +125,10 @@
el7.setValue("element7\n&\"\'<>");
el6.addChild(el7);
+ Xpp3Dom el8 = new Xpp3Dom("el8");
+ el8.setValue("special-char-" + (char) 7);
+
+ dom.addChild(el8);
return dom;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production24_Test.java
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production24_Test.java
---
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production24_Test.java
2023-09-11 19:52:41.000000000 +0200
+++
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production24_Test.java
2024-05-21 23:12:07.000000000 +0200
@@ -5,11 +5,11 @@
import java.io.IOException;
import java.io.Reader;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Test class that execute a particular set of tests associated to a TESCASES
tag from the XML W3C Conformance Tests.
@@ -30,7 +30,7 @@
/**
* <p>setUp.</p>
*/
- @Before
+ @BeforeEach
public void setUp() {
parser = new MXParser();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production2_Test.java
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production2_Test.java
---
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production2_Test.java
2023-09-11 19:52:41.000000000 +0200
+++
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production2_Test.java
2024-05-21 23:12:07.000000000 +0200
@@ -12,11 +12,11 @@
import java.nio.file.Files;
import java.nio.file.Paths;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Test class that execute a particular set of tests associated to a TESCASES
tag from the XML W3C Conformance Tests.
@@ -37,7 +37,7 @@
/**
* <p>setUp.</p>
*/
- @Before
+ @BeforeEach
public void setUp() {
parser = new MXParser();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production32_Test.java
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production32_Test.java
---
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production32_Test.java
2023-09-11 19:52:41.000000000 +0200
+++
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production32_Test.java
2024-05-21 23:12:07.000000000 +0200
@@ -5,11 +5,11 @@
import java.io.IOException;
import java.io.Reader;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Test class that execute a particular set of tests associated to a TESCASES
tag from the XML W3C Conformance Tests.
@@ -30,7 +30,7 @@
/**
* <p>setUp.</p>
*/
- @Before
+ @BeforeEach
public void setUp() {
parser = new MXParser();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production66_Test.java
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production66_Test.java
---
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production66_Test.java
2023-09-11 19:52:41.000000000 +0200
+++
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production66_Test.java
2024-05-21 23:12:07.000000000 +0200
@@ -6,11 +6,11 @@
import java.io.IOException;
import java.io.Reader;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Test class that execute a particular set of tests associated to a TESCASES
tag from the XML W3C Conformance Tests.
@@ -31,7 +31,7 @@
/**
* <p>setUp.</p>
*/
- @Before
+ @BeforeEach
public void setUp() {
parser = new MXParser();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production80_Test.java
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production80_Test.java
---
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production80_Test.java
2023-09-11 19:52:41.000000000 +0200
+++
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/IBMXML10Tests_Test_IBMXMLConformanceTestSuite_not_wftests_Test_IBMXMLConformanceTestSuite_Production80_Test.java
2024-05-21 23:12:07.000000000 +0200
@@ -5,11 +5,11 @@
import java.io.IOException;
import java.io.Reader;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Test class that execute a particular set of tests associated to a TESCASES
tag from the XML W3C Conformance Tests.
@@ -30,7 +30,7 @@
/**
* <p>setUp.</p>
*/
- @Before
+ @BeforeEach
public void setUp() {
parser = new MXParser();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/MXParserTest.java
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/MXParserTest.java
---
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/MXParserTest.java
2023-09-11 19:52:41.000000000 +0200
+++
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/MXParserTest.java
2024-05-21 23:12:07.000000000 +0200
@@ -27,12 +27,12 @@
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.ReaderFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* <p>MXParserTest class.</p>
@@ -890,8 +890,8 @@
}
private static void assertPosition(int row, int col, MXParser parser) {
- assertEquals("Current line", row, parser.getLineNumber());
- assertEquals("Current column", col, parser.getColumnNumber());
+ assertEquals(row, parser.getLineNumber(), "Current line");
+ assertEquals(col, parser.getColumnNumber(), "Current column");
}
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/MXSerializerTest.java
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/MXSerializerTest.java
---
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/MXSerializerTest.java
1970-01-01 01:00:00.000000000 +0100
+++
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/MXSerializerTest.java
2024-05-21 23:12:07.000000000 +0200
@@ -0,0 +1,74 @@
+package org.codehaus.plexus.util.xml.pull;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.Arrays;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class MXSerializerTest {
+
+ @Test
+ void testSerialize() throws Exception {
+
+ StringWriter writer = new StringWriter();
+
+ MXSerializer sr = new MXSerializer();
+ sr.setOutput(writer);
+
+ sr.startDocument(null, Boolean.TRUE);
+ sr.startTag(null, "root");
+ for (int i : Arrays.asList(8, 9, 10, 11, 13, 15)) {
+ sr.startTag(null, "char");
+ sr.text(Character.getName(i) + ": " + ((char) i));
+ sr.endTag(null, "char");
+ }
+
+ sr.endTag(null, "root");
+ sr.endDocument();
+ assertEquals(expectedOutput(), writer.toString());
+ }
+
+ @Test
+ void testDeserialize() throws Exception {
+ MXParser parser = new MXParser();
+ parser.setInput(new StringReader(expectedOutput()));
+ int eventType = parser.getEventType();
+
+ while (eventType != XmlPullParser.END_DOCUMENT) {
+ eventType = parser.next();
+ }
+ }
+
+ private String expectedOutput() {
+ StringBuilder out = new StringBuilder();
+ out.append("<?xml version=\"1.0\" standalone=\"yes\"?>");
+ out.append("<root>");
+ out.append("<char>BACKSPACE: </char>");
+ out.append("<char>CHARACTER TABULATION: \t</char>");
+ out.append("<char>LINE FEED (LF): \n</char>");
+ out.append("<char>LINE TABULATION: </char>");
+ out.append("<char>CARRIAGE RETURN (CR): \r</char>");
+ out.append("<char>SHIFT IN: </char>");
+ out.append("</root>");
+ return out.toString();
+ }
+
+ /**
+ * Tests MJAVADOC-793.
+ */
+ @Test
+ public void testWriteNullValues() throws IOException {
+ // should be no-ops
+ new MXSerializer().writeElementContent(null, null);
+ new MXSerializer().writeAttributeValue(null, null);
+ final StringWriter stringWriter = new StringWriter();
+ new MXSerializer().writeElementContent(null, stringWriter);
+ assertEquals("", stringWriter.toString());
+ new MXSerializer().writeAttributeValue(null, stringWriter);
+ assertEquals("", stringWriter.toString());
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/eduni_misc_Test_BjoernHoehrmannviaHST2013_09_18_Test.java
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/eduni_misc_Test_BjoernHoehrmannviaHST2013_09_18_Test.java
---
old/plexus-xml-plexus-xml-3.0.0/src/test/java/org/codehaus/plexus/util/xml/pull/eduni_misc_Test_BjoernHoehrmannviaHST2013_09_18_Test.java
2023-09-11 19:52:41.000000000 +0200
+++
new/plexus-xml-plexus-xml-3.0.1/src/test/java/org/codehaus/plexus/util/xml/pull/eduni_misc_Test_BjoernHoehrmannviaHST2013_09_18_Test.java
2024-05-21 23:12:07.000000000 +0200
@@ -8,11 +8,11 @@
import java.io.Reader;
import java.nio.charset.StandardCharsets;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Test class that execute a particular set of tests associated to a TESCASES
tag from the XML W3C Conformance Tests.
@@ -32,7 +32,7 @@
/**
* <p>setUp.</p>
*/
- @Before
+ @BeforeEach
public void setUp() {
parser = new MXParser();
}
++++++ plexus-xml-build.xml ++++++
--- /var/tmp/diff_new_pack.uToH44/_old 2024-06-06 12:33:19.898033216 +0200
+++ /var/tmp/diff_new_pack.uToH44/_new 2024-06-06 12:33:19.902033362 +0200
@@ -8,7 +8,7 @@
<property name="project.groupId" value="org.codehaus.plexus"/>
<property name="project.artifactId" value="plexus-xml"/>
- <property name="project.version" value="3.0.0"/>
+ <property name="project.version" value="3.0.1"/>
<property name="compiler.release" value="8"/>
<property name="compiler.source" value="1.${compiler.release}"/>
