This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-axiom.git
The following commit(s) were added to refs/heads/master by this push:
new 33032da21 Migrate JUnit 3 assertions to AssertJ in MatrixTest target
classes
33032da21 is described below
commit 33032da217df0169e870c3d49b894e9acae9e9fd
Author: Copilot <[email protected]>
AuthorDate: Sun May 17 14:12:26 2026 +0100
Migrate JUnit 3 assertions to AssertJ in MatrixTest target classes
Co-authored-by: Andreas Veithen-Knowles <[email protected]>
---
.../java/org/apache/axiom/util/sax/TestGetSetFeature.java | 6 ++++--
.../java/org/apache/axiom/util/stax/dialect/TestClose.java | 4 +++-
.../dialect/TestCreateXMLStreamReaderThreadSafety.java | 14 ++++++++------
.../dialect/TestCreateXMLStreamWriterThreadSafety.java | 4 +++-
.../TestDisallowDoctypeDeclWithDenialOfService.java | 10 ++++++----
.../dialect/TestDisallowDoctypeDeclWithExternalSubset.java | 13 ++++++++-----
.../dialect/TestDisallowDoctypeDeclWithInternalSubset.java | 9 ++++++---
.../axiom/util/stax/dialect/TestEnableCDataReporting.java | 6 ++++--
.../dialect/TestGetAttributeNamespaceWithNoPrefix.java | 4 +++-
.../util/stax/dialect/TestGetCharacterEncodingScheme.java | 3 ++-
.../apache/axiom/util/stax/dialect/TestGetEncoding.java | 3 ++-
.../axiom/util/stax/dialect/TestGetEncodingExternal.java | 4 +++-
.../util/stax/dialect/TestGetEncodingFromDetection.java | 6 +++---
.../stax/dialect/TestGetEncodingWithCharacterStream.java | 4 +++-
.../dialect/TestGetNamespacePrefixDefaultNamespace.java | 4 +++-
.../stax/dialect/TestGetNamespaceURIWithNullNamespace.java | 4 +++-
.../dialect/TestGetPrefixAfterWriteDefaultNamespace.java | 4 +++-
.../stax/dialect/TestGetPrefixAfterWriteNamespace.java | 4 +++-
.../axiom/util/stax/dialect/TestGetTextInProlog.java | 6 ++++--
.../org/apache/axiom/util/stax/dialect/TestGetVersion.java | 3 ++-
.../util/stax/dialect/TestIsCharactersOnCDATASection.java | 4 +++-
.../apache/axiom/util/stax/dialect/TestIsStandalone.java | 3 ++-
.../apache/axiom/util/stax/dialect/TestSetPrefixScope.java | 6 ++++--
.../apache/axiom/util/stax/dialect/TestStandaloneSet.java | 3 ++-
24 files changed, 87 insertions(+), 44 deletions(-)
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/sax/TestGetSetFeature.java
b/axiom-api/src/test/java/org/apache/axiom/util/sax/TestGetSetFeature.java
index f222b01b2..1ec90be07 100644
--- a/axiom-api/src/test/java/org/apache/axiom/util/sax/TestGetSetFeature.java
+++ b/axiom-api/src/test/java/org/apache/axiom/util/sax/TestGetSetFeature.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.util.sax;
+import static org.assertj.core.api.Assertions.assertThat;
+
import com.google.inject.Inject;
import com.google.inject.name.Named;
import junit.framework.TestCase;
@@ -34,8 +36,8 @@ public class TestGetSetFeature extends TestCase {
@Override
protected void runTest() throws Throwable {
xmlReader.setFeature(feature, true);
- assertTrue(xmlReader.getFeature(feature));
+ assertThat(xmlReader.getFeature(feature)).isTrue();
xmlReader.setFeature(feature, false);
- assertFalse(xmlReader.getFeature(feature));
+ assertThat(xmlReader.getFeature(feature)).isFalse();
}
}
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestClose.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestClose.java
index 4f80c9520..14d910270 100644
--- a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestClose.java
+++ b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestClose.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.util.stax.dialect;
+import static org.assertj.core.api.Assertions.assertThat;
+
import com.google.inject.Inject;
import javax.xml.stream.XMLStreamReader;
import org.apache.axiom.testutils.io.InstrumentedStream;
@@ -34,6 +36,6 @@ public class TestClose extends DialectTestCase {
InstrumentedStream in =
streamType.instrumentStream(streamType.getStream(XMLSample.SIMPLE));
XMLStreamReader reader =
streamType.createXMLStreamReader(staxImpl.newNormalizedXMLInputFactory(), in);
reader.close();
- assertFalse(in.isClosed());
+ assertThat(in.isClosed()).isFalse();
}
}
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestCreateXMLStreamReaderThreadSafety.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestCreateXMLStreamReaderThreadSafety.java
index f0a6049d4..8926aaa01 100644
---
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestCreateXMLStreamReaderThreadSafety.java
+++
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestCreateXMLStreamReaderThreadSafety.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.util.stax.dialect;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
@@ -34,12 +36,12 @@ public class TestCreateXMLStreamReaderThreadSafety extends
DialectTestCase {
String text = String.valueOf((int) (Math.random() * 10000));
String xml = "<root>" + text + "</root>";
XMLStreamReader reader = factory.createXMLStreamReader(new
StringReader(xml));
- assertEquals(XMLStreamReader.START_DOCUMENT,
reader.getEventType());
- assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
- assertEquals(XMLStreamReader.CHARACTERS, reader.next());
- assertEquals(text, reader.getText());
- assertEquals(XMLStreamReader.END_ELEMENT, reader.next());
- assertEquals(XMLStreamReader.END_DOCUMENT, reader.next());
+
assertThat(reader.getEventType()).isEqualTo(XMLStreamReader.START_DOCUMENT);
+
assertThat(reader.next()).isEqualTo(XMLStreamReader.START_ELEMENT);
+
assertThat(reader.next()).isEqualTo(XMLStreamReader.CHARACTERS);
+ assertThat(reader.getText()).isEqualTo(text);
+
assertThat(reader.next()).isEqualTo(XMLStreamReader.END_ELEMENT);
+
assertThat(reader.next()).isEqualTo(XMLStreamReader.END_DOCUMENT);
reader.close();
}
});
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestCreateXMLStreamWriterThreadSafety.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestCreateXMLStreamWriterThreadSafety.java
index 27840e413..77cf6123e 100644
---
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestCreateXMLStreamWriterThreadSafety.java
+++
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestCreateXMLStreamWriterThreadSafety.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.util.stax.dialect;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringWriter;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamWriter;
@@ -41,7 +43,7 @@ public class TestCreateXMLStreamWriterThreadSafety extends
DialectTestCase {
writer.writeEndDocument();
writer.flush();
writer.close();
- assertEquals("<root>" + text + "</root>", out.toString());
+ assertThat(out.toString()).isEqualTo("<root>" + text +
"</root>");
}
});
}
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestDisallowDoctypeDeclWithDenialOfService.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestDisallowDoctypeDeclWithDenialOfService.java
index 0037d218c..42b408eb0 100644
---
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestDisallowDoctypeDeclWithDenialOfService.java
+++
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestDisallowDoctypeDeclWithDenialOfService.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.util.stax.dialect;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.InputStream;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;
@@ -49,10 +51,10 @@ public class TestDisallowDoctypeDeclWithDenialOfService
extends DialectTestCase
} catch (RuntimeException ex) {
gotException = true;
}
- assertTrue("Expected exception", gotException);
- assertFalse(
- "The parser failed to throw an exception before reaching
the document element",
- reachedDocumentElement);
+ // Assert that an exception was expected
+ assertThat(gotException).isTrue();
+ // Assert that the parser failed to throw an exception before
reaching the document element
+ assertThat(reachedDocumentElement).isFalse();
} finally {
in.close();
}
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestDisallowDoctypeDeclWithExternalSubset.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestDisallowDoctypeDeclWithExternalSubset.java
index 082780a5c..3e3353993 100644
---
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestDisallowDoctypeDeclWithExternalSubset.java
+++
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestDisallowDoctypeDeclWithExternalSubset.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.util.stax.dialect;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;
@@ -51,11 +53,12 @@ public class TestDisallowDoctypeDeclWithExternalSubset
extends DialectTestCase {
} catch (RuntimeException ex) {
gotException = true;
}
- assertTrue("Expected exception", gotException);
- assertFalse("The parser tried to load external DTD subset",
server.isRequestReceived());
- assertFalse(
- "The parser failed to throw an exception before reaching
the document element",
- reachedDocumentElement);
+ // Assert that an exception was expected
+ assertThat(gotException).isTrue();
+ // Assert that the parser didn't try to load the external DTD
subset
+ assertThat(server.isRequestReceived()).isFalse();
+ // Assert that the parser failed to throw an exception before
reaching the document element
+ assertThat(reachedDocumentElement).isFalse();
} finally {
server.stop();
}
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestDisallowDoctypeDeclWithInternalSubset.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestDisallowDoctypeDeclWithInternalSubset.java
index db2b68109..ae585d092 100644
---
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestDisallowDoctypeDeclWithInternalSubset.java
+++
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestDisallowDoctypeDeclWithInternalSubset.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.util.stax.dialect;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;
@@ -48,8 +50,9 @@ public class TestDisallowDoctypeDeclWithInternalSubset
extends DialectTestCase {
} catch (RuntimeException ex) {
gotException = true;
}
- assertTrue("Expected exception", gotException);
- assertFalse(
- "The parser failed to throw an exception before reaching the
document element", reachedDocumentElement);
+ // Assert that an exception was expected
+ assertThat(gotException).isTrue();
+ // Assert that the parser failed to throw an exception before reaching
the document element
+ assertThat(reachedDocumentElement).isFalse();
}
}
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestEnableCDataReporting.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestEnableCDataReporting.java
index 9c67abd2d..4261cd731 100644
---
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestEnableCDataReporting.java
+++
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestEnableCDataReporting.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.util.stax.dialect;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
@@ -28,7 +30,7 @@ public class TestEnableCDataReporting extends DialectTestCase
{
XMLInputFactory factory =
staxImpl.getDialect().enableCDataReporting(staxImpl.newNormalizedXMLInputFactory());
XMLStreamReader reader = factory.createXMLStreamReader(new
StringReader("<a><![CDATA[test]]></a>"));
reader.nextTag();
- assertEquals(XMLStreamReader.CDATA, reader.next());
- assertEquals("test", reader.getText());
+ assertThat(reader.next()).isEqualTo(XMLStreamReader.CDATA);
+ assertThat(reader.getText()).isEqualTo("test");
}
}
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetAttributeNamespaceWithNoPrefix.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetAttributeNamespaceWithNoPrefix.java
index fa16e4d34..6c265fe45 100644
---
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetAttributeNamespaceWithNoPrefix.java
+++
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetAttributeNamespaceWithNoPrefix.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.util.stax.dialect;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
@@ -32,7 +34,7 @@ public class TestGetAttributeNamespaceWithNoPrefix extends
DialectTestCase {
while ((eventType = reader.next()) != XMLStreamReader.END_DOCUMENT) {
if (eventType == XMLStreamReader.START_ELEMENT) {
for (int i = 0; i < reader.getAttributeCount(); i++) {
- assertNull(reader.getAttributeNamespace(i));
+ assertThat(reader.getAttributeNamespace(i)).isNull();
}
}
}
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetCharacterEncodingScheme.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetCharacterEncodingScheme.java
index cb5ce6686..078064a4c 100644
---
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetCharacterEncodingScheme.java
+++
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetCharacterEncodingScheme.java
@@ -18,6 +18,7 @@
*/
package org.apache.axiom.util.stax.dialect;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.io.ByteArrayInputStream;
@@ -30,7 +31,7 @@ public class TestGetCharacterEncodingScheme extends
DialectTestCase {
XMLInputFactory factory = staxImpl.newNormalizedXMLInputFactory();
XMLStreamReader reader = factory.createXMLStreamReader(new
ByteArrayInputStream(
"<?xml version='1.0'
encoding='iso-8859-15'?><root/>".getBytes("iso-8859-15")));
- assertEquals("iso-8859-15", reader.getCharacterEncodingScheme());
+
assertThat(reader.getCharacterEncodingScheme()).isEqualTo("iso-8859-15");
reader.next();
assertThatThrownBy(reader::getCharacterEncodingScheme).isInstanceOf(IllegalStateException.class);
reader.close();
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetEncoding.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetEncoding.java
index a64a0fc37..7369fe892 100644
---
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetEncoding.java
+++
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetEncoding.java
@@ -18,6 +18,7 @@
*/
package org.apache.axiom.util.stax.dialect;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.io.ByteArrayInputStream;
@@ -30,7 +31,7 @@ public class TestGetEncoding extends DialectTestCase {
XMLInputFactory factory = staxImpl.newNormalizedXMLInputFactory();
XMLStreamReader reader = factory.createXMLStreamReader(new
ByteArrayInputStream(
"<?xml version='1.0'
encoding='iso-8859-15'?><root/>".getBytes("iso-8859-15")));
- assertEquals("iso-8859-15", reader.getEncoding());
+ assertThat(reader.getEncoding()).isEqualTo("iso-8859-15");
reader.next();
assertThatThrownBy(reader::getEncoding).isInstanceOf(IllegalStateException.class);
reader.close();
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetEncodingExternal.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetEncodingExternal.java
index 54939ba95..84e89e57f 100644
---
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetEncodingExternal.java
+++
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetEncodingExternal.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.util.stax.dialect;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.ByteArrayInputStream;
import java.nio.charset.StandardCharsets;
import javax.xml.stream.XMLInputFactory;
@@ -33,6 +35,6 @@ public class TestGetEncodingExternal extends DialectTestCase {
XMLInputFactory factory = staxImpl.newNormalizedXMLInputFactory();
XMLStreamReader reader = factory.createXMLStreamReader(
new
ByteArrayInputStream("<root/>".getBytes(StandardCharsets.ISO_8859_1)),
"ISO-8859-1");
- assertEquals("ISO-8859-1", reader.getEncoding());
+ assertThat(reader.getEncoding()).isEqualTo("ISO-8859-1");
}
}
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetEncodingFromDetection.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetEncodingFromDetection.java
index 15dcbbae2..7326335ea 100644
---
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetEncodingFromDetection.java
+++
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetEncodingFromDetection.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.util.stax.dialect;
+import static org.assertj.core.api.Assertions.assertThat;
+
import com.google.inject.Inject;
import com.google.inject.name.Named;
import java.io.ByteArrayInputStream;
@@ -46,8 +48,6 @@ public class TestGetEncodingFromDetection extends
DialectTestCase {
XMLStreamReader reader = factory.createXMLStreamReader(
new ByteArrayInputStream("<?xml
version=\"1.0\"?><root/>".getBytes(javaEncoding)));
String actualEncoding = reader.getEncoding();
- assertTrue(
- "Expected one of " + xmlEncodings + ", but got " +
actualEncoding,
- xmlEncodings.contains(actualEncoding));
+ assertThat(actualEncoding).isIn(xmlEncodings);
}
}
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetEncodingWithCharacterStream.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetEncodingWithCharacterStream.java
index a65863773..8f5f782e4 100644
---
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetEncodingWithCharacterStream.java
+++
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetEncodingWithCharacterStream.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.util.stax.dialect;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
@@ -31,6 +33,6 @@ public class TestGetEncodingWithCharacterStream extends
DialectTestCase {
protected void runTest() throws Throwable {
XMLInputFactory factory = staxImpl.newNormalizedXMLInputFactory();
XMLStreamReader reader = factory.createXMLStreamReader(new
StringReader("<root/>"));
- assertNull(reader.getEncoding());
+ assertThat(reader.getEncoding()).isNull();
}
}
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetNamespacePrefixDefaultNamespace.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetNamespacePrefixDefaultNamespace.java
index 345c49ba2..aaa62bb5e 100644
---
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetNamespacePrefixDefaultNamespace.java
+++
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetNamespacePrefixDefaultNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.util.stax.dialect;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
@@ -28,6 +30,6 @@ public class TestGetNamespacePrefixDefaultNamespace extends
DialectTestCase {
XMLInputFactory factory = staxImpl.newNormalizedXMLInputFactory();
XMLStreamReader reader = factory.createXMLStreamReader(new
StringReader("<root xmlns=\"urn:ns\"/>"));
reader.next();
- assertNull(reader.getNamespacePrefix(0));
+ assertThat(reader.getNamespacePrefix(0)).isNull();
}
}
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetNamespaceURIWithNullNamespace.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetNamespaceURIWithNullNamespace.java
index 35b34bfec..8d05ab086 100644
---
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetNamespaceURIWithNullNamespace.java
+++
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetNamespaceURIWithNullNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.util.stax.dialect;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
@@ -30,7 +32,7 @@ public class TestGetNamespaceURIWithNullNamespace extends
DialectTestCase {
int eventType;
while ((eventType = reader.next()) != XMLStreamReader.END_DOCUMENT) {
if (eventType == XMLStreamReader.START_ELEMENT) {
- assertNull(reader.getNamespaceURI());
+ assertThat(reader.getNamespaceURI()).isNull();
}
}
}
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetPrefixAfterWriteDefaultNamespace.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetPrefixAfterWriteDefaultNamespace.java
index 98d37da43..e8cbb16e6 100644
---
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetPrefixAfterWriteDefaultNamespace.java
+++
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetPrefixAfterWriteDefaultNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.util.stax.dialect;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.stream.XMLStreamWriter;
import org.apache.commons.io.output.NullOutputStream;
@@ -32,6 +34,6 @@ public class TestGetPrefixAfterWriteDefaultNamespace extends
DialectTestCase {
staxImpl.newNormalizedXMLOutputFactory().createXMLStreamWriter(NullOutputStream.INSTANCE);
writer.writeStartElement("ns1", "root", "urn:ns1");
writer.writeDefaultNamespace("urn:ns2");
- assertEquals("", writer.getPrefix("urn:ns2"));
+ assertThat(writer.getPrefix("urn:ns2")).isEmpty();
}
}
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetPrefixAfterWriteNamespace.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetPrefixAfterWriteNamespace.java
index 1a335c34c..03aca52ef 100644
---
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetPrefixAfterWriteNamespace.java
+++
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetPrefixAfterWriteNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.util.stax.dialect;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.stream.XMLStreamWriter;
import org.apache.commons.io.output.NullOutputStream;
@@ -32,6 +34,6 @@ public class TestGetPrefixAfterWriteNamespace extends
DialectTestCase {
staxImpl.newNormalizedXMLOutputFactory().createXMLStreamWriter(NullOutputStream.INSTANCE);
writer.writeStartElement("", "root", "");
writer.writeNamespace("p", "urn:test");
- assertEquals("p", writer.getPrefix("urn:test"));
+ assertThat(writer.getPrefix("urn:test")).isEqualTo("p");
}
}
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetTextInProlog.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetTextInProlog.java
index f8819d0ba..b25a9d69d 100644
---
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetTextInProlog.java
+++
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetTextInProlog.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.util.stax.dialect;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
@@ -27,7 +29,7 @@ public class TestGetTextInProlog extends DialectTestCase {
protected void runTest() throws Throwable {
XMLInputFactory factory = staxImpl.newNormalizedXMLInputFactory();
XMLStreamReader reader = factory.createXMLStreamReader(new
StringReader("<?xml version=\"1.0\"?>\r\n<root/>"));
- assertEquals(XMLStreamReader.SPACE, reader.next());
- assertEquals("\n", reader.getText());
+ assertThat(reader.next()).isEqualTo(XMLStreamReader.SPACE);
+ assertThat(reader.getText()).isEqualTo("\n");
}
}
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetVersion.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetVersion.java
index f9a5421a3..76b29634c 100644
---
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetVersion.java
+++
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetVersion.java
@@ -18,6 +18,7 @@
*/
package org.apache.axiom.util.stax.dialect;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.io.StringReader;
@@ -29,7 +30,7 @@ public class TestGetVersion extends DialectTestCase {
protected void runTest() throws Throwable {
XMLInputFactory factory = staxImpl.newNormalizedXMLInputFactory();
XMLStreamReader reader = factory.createXMLStreamReader(new
StringReader("<?xml version='1.0'?><root/>"));
- assertEquals("1.0", reader.getVersion());
+ assertThat(reader.getVersion()).isEqualTo("1.0");
reader.next();
assertThatThrownBy(reader::getVersion).isInstanceOf(IllegalStateException.class);
reader.close();
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestIsCharactersOnCDATASection.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestIsCharactersOnCDATASection.java
index b445584da..9b174924b 100644
---
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestIsCharactersOnCDATASection.java
+++
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestIsCharactersOnCDATASection.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.util.stax.dialect;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
@@ -36,6 +38,6 @@ public class TestIsCharactersOnCDATASection extends
DialectTestCase {
XMLStreamReader reader = factory.createXMLStreamReader(new
StringReader("<root><![CDATA[X]]></root>"));
reader.nextTag();
reader.next();
- assertTrue(reader.isCharacters());
+ assertThat(reader.isCharacters()).isTrue();
}
}
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestIsStandalone.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestIsStandalone.java
index f241c1628..2416ed7c8 100644
---
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestIsStandalone.java
+++
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestIsStandalone.java
@@ -18,6 +18,7 @@
*/
package org.apache.axiom.util.stax.dialect;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.io.StringReader;
@@ -30,7 +31,7 @@ public class TestIsStandalone extends DialectTestCase {
XMLInputFactory factory = staxImpl.newNormalizedXMLInputFactory();
XMLStreamReader reader =
factory.createXMLStreamReader(new StringReader("<?xml
version='1.0' standalone='no'?><root/>"));
- assertEquals(false, reader.isStandalone());
+ assertThat(reader.isStandalone()).isFalse();
reader.next();
assertThatThrownBy(reader::isStandalone).isInstanceOf(IllegalStateException.class);
reader.close();
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestSetPrefixScope.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestSetPrefixScope.java
index 9e01bf9fd..e2104be23 100644
---
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestSetPrefixScope.java
+++
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestSetPrefixScope.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.util.stax.dialect;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.ByteArrayOutputStream;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamWriter;
@@ -31,9 +33,9 @@ public class TestSetPrefixScope extends DialectTestCase {
writer.writeStartElement("root");
writer.setPrefix("p", "urn:ns");
writer.writeStartElement("child");
- assertEquals("p", writer.getPrefix("urn:ns"));
+ assertThat(writer.getPrefix("urn:ns")).isEqualTo("p");
writer.writeEndElement();
- assertEquals("p", writer.getPrefix("urn:ns"));
+ assertThat(writer.getPrefix("urn:ns")).isEqualTo("p");
writer.writeEndElement();
writer.writeEndDocument();
writer.close();
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestStandaloneSet.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestStandaloneSet.java
index 8fba68fe2..214ae4e7c 100644
---
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestStandaloneSet.java
+++
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestStandaloneSet.java
@@ -18,6 +18,7 @@
*/
package org.apache.axiom.util.stax.dialect;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.io.StringReader;
@@ -29,7 +30,7 @@ public class TestStandaloneSet extends DialectTestCase {
protected void runTest() throws Throwable {
XMLInputFactory factory = staxImpl.newNormalizedXMLInputFactory();
XMLStreamReader reader = factory.createXMLStreamReader(new
StringReader("<?xml version='1.0'?><root/>"));
- assertEquals(false, reader.standaloneSet());
+ assertThat(reader.standaloneSet()).isFalse();
reader.next();
assertThatThrownBy(reader::standaloneSet).isInstanceOf(IllegalStateException.class);
reader.close();
