Menu
▾
▴
SF.net SVN: xmlunit: [188] trunk/xmlunit/src/java/org/custommonkey/xmlunit
|
From: <bo...@us...> - 2007-04-17 03:59:28
|
Revision: 188
http://xmlunit.svn.sourceforge.net/xmlunit/?rev=188&view=rev
Author: bodewig
Date: 2007-04-16 20:59:29 -0700 (Mon, 16 Apr 2007)
Log Message:
-----------
remove deprecated methods
Modified Paths:
--------------
trunk/xmlunit/src/java/org/custommonkey/xmlunit/XMLAssert.java
trunk/xmlunit/src/java/org/custommonkey/xmlunit/XMLTestCase.java
trunk/xmlunit/src/java/org/custommonkey/xmlunit/XMLUnit.java
Modified: trunk/xmlunit/src/java/org/custommonkey/xmlunit/XMLAssert.java
===================================================================
--- trunk/xmlunit/src/java/org/custommonkey/xmlunit/XMLAssert.java 2007-04-16 13:06:55 UTC (rev 187)
+++ trunk/xmlunit/src/java/org/custommonkey/xmlunit/XMLAssert.java 2007-04-17 03:59:29 UTC (rev 188)
@@ -145,17 +145,6 @@
/**
* Assert that the result of an XML comparison is or is not identical
- * @param diff the result of an XML comparison
- * @param assertion true if asserting that result is identical
- * @param msg additional message to display if assertion fails
- * @deprecated Use XMLTestCase#assertXMLIdentical(String, Diff, boolean) instead
- */
- public static void assertXMLIdentical(Diff diff, boolean assertion, String msg) {
- assertXMLIdentical(msg, diff, assertion);
- }
-
- /**
- * Assert that the result of an XML comparison is or is not identical
* @param msg Message to display if assertion fails
* @param diff the result of an XML comparison
* @param assertion true if asserting that result is identical
Modified: trunk/xmlunit/src/java/org/custommonkey/xmlunit/XMLTestCase.java
===================================================================
--- trunk/xmlunit/src/java/org/custommonkey/xmlunit/XMLTestCase.java 2007-04-16 13:06:55 UTC (rev 187)
+++ trunk/xmlunit/src/java/org/custommonkey/xmlunit/XMLTestCase.java 2007-04-17 03:59:29 UTC (rev 188)
@@ -78,34 +78,6 @@
}
/**
- * Whether to ignore whitespace in attributes and elements
- * @param ignore
- * @deprecated this is a global setting and should be invoked on
- * {@link XMLUnit#setIgnoreWhitespace XMLUnit} instead
- */
- public void setIgnoreWhitespace(boolean ignore){
- XMLUnit.setIgnoreWhitespace(ignore);
- }
-
- /**
- * Overide default sax parser used to parser documents
- * @deprecated this is a global setting and should be invoked on
- * {@link XMLUnit#setControlParser XMLUnit} instead
- */
- public void setControlParser(String parser){
- XMLUnit.setControlParser(parser);
- }
-
- /**
- * Overide default sax parser used to parse documents
- * @deprecated this is a global setting and should be invoked on
- * {@link XMLUnit#setTestParser XMLUnit} instead
- */
- public void setTestParser(String parser){
- XMLUnit.setTestParser(parser);
- }
-
- /**
* Compare XML documents provided by two InputSource classes
* @param control Control document
* @param test Document to test
@@ -191,18 +163,7 @@
/**
* Assert that the result of an XML comparison is or is not similar.
- * @param diff the result of an XML comparison
- * @param assertion true if asserting that result is similar
* @param msg additional message to display if assertion fails
- * @deprecated Use XMLTestCase#assertXMLEqual(String, Diff, boolean) instead
- */
- public void assertXMLEqual(Diff diff, boolean assertion, String msg) {
- XMLAssert.assertXMLEqual(msg, diff, assertion);
- }
-
- /**
- * Assert that the result of an XML comparison is or is not similar.
- * @param msg additional message to display if assertion fails
* @param diff the result of an XML comparison
* @param assertion true if asserting that result is similar
*/
@@ -221,17 +182,6 @@
/**
* Assert that the result of an XML comparison is or is not identical
- * @param diff the result of an XML comparison
- * @param assertion true if asserting that result is identical
- * @param msg additional message to display if assertion fails
- * @deprecated Use XMLTestCase#assertXMLIdentical(String, Diff, boolean) instead
- */
- public void assertXMLIdentical(Diff diff, boolean assertion, String msg) {
- XMLAssert.assertXMLIdentical(msg, diff, assertion);
- }
-
- /**
- * Assert that the result of an XML comparison is or is not identical
* @param msg Message to display if assertion fails
* @param diff the result of an XML comparison
* @param assertion true if asserting that result is identical
@@ -925,18 +875,6 @@
/**
* Assert that a specific XPath does NOT exist in some given XML
* @param inXpathExpression
- * @param inXMLString
- * @deprecated Use assertXpathNotExists instead
- */
- public void assertNotXpathExists(String xPathExpression,
- String inXMLString)
- throws IOException, SAXException , XpathException {
- XMLAssert.assertXpathNotExists(xPathExpression, inXMLString);
- }
-
- /**
- * Assert that a specific XPath does NOT exist in some given XML
- * @param inXpathExpression
* @param inDocument
* @see XpathEngine which provides the underlying evaluation mechanism
*/
@@ -947,18 +885,6 @@
}
/**
- * Assert that a specific XPath does NOT exist in some given XML
- * @param inXpathExpression
- * @param inDocument
- * @deprecated Use assertXpathNotExists instead
- */
- public void assertNotXpathExists(String xPathExpression,
- Document inDocument)
- throws XpathException {
- XMLAssert.assertXpathNotExists(xPathExpression, inDocument);
- }
-
- /**
* Assert that a piece of XML contains valid XML: the input must
* contain a DOCTYPE declaration to be validated
* @param xml
Modified: trunk/xmlunit/src/java/org/custommonkey/xmlunit/XMLUnit.java
===================================================================
--- trunk/xmlunit/src/java/org/custommonkey/xmlunit/XMLUnit.java 2007-04-16 13:06:55 UTC (rev 187)
+++ trunk/xmlunit/src/java/org/custommonkey/xmlunit/XMLUnit.java 2007-04-17 03:59:29 UTC (rev 188)
@@ -280,76 +280,6 @@
}
/**
- * Compare XML documents provided by two Reader classes.
- * @param control Control document
- * @param test Document to test
- * @return Diff object describing differences in documents
- * @throws SAXException
- * @throws IOException
- * @deprecated use Diff constructor directly
- */
- public static Diff compare(Reader control, Reader test)
- throws SAXException, IOException {
- return new Diff(control, test);
- }
-
- /**
- * Compare two XML documents provided by SAX <code>InputSources</code>
- * @param control Control document
- * @param test Document to test
- * @return Diff object describing differences in documents
- * @throws SAXException
- * @throws IOException
- * @deprecated use Diff constructor directly
- */
- public static Diff compare(InputSource control, InputSource test)
- throws SAXException, IOException {
- return new Diff(control, test);
- }
-
- /**
- * Compare two XML documents provided by a string and a Reader.
- * @param control Control document
- * @param test Document to test
- * @return Diff object describing differences in documents
- * @throws SAXException
- * @throws IOException
- * @deprecated use Diff constructor directly
- */
- public static Diff compare(String control, Reader test) throws SAXException,
- IOException {
- return new Diff(new StringReader(control), test);
- }
-
- /**
- * Compare two XML documents provided by a Reader and a string.
- * @param control Control document
- * @param test Document to test
- * @return Diff object describing differences in documents
- * @throws SAXException
- * @throws IOException
- * @deprecated use Diff constructor directly
- */
- public static Diff compare(Reader control, String test) throws SAXException,
- IOException {
- return new Diff(control, new StringReader(test));
- }
-
- /**
- * Compare two XML documents provided as strings.
- * @param control Control document
- * @param test Document to test
- * @return Diff object describing differences in documents
- * @throws SAXException
- * @throws IOException
- * @deprecated use Diff constructor directly
- */
- public static Diff compare(String control, String test) throws SAXException,
- IOException {
- return new Diff(control, test);
- }
-
- /**
* Utility method to build a Document using the control DocumentBuilder
* to parse the specified String.
* @param fromXML
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
