ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1718108 - in /webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/impl/builder: JAXBCustomBuilder.java JAXBCustomBuilderTest.java
Date Sat, 05 Dec 2015 17:34:43 GMT
Author: veithen
Date: Sat Dec  5 17:34:43 2015
New Revision: 1718108

URL: http://svn.apache.org/viewvc?rev=1718108&view=rev
Log:
Eliminate usages of deprecated APIs.

Modified:
    webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/impl/builder/JAXBCustomBuilder.java
    webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/impl/builder/JAXBCustomBuilderTest.java

Modified: webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/impl/builder/JAXBCustomBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/impl/builder/JAXBCustomBuilder.java?rev=1718108&r1=1718107&r2=1718108&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/impl/builder/JAXBCustomBuilder.java
(original)
+++ webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/impl/builder/JAXBCustomBuilder.java
Sat Dec  5 17:34:43 2015
@@ -19,14 +19,14 @@
 
 package org.apache.axiom.om.impl.builder;
 
+import static org.junit.Assert.assertTrue;
+
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamReader;
 
-import junit.framework.Assert;
-
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMException;
@@ -53,7 +53,7 @@ public class JAXBCustomBuilder implement
             XMLStreamReader encodedReader = xopStream.getReader();
             if (expectBareReader) {
                 String className = encodedReader.getClass().getName();
-                Assert.assertTrue(!className.startsWith("org.apache.axiom.")
+                assertTrue(!className.startsWith("org.apache.axiom.")
                         || className.startsWith("org.apache.axiom.util.stax.dialect."));
             }
             Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();

Modified: webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/impl/builder/JAXBCustomBuilderTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/impl/builder/JAXBCustomBuilderTest.java?rev=1718108&r1=1718107&r2=1718108&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/impl/builder/JAXBCustomBuilderTest.java
(original)
+++ webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/impl/builder/JAXBCustomBuilderTest.java
Sat Dec  5 17:34:43 2015
@@ -19,8 +19,9 @@
 
 package org.apache.axiom.om.impl.builder;
 
-import static junit.framework.Assert.assertNotSame;
-import static junit.framework.Assert.assertSame;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -30,8 +31,6 @@ import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.namespace.QName;
 
-import junit.framework.Assert;
-
 import org.apache.axiom.attachments.Attachments;
 import org.apache.axiom.blob.Blobs;
 import org.apache.axiom.blob.MemoryBlob;
@@ -77,9 +76,9 @@ public class JAXBCustomBuilderTest {
             assertSame(dh, myDocument.getContent());
         } else {
             assertNotSame(dh, myDocument.getContent());
-            IOTestUtils.compareStreams(dh.getInputStream(), myDocument.getContent().getInputStream());
+            IOTestUtils.compareStreams(dh.getInputStream(), "expected", myDocument.getContent().getInputStream(),
"actual");
         }
-        Assert.assertEquals(usesAttachments, customBuilder.isAttachmentsAccessed());
+        assertEquals(usesAttachments, customBuilder.isAttachmentsAccessed());
     }
     
     @Test



Mime
View raw message