summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-10-26 19:30:36 +0000
committernash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-10-26 19:30:36 +0000
commitaa41dd85eaba767c5367675ec5aaf94746f0b1a8 (patch)
tree13e48534fed3575ba7ed9e9e1b6c34a344cf32fe
parentb47acbe16f56453ba9580f5f95034afefa445ea0 (diff)
Merge r1025782 TUSCANY-3743: Check for correct response code from If-Unmodified-Since
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027697 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-1.x/trunk/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTestCase.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/sca-java-1.x/trunk/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTestCase.java b/sca-java-1.x/trunk/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTestCase.java
index 8196ef5410..3ee44c4c0e 100644
--- a/sca-java-1.x/trunk/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTestCase.java
+++ b/sca-java-1.x/trunk/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTestCase.java
@@ -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);