diff options
| author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-26 19:17:45 +0000 |
|---|---|---|
| committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-26 19:17:45 +0000 |
| commit | 6c9f9282a4128828935410540d99faae793cee17 (patch) | |
| tree | 5e87b13448739c1e59feea509db8ce1729800378 /sca-java-1.x/trunk/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca | |
| parent | 958f042702b2b8fa766b6117da4212e4bfb58edd (diff) | |
Merge r1025777 TUSCANY-3743: Return correct response code from If-Unmodified-Since
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027693 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-1.x/trunk/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca')
| -rw-r--r-- | sca-java-1.x/trunk/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sca-java-1.x/trunk/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java b/sca-java-1.x/trunk/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java index fd60ec447e..7ddc193bdc 100644 --- a/sca-java-1.x/trunk/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java +++ b/sca-java-1.x/trunk/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java @@ -290,8 +290,8 @@ public class ProviderFeedEntityTagsTestCase { ClientResponse res = client.get(providerURI, opts); Assert.assertNotNull(res); try { - // Should return 304 - Feed not provided since feed is modified since. - Assert.assertEquals(304, res.getStatus()); + // Should return 412 - Feed not provided since feed is modified since. + Assert.assertEquals(412, res.getStatus()); } finally { res.release(); } |