You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tuscany.apache.org by na...@apache.org on 2010/10/26 21:30:36 UTC

svn commit: r1027697 - /tuscany/sca-java-1.x/trunk/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTestCase.java

Author: nash
Date: Tue Oct 26 19:30:36 2010
New Revision: 1027697

URL: http://svn.apache.org/viewvc?rev=1027697&view=rev
Log:
Merge r1025782 TUSCANY-3743: Check for correct response code from If-Unmodified-Since

Modified:
    tuscany/sca-java-1.x/trunk/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTestCase.java

Modified: tuscany/sca-java-1.x/trunk/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTestCase.java?rev=1027697&r1=1027696&r2=1027697&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTestCase.java (original)
+++ tuscany/sca-java-1.x/trunk/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTestCase.java Tue Oct 26 19:30:36 2010
@@ -213,9 +213,9 @@ public class FeedAggregatorTestCase {
         ClientResponse res = client.get(providerURI, opts);
         Assert.assertNotNull(res);
         try {
-            // Should return 304 - Feed not provided since feed is modified
+            // Should return 412 - Feed not provided since feed is modified
             // since.
-            Assert.assertEquals(304, res.getStatus());
+            Assert.assertEquals(412, res.getStatus());
 
             // Entry count and body size should be equal to basic request
             long thisContentLength = getContentLength(res);