SF.net SVN: xmlunit:[343] trunk/xmlunit/src/tests/java-core/net/sf/xmlunit

[<bo...@us...>]

Revision: 343
          http://xmlunit.svn.sourceforge.net/xmlunit/?rev=343&view=rev
Author:   bodewig
Date:     2009-06-05 10:45:00 +0000 (Fri, 05 Jun 2009)

Log Message:
-----------
Use explicit instanceOf matchers

Modified Paths:
--------------
    trunk/xmlunit/src/tests/java-core/net/sf/xmlunit/builder/InputTest.java
    trunk/xmlunit/src/tests/java-core/net/sf/xmlunit/validation/JAXPValidatorTest.java

Modified: trunk/xmlunit/src/tests/java-core/net/sf/xmlunit/builder/InputTest.java
===================================================================
--- trunk/xmlunit/src/tests/java-core/net/sf/xmlunit/builder/InputTest.java	2009-06-02 14:13:03 UTC (rev 342)
+++ trunk/xmlunit/src/tests/java-core/net/sf/xmlunit/builder/InputTest.java	2009-06-05 10:45:00 UTC (rev 343)
@@ -26,6 +26,7 @@
 import javax.xml.transform.sax.SAXSource;
 import org.w3c.dom.Document;
 import static org.hamcrest.core.Is.*;
+import static org.hamcrest.core.IsInstanceOf.*;
 import static org.hamcrest.core.IsNull.*;
 import static org.junit.Assert.*;
 import org.junit.Test;
@@ -45,9 +46,9 @@
         // it looks as if SAXSource.sourceToInputSource cannot deal
         // with a DOMSource, so we cannot use the parse method
         Source s = Input.fromDocument(d).build();
-        assertThat(s, is(DOMSource.class));
+        assertThat(s, instanceOf(DOMSource.class));
         Object o = ((DOMSource) s).getNode();
-        assertThat(o, is(Document.class));
+        assertThat(o, instanceOf(Document.class));
         Document d2 = (Document) o;
         assertThat(d2, notNullValue());
         assertThat(d2.getDocumentElement().getTagName(), is("animal"));
@@ -113,9 +114,9 @@
                             .build())
             .build();
         // again, transformed is a DOMSource, cannot use parse()
-        assertThat(s, is(DOMSource.class));
+        assertThat(s, instanceOf(DOMSource.class));
         Object o = ((DOMSource) s).getNode();
-        assertThat(o, is(Document.class));
+        assertThat(o, instanceOf(Document.class));
         Document d2 = (Document) o;
         assertThat(d2, notNullValue());
         assertThat(d2.getDocumentElement().getTagName(), is("furry"));

Modified: trunk/xmlunit/src/tests/java-core/net/sf/xmlunit/validation/JAXPValidatorTest.java
===================================================================
--- trunk/xmlunit/src/tests/java-core/net/sf/xmlunit/validation/JAXPValidatorTest.java	2009-06-02 14:13:03 UTC (rev 342)
+++ trunk/xmlunit/src/tests/java-core/net/sf/xmlunit/validation/JAXPValidatorTest.java	2009-06-05 10:45:00 UTC (rev 343)
@@ -16,7 +16,7 @@
 import java.io.File;
 import javax.xml.transform.stream.StreamSource;
 import net.sf.xmlunit.exceptions.XMLUnitException;
-import static org.hamcrest.core.Is.*;
+import static org.hamcrest.core.IsInstanceOf.*;
 import static org.junit.Assert.*;
 import org.junit.Test;
 
@@ -61,7 +61,7 @@
             v.validateInstance(new StreamSource(new File("src/tests/resources/BookXsdGenerated.xml")));
             fail("should have thrown an exception");
         } catch (Exception e) {
-            assertThat(e, is(XMLUnitException.class));
+            assertThat(e, instanceOf(XMLUnitException.class));
         }
     }
 
@@ -72,7 +72,7 @@
             v.validateInstance(new StreamSource(new File("src/tests/resources/BookXsdGenerated.xml")));
             fail("should have thrown an exception");
         } catch (Exception e) {
-            assertThat(e, is(XMLUnitException.class));
+            assertThat(e, instanceOf(XMLUnitException.class));
         }
     }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.