You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by el...@apache.org on 2009/09/08 15:09:59 UTC
svn commit: r812495 [3/3] - in /incubator/wink/trunk: ./
wink-client/src/test/java/org/apache/wink/client/ wink-common/
wink-common/src/main/java/org/apache/wink/common/internal/runtime/
wink-common/src/main/java/org/apache/wink/common/model/atom/ wink...
Modified: incubator/wink/trunk/wink-examples/ext/History/src/test/resources/org/apache/wink/example/history/defect1_5_atom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/History/src/test/resources/org/apache/wink/example/history/defect1_5_atom.xml?rev=812495&r1=812494&r2=812495&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/History/src/test/resources/org/apache/wink/example/history/defect1_5_atom.xml (original)
+++ incubator/wink/trunk/wink-examples/ext/History/src/test/resources/org/apache/wink/example/history/defect1_5_atom.xml Tue Sep 8 13:09:56 2009
@@ -18,23 +18,24 @@
under the License.
-->
-<entry xml:base="http://localhost:80/defects/1" xmlns="http://www.w3.org/2005/Atom">
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:ns2="http://a9.com/-/spec/opensearch/1.1/" xmlns:ns3="http://www.w3.org/1999/xhtml" xml:base="http://localhost:80/defects/1">
<id>urn:com:hp:qadefects:defect:1</id>
<title type="text">Missing asterisk for mandatory fields</title>
+ <summary type="text">In Payment Services page, there is no indication for mandatory fields.</summary>
+ <published>1970-01-01T16:01:45.052+02:00</published>
<link href="http://localhost:80/defects/1" rel="edit"/>
- <link href="http://localhost:80/defects/1/history?alt=application%2Fatom%2Bxml" type="application/atom+xml" rel="history"/>
+ <link href="http://localhost:80/defects/1/history?alt=application%2Fatom%2Bxml" rel="history" type="application/atom+xml"/>
+ <link href="http://localhost:80/defects/1;rev=5?alt=application%2Fjson" rel="alternate" type="application/json"/>
+ <link href="http://localhost:80/defects/1;rev=5?alt=application%2Fatom%2Bxml" rel="alternate" type="application/atom+xml"/>
+ <link href="http://localhost:80/defects/1;rev=5?alt=application%2Fxml" rel="alternate" type="application/xml"/>
<link href="http://localhost:80/defects/1;rev=5" rel="self"/>
- <link href="http://localhost:80/defects/1;rev=5?alt=application%2Fatom%2Bxml" type="application/atom+xml" rel="alternate"/>
- <link href="http://localhost:80/defects/1;rev=5?alt=application%2Fjson" type="application/json" rel="alternate"/>
- <link href="http://localhost:80/defects/1;rev=5?alt=application%2Fxml" type="application/xml" rel="alternate"/>
- <category scheme="urn:com:hp:qadefects:categories:severity" term="4-minor"/>
- <category scheme="urn:com:hp:qadefects:categories:status" term="Assigned"/>
<author>
<name>tester2</name>
</author>
- <published>1970-01-01T16:01:45.052+02:00</published>
+ <category scheme="urn:com:hp:qadefects:categories:severity" term="4-minor"/>
+ <category scheme="urn:com:hp:qadefects:categories:status" term="Assigned"/>
<content type="application/xml">
- <defect>
+ <defect xmlns="" xmlns:ns4="http://www.w3.org/2005/Atom">
<id>1</id>
<revision>5</revision>
<deleted>false</deleted>
@@ -47,5 +48,4 @@
<assignedTo>developer3</assignedTo>
</defect>
</content>
- <summary type="text">In Payment Services page, there is no indication for mandatory fields.</summary>
</entry>
\ No newline at end of file
Modified: incubator/wink/trunk/wink-examples/ext/History/src/test/resources/org/apache/wink/example/history/initial_defect1_atom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/History/src/test/resources/org/apache/wink/example/history/initial_defect1_atom.xml?rev=812495&r1=812494&r2=812495&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/History/src/test/resources/org/apache/wink/example/history/initial_defect1_atom.xml (original)
+++ incubator/wink/trunk/wink-examples/ext/History/src/test/resources/org/apache/wink/example/history/initial_defect1_atom.xml Tue Sep 8 13:09:56 2009
@@ -18,23 +18,24 @@
under the License.
-->
-<entry xml:base="http://localhost:80/defects/1" xmlns="http://www.w3.org/2005/Atom">
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:ns2="http://a9.com/-/spec/opensearch/1.1/" xmlns:ns3="http://www.w3.org/1999/xhtml" xml:base="http://localhost:80/defects/1">
<id>urn:com:hp:qadefects:defect:1</id>
<title type="text">Id field is disabled in Edit Profile page</title>
+ <summary type="text">Cannot change the Id in Edit Profile page, it is disabled.</summary>
+ <published>1970-01-01T16:01:45.052+02:00</published>
<link href="http://localhost:80/defects/1" rel="edit"/>
- <link href="http://localhost:80/defects/1/history?alt=application%2Fatom%2Bxml" type="application/atom+xml" rel="history"/>
+ <link href="http://localhost:80/defects/1/history?alt=application%2Fatom%2Bxml" rel="history" type="application/atom+xml"/>
+ <link href="http://localhost:80/defects/1;rev=2?alt=application%2Fxml" rel="alternate" type="application/xml"/>
+ <link href="http://localhost:80/defects/1;rev=2?alt=application%2Fatom%2Bxml" rel="alternate" type="application/atom+xml"/>
+ <link href="http://localhost:80/defects/1;rev=2?alt=application%2Fjson" rel="alternate" type="application/json"/>
<link href="http://localhost:80/defects/1;rev=2" rel="self"/>
- <link href="http://localhost:80/defects/1;rev=2?alt=application%2Fatom%2Bxml" type="application/atom+xml" rel="alternate"/>
- <link href="http://localhost:80/defects/1;rev=2?alt=application%2Fjson" type="application/json" rel="alternate"/>
- <link href="http://localhost:80/defects/1;rev=2?alt=application%2Fxml" type="application/xml" rel="alternate"/>
- <category scheme="urn:com:hp:qadefects:categories:severity" term="2-high"/>
- <category scheme="urn:com:hp:qadefects:categories:status" term="New"/>
<author>
<name>tester1</name>
</author>
- <published>1970-01-01T16:01:45.052+02:00</published>
+ <category scheme="urn:com:hp:qadefects:categories:severity" term="2-high"/>
+ <category scheme="urn:com:hp:qadefects:categories:status" term="New"/>
<content type="application/xml">
- <defect>
+ <defect xmlns="" xmlns:ns4="http://www.w3.org/2005/Atom">
<id>1</id>
<revision>2</revision>
<deleted>false</deleted>
@@ -47,5 +48,5 @@
<assignedTo>developer1</assignedTo>
</defect>
</content>
- <summary type="text">Cannot change the Id in Edit Profile page, it is disabled.</summary>
-</entry>
\ No newline at end of file
+</entry>
+
Modified: incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBBadgerFishTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBBadgerFishTest.java?rev=812495&r1=812494&r2=812495&view=diff
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBBadgerFishTest.java (original)
+++ incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBBadgerFishTest.java Tue Sep 8 13:09:56 2009
@@ -236,11 +236,12 @@
+ "</entry>\n";
private static String ENTRY_STR_JSON =
- "{\"entry\":{\"@xmlns\":{\"ns2\":\"http:\\/\\/a9.com\\/-\\/spec\\/opensearch\\/1.1\\/\",\"$\":\"http:\\/\\/www.w3.org\\/2005\\/Atom\"},\"@xml:base\":\"http:\\/\\/b216:8080\\/reporting\\/reports\",\"id\":{\"$\":\"toptenvalidators\"},\"updated\":{\"$\":\"@TIME@\"},\"title\":{\"@type\":\"text\",\"@xml:lang\":\"en\",\"$\":\"top ten validators\"},\"published\":{\"$\":\"@TIME@\"},\"link\":{\"@href\":\"http:\\/\\/b216:8080\\/reporting\\/reports\\/toptenvalidators?alt=application\\/json\",\"@type\":\"application\\/json\",\"@rel\":\"alternate\"},\"author\":{\"name\":{\"$\":\"admin\"}},\"category\":{\"@label\":\"report definition\",\"@scheme\":\"urn:com:systinet:reporting:kind\",\"@term\":\"urn:com:systinet:reporting:kind:definition\"}}}";
+ "{\"entry\":{\"@xmlns\":{\"ns3\":\"http:\\/\\/www.w3.org\\/1999\\/xhtml\",\"ns2\":\"http:\\/\\/a9.com\\/-\\/spec\\/opensearch\\/1.1\\/\",\"$\":\"http:\\/\\/www.w3.org\\/2005\\/Atom\"},\"@xml:base\":\"http:\\/\\/b216:8080\\/reporting\\/reports\",\"id\":{\"$\":\"toptenvalidators\"},\"updated\":{\"$\":\"@TIME@\"},\"title\":{\"@type\":\"text\",\"@xml:lang\":\"en\",\"$\":\"top ten validators\"},\"published\":{\"$\":\"@TIME@\"},\"link\":{\"@href\":\"http:\\/\\/b216:8080\\/reporting\\/reports\\/toptenvalidators?alt=application\\/json\",\"@type\":\"application\\/json\",\"@rel\":\"alternate\"},\"author\":{\"name\":{\"$\":\"admin\"}},\"category\":{\"@label\":\"report definition\",\"@scheme\":\"urn:com:systinet:reporting:kind\",\"@term\":\"urn:com:systinet:reporting:kind:definition\"}}}";
private static String ENTRY_STR_POST =
"{\"entry\":" + "{\"@xmlns\":"
- + "{\"ns2\":\"http:\\/\\/a9.com\\/-\\/spec\\/opensearch\\/1.1\\/\",\"$\":\"http:\\/\\/www.w3.org\\/2005\\/Atom\"},"
+ + "{\"ns3\":\"http:\\/\\/www.w3.org\\/1999\\/xhtml\","
+ + "\"ns2\":\"http:\\/\\/a9.com\\/-\\/spec\\/opensearch\\/1.1\\/\",\"$\":\"http:\\/\\/www.w3.org\\/2005\\/Atom\"},"
+ "\"id\":{\"$\":\"toptenvalidators\"},"
+ "\"updated\":{\"$\":\"@TIME@\"},"
+ "\"title\":{"
Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/AbstractResourceBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/AbstractResourceBeanTest.java?rev=812495&r1=812494&r2=812495&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/AbstractResourceBeanTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/AbstractResourceBeanTest.java Tue Sep 8 13:09:56 2009
@@ -34,6 +34,7 @@
import org.apache.wink.common.internal.utils.MediaTypeUtils;
import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
import org.apache.wink.test.mock.MockRequestConstructor;
+import org.apache.wink.test.mock.TestUtils;
import org.custommonkey.xmlunit.Diff;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -204,9 +205,10 @@
MediaTypeUtils.ATOM_SERVICE_DOCUMENT_TYPE);
response = invoke(mockRequest);
responseContent = response.getContentAsString();
- Diff diff = new Diff(EXPECTED_SERVICE_DOCUMENT, responseContent);
- assertTrue("Comparing service document with expected one: " + diff.toString(), diff
- .identical());
+ String msg =
+ TestUtils
+ .diffIgnoreUpdateWithAttributeQualifier(EXPECTED_SERVICE_DOCUMENT, responseContent);
+ assertNull(msg, msg);
}
public void testServicesSingleEntry() throws Exception {
Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/AbstractResourceWithDuplicateWorkspaceTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/AbstractResourceWithDuplicateWorkspaceTest.java?rev=812495&r1=812494&r2=812495&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/AbstractResourceWithDuplicateWorkspaceTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/AbstractResourceWithDuplicateWorkspaceTest.java Tue Sep 8 13:09:56 2009
@@ -33,6 +33,7 @@
import org.apache.wink.common.internal.utils.MediaTypeUtils;
import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
import org.apache.wink.test.mock.MockRequestConstructor;
+import org.apache.wink.test.mock.TestUtils;
import org.custommonkey.xmlunit.Diff;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -103,9 +104,9 @@
MediaTypeUtils.ATOM_SERVICE_DOCUMENT_TYPE);
MockHttpServletResponse response = invoke(mockRequest);
String responseContent = response.getContentAsString();
- Diff diff = new Diff(EXPECTED_SERVICE_DOCUMENT, responseContent);
- assertTrue("Comparing service document with expected one: " + diff.toString(), diff
- .identical());
+ String msg =
+ TestUtils.diffIgnoreUpdateWithAttributeQualifier(EXPECTED_SERVICE_DOCUMENT, responseContent);
+ assertNull(msg, msg);
}
}
Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AtomEntryProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AtomEntryProviderTest.java?rev=812495&r1=812494&r2=812495&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AtomEntryProviderTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AtomEntryProviderTest.java Tue Sep 8 13:09:56 2009
@@ -39,6 +39,7 @@
import org.apache.wink.common.model.synd.SyndEntry;
import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
import org.apache.wink.test.mock.MockRequestConstructor;
+import org.apache.wink.test.mock.TestUtils;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -111,7 +112,9 @@
"application/atom+xml");
MockHttpServletResponse response = invoke(request);
assertEquals(200, response.getStatus());
- assertEquals(ENTRY, response.getContentAsString());
+ String msg =
+ TestUtils.diffIgnoreUpdateWithAttributeQualifier(ENTRY, response.getContentAsString());
+ assertNull(msg, msg);
}
public void testGetAtomEntryElement() throws Exception {
@@ -121,7 +124,9 @@
"application/atom+xml");
MockHttpServletResponse response = invoke(request);
assertEquals(200, response.getStatus());
- assertEquals(ENTRY, response.getContentAsString());
+ String msg =
+ TestUtils.diffIgnoreUpdateWithAttributeQualifier(ENTRY, response.getContentAsString());
+ assertNull(msg, msg);
}
public void testGetAtomSyndEntry() throws Exception {
@@ -131,7 +136,9 @@
"application/atom+xml");
MockHttpServletResponse response = invoke(request);
assertEquals(200, response.getStatus());
- assertEquals(ENTRY, response.getContentAsString());
+ String msg =
+ TestUtils.diffIgnoreUpdateWithAttributeQualifier(ENTRY, response.getContentAsString());
+ assertNull(msg, msg);
}
public void testPostAtomEntry() throws Exception {
@@ -143,7 +150,9 @@
request.setContent(ENTRY.getBytes());
MockHttpServletResponse response = invoke(request);
assertEquals(200, response.getStatus());
- assertEquals(ENTRY, response.getContentAsString());
+ String msg =
+ TestUtils.diffIgnoreUpdateWithAttributeQualifier(ENTRY, response.getContentAsString());
+ assertNull(msg, msg);
}
public void testPostAtomEntryElement() throws Exception {
@@ -155,7 +164,9 @@
request.setContent(ENTRY.getBytes());
MockHttpServletResponse response = invoke(request);
assertEquals(200, response.getStatus());
- assertEquals(ENTRY, response.getContentAsString());
+ String msg =
+ TestUtils.diffIgnoreUpdateWithAttributeQualifier(ENTRY, response.getContentAsString());
+ assertNull(msg, msg);
}
public void testPostAtomSyndEntry() throws Exception {
@@ -167,7 +178,9 @@
request.setContent(ENTRY.getBytes());
MockHttpServletResponse response = invoke(request);
assertEquals(200, response.getStatus());
- assertEquals(ENTRY, response.getContentAsString());
+ String msg =
+ TestUtils.diffIgnoreUpdateWithAttributeQualifier(ENTRY, response.getContentAsString());
+ assertNull(msg, msg);
}
private static final String ENTRY_STR =
Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AtomFeedProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AtomFeedProviderTest.java?rev=812495&r1=812494&r2=812495&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AtomFeedProviderTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AtomFeedProviderTest.java Tue Sep 8 13:09:56 2009
@@ -39,6 +39,7 @@
import org.apache.wink.common.model.synd.SyndFeed;
import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
import org.apache.wink.test.mock.MockRequestConstructor;
+import org.apache.wink.test.mock.TestUtils;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -111,7 +112,9 @@
"application/atom+xml");
MockHttpServletResponse response = invoke(request);
assertEquals(200, response.getStatus());
- assertEquals(FEED, response.getContentAsString());
+ String msg =
+ TestUtils.diffIgnoreUpdateWithAttributeQualifier(FEED, response.getContentAsString());
+ assertNull(msg, msg);
}
public void testGetAtomFeedElement() throws Exception {
@@ -121,7 +124,9 @@
"application/atom+xml");
MockHttpServletResponse response = invoke(request);
assertEquals(200, response.getStatus());
- assertEquals(FEED, response.getContentAsString());
+ String msg =
+ TestUtils.diffIgnoreUpdateWithAttributeQualifier(FEED, response.getContentAsString());
+ assertNull(msg, msg);
}
public void testGetAtomSyndFeed() throws Exception {
@@ -131,7 +136,9 @@
"application/atom+xml");
MockHttpServletResponse response = invoke(request);
assertEquals(200, response.getStatus());
- assertEquals(FEED, response.getContentAsString());
+ String msg =
+ TestUtils.diffIgnoreUpdateWithAttributeQualifier(FEED, response.getContentAsString());
+ assertNull(msg, msg);
}
public void testPostAtomFeed() throws Exception {
@@ -143,7 +150,9 @@
request.setContent(FEED.getBytes());
MockHttpServletResponse response = invoke(request);
assertEquals(200, response.getStatus());
- assertEquals(FEED, response.getContentAsString());
+ String msg =
+ TestUtils.diffIgnoreUpdateWithAttributeQualifier(FEED, response.getContentAsString());
+ assertNull(msg, msg);
}
public void testPostAtomFeedElement() throws Exception {
@@ -155,7 +164,9 @@
request.setContent(FEED.getBytes());
MockHttpServletResponse response = invoke(request);
assertEquals(200, response.getStatus());
- assertEquals(FEED, response.getContentAsString());
+ String msg =
+ TestUtils.diffIgnoreUpdateWithAttributeQualifier(FEED, response.getContentAsString());
+ assertNull(msg, msg);
}
public void testPostAtomSyndFeed() throws Exception {
@@ -167,7 +178,9 @@
request.setContent(FEED.getBytes());
MockHttpServletResponse response = invoke(request);
assertEquals(200, response.getStatus());
- assertEquals(FEED, response.getContentAsString());
+ String msg =
+ TestUtils.diffIgnoreUpdateWithAttributeQualifier(FEED, response.getContentAsString());
+ assertNull(msg, msg);
}
private static final String FEED_STR =
Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/EntityLocatorProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/EntityLocatorProviderTest.java?rev=812495&r1=812494&r2=812495&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/EntityLocatorProviderTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/EntityLocatorProviderTest.java Tue Sep 8 13:09:56 2009
@@ -34,6 +34,7 @@
import org.apache.wink.common.model.atom.ObjectFactory;
import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
import org.apache.wink.test.mock.MockRequestConstructor;
+import org.apache.wink.test.mock.TestUtils;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -152,7 +153,9 @@
MockRequestConstructor.constructMockRequest("GET", url, "application/atom+xml");
MockHttpServletResponse response = invoke(request);
assertEquals(200, response.getStatus());
- assertEquals(ENTRY, response.getContentAsString());
+ String msg =
+ TestUtils.diffIgnoreUpdateWithAttributeQualifier(ENTRY, response.getContentAsString());
+ assertNull(msg, msg);
}
private void postAtomEntry(String url) throws Exception {
@@ -162,7 +165,9 @@
request.setContent(ENTRY.getBytes());
MockHttpServletResponse response = invoke(request);
assertEquals(200, response.getStatus());
- assertEquals(ENTRY, response.getContentAsString());
+ String msg =
+ TestUtils.diffIgnoreUpdateWithAttributeQualifier(ENTRY, response.getContentAsString());
+ assertNull(msg, msg);
}
}
Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/SyndEntryLocatorProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/SyndEntryLocatorProviderTest.java?rev=812495&r1=812494&r2=812495&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/SyndEntryLocatorProviderTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/SyndEntryLocatorProviderTest.java Tue Sep 8 13:09:56 2009
@@ -31,6 +31,7 @@
import org.apache.wink.common.model.synd.SyndText;
import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
import org.apache.wink.test.mock.MockRequestConstructor;
+import org.apache.wink.test.mock.TestUtils;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -89,7 +90,9 @@
MockRequestConstructor.constructMockRequest("GET", "/test", "application/atom+xml");
MockHttpServletResponse response = invoke(request);
assertEquals(200, response.getStatus());
- assertEquals(ENTRY, response.getContentAsString());
+ String msg =
+ TestUtils.diffIgnoreUpdateWithAttributeQualifier(ENTRY, response.getContentAsString());
+ assertNull(msg, msg);
}
public void testPostAtomEntry() throws Exception {
@@ -99,7 +102,9 @@
request.setContent(ENTRY.getBytes());
MockHttpServletResponse response = invoke(request);
assertEquals(200, response.getStatus());
- assertEquals(ENTRY, response.getContentAsString());
+ String msg =
+ TestUtils.diffIgnoreUpdateWithAttributeQualifier(ENTRY, response.getContentAsString());
+ assertNull(msg, msg);
}
}
Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/SyndFeedLocatorProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/SyndFeedLocatorProviderTest.java?rev=812495&r1=812494&r2=812495&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/SyndFeedLocatorProviderTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/SyndFeedLocatorProviderTest.java Tue Sep 8 13:09:56 2009
@@ -31,6 +31,7 @@
import org.apache.wink.common.model.synd.SyndText;
import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
import org.apache.wink.test.mock.MockRequestConstructor;
+import org.apache.wink.test.mock.TestUtils;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -88,7 +89,9 @@
MockRequestConstructor.constructMockRequest("GET", "/test", "application/atom+xml");
MockHttpServletResponse response = invoke(request);
assertEquals(200, response.getStatus());
- assertEquals(FEED, response.getContentAsString());
+ String msg =
+ TestUtils.diffIgnoreUpdateWithAttributeQualifier(FEED, response.getContentAsString());
+ assertNull(msg, msg);
}
public void testPostAtomFeed() throws Exception {
@@ -98,7 +101,9 @@
request.setContent(FEED.getBytes());
MockHttpServletResponse response = invoke(request);
assertEquals(200, response.getStatus());
- assertEquals(FEED, response.getContentAsString());
+ String msg =
+ TestUtils.diffIgnoreUpdateWithAttributeQualifier(FEED, response.getContentAsString());
+ assertNull(msg, msg);
}
}
Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/ResponseDispatchTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/ResponseDispatchTest.java?rev=812495&r1=812494&r2=812495&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/ResponseDispatchTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/ResponseDispatchTest.java Tue Sep 8 13:09:56 2009
@@ -33,6 +33,7 @@
import org.apache.wink.common.model.synd.SyndEntry;
import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
import org.apache.wink.test.mock.MockRequestConstructor;
+import org.apache.wink.test.mock.TestUtils;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -66,8 +67,11 @@
servletRequest.setContentType("text/xml");
MockHttpServletResponse response = invoke(servletRequest);
assertEquals("status", 201, response.getStatus());
- assertEquals("content", "<entry xmlns=\"http://www.w3.org/2005/Atom\"/>", response
- .getContentAsString().trim());
+ String msg =
+ TestUtils
+ .diffIgnoreUpdateWithAttributeQualifier("<entry xmlns=\"http://www.w3.org/2005/Atom\"/>",
+ response.getContentAsString().trim());
+ assertNull(msg, msg);
}
}