Return-Path: Delivered-To: apmail-abdera-commits-archive@www.apache.org Received: (qmail 50196 invoked from network); 28 Nov 2010 20:46:11 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 28 Nov 2010 20:46:11 -0000 Received: (qmail 3690 invoked by uid 500); 28 Nov 2010 20:46:10 -0000 Delivered-To: apmail-abdera-commits-archive@abdera.apache.org Received: (qmail 3647 invoked by uid 500); 28 Nov 2010 20:46:10 -0000 Mailing-List: contact commits-help@abdera.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@abdera.apache.org Delivered-To: mailing list commits@abdera.apache.org Received: (qmail 3640 invoked by uid 99); 28 Nov 2010 20:46:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Nov 2010 20:46:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Nov 2010 20:46:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C0A792388A36; Sun, 28 Nov 2010 20:44:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1039944 - in /abdera/java/trunk/server/src: main/java/org/apache/abdera/protocol/server/processors/ test/java/org/apache/abdera/protocol/server/processors/ Date: Sun, 28 Nov 2010 20:44:33 -0000 To: commits@abdera.apache.org From: antelder@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101128204433.C0A792388A36@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: antelder Date: Sun Nov 28 20:44:33 2010 New Revision: 1039944 URL: http://svn.apache.org/viewvc?rev=1039944&view=rev Log: ABDERA-262: Apply patch from Nathan Reese to fix EntryRequestProcessor and MediaRequestProcessor do not support POST Added: abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/processors/ abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/processors/EntryRequestProcessorTest.java (with props) abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/processors/MediaRequestProcessorTest.java (with props) Modified: abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/processors/EntryRequestProcessor.java abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/processors/MediaRequestProcessor.java Modified: abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/processors/EntryRequestProcessor.java URL: http://svn.apache.org/viewvc/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/processors/EntryRequestProcessor.java?rev=1039944&r1=1039943&r2=1039944&view=diff ============================================================================== --- abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/processors/EntryRequestProcessor.java (original) +++ abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/processors/EntryRequestProcessor.java Sun Nov 28 20:44:33 2010 @@ -44,6 +44,8 @@ public class EntryRequestProcessor imple String method = context.getMethod(); if (method.equalsIgnoreCase("GET")) { return adapter.getEntry(context); + } else if (method.equalsIgnoreCase("POST")) { + return adapter.postEntry(context); } else if (method.equalsIgnoreCase("PUT")) { return adapter.putEntry(context); } else if (method.equalsIgnoreCase("DELETE")) { Modified: abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/processors/MediaRequestProcessor.java URL: http://svn.apache.org/viewvc/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/processors/MediaRequestProcessor.java?rev=1039944&r1=1039943&r2=1039944&view=diff ============================================================================== --- abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/processors/MediaRequestProcessor.java (original) +++ abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/processors/MediaRequestProcessor.java Sun Nov 28 20:44:33 2010 @@ -47,6 +47,8 @@ public class MediaRequestProcessor imple MediaCollectionAdapter mcadapter = (MediaCollectionAdapter)adapter; if (method.equalsIgnoreCase("GET")) { return mcadapter.getMedia(context); + } else if (method.equalsIgnoreCase("POST")) { + return mcadapter.postMedia(context); } else if (method.equalsIgnoreCase("PUT")) { return mcadapter.putMedia(context); } else if (method.equalsIgnoreCase("DELETE")) { Added: abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/processors/EntryRequestProcessorTest.java URL: http://svn.apache.org/viewvc/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/processors/EntryRequestProcessorTest.java?rev=1039944&view=auto ============================================================================== --- abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/processors/EntryRequestProcessorTest.java (added) +++ abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/processors/EntryRequestProcessorTest.java Sun Nov 28 20:44:33 2010 @@ -0,0 +1,110 @@ +package org.apache.abdera.protocol.server.processors; + +import static org.junit.Assert.*; + +import org.apache.abdera.protocol.server.CollectionAdapter; +import org.apache.abdera.protocol.server.RequestContext; +import org.apache.abdera.protocol.server.ResponseContext; +import org.easymock.EasyMock; +import org.junit.*; + +public class EntryRequestProcessorTest { + + private EntryRequestProcessor processor = new EntryRequestProcessor(); + private CollectionAdapter adapterMock = EasyMock.createStrictMock(CollectionAdapter.class); + private RequestContext requestMock = EasyMock.createStrictMock(RequestContext.class); + private ResponseContext responseMock = EasyMock.createStrictMock(ResponseContext.class); + + @After + public void verify() throws Exception { + EasyMock.verify(adapterMock); + EasyMock.verify(requestMock); + EasyMock.verify(responseMock); + } + + @Test + public void testProcessEntryGet() { + EasyMock.replay(responseMock); + + EasyMock.expect(requestMock.getMethod()).andReturn("GET"); + EasyMock.replay(requestMock); + + EasyMock.expect(adapterMock.getEntry(requestMock)).andReturn(responseMock); + EasyMock.replay(adapterMock); + + ResponseContext response = processor.processEntry(requestMock, adapterMock); + assertNotNull(response); + } + + @Test + public void testProcessEntryPost() { + EasyMock.replay(responseMock); + + EasyMock.expect(requestMock.getMethod()).andReturn("POST"); + EasyMock.replay(requestMock); + + EasyMock.expect(adapterMock.postEntry(requestMock)).andReturn(responseMock); + EasyMock.replay(adapterMock); + + ResponseContext response = processor.processEntry(requestMock, adapterMock); + assertNotNull(response); + } + + @Test + public void testProcessEntryPut() { + EasyMock.replay(responseMock); + + EasyMock.expect(requestMock.getMethod()).andReturn("PUT"); + EasyMock.replay(requestMock); + + EasyMock.expect(adapterMock.putEntry(requestMock)).andReturn(responseMock); + EasyMock.replay(adapterMock); + + ResponseContext response = processor.processEntry(requestMock, adapterMock); + assertNotNull(response); + } + + @Test + public void testProcessEntryDelete() { + EasyMock.replay(responseMock); + + EasyMock.expect(requestMock.getMethod()).andReturn("DELETE"); + EasyMock.replay(requestMock); + + EasyMock.expect(adapterMock.deleteEntry(requestMock)).andReturn(responseMock); + EasyMock.replay(adapterMock); + + ResponseContext response = processor.processEntry(requestMock, adapterMock); + assertNotNull(response); + } + + @Test + public void testProcessEntryHead() { + EasyMock.replay(responseMock); + + EasyMock.expect(requestMock.getMethod()).andReturn("HEAD"); + EasyMock.replay(requestMock); + + EasyMock.expect(adapterMock.headEntry(requestMock)).andReturn(responseMock); + EasyMock.replay(adapterMock); + + ResponseContext response = processor.processEntry(requestMock, adapterMock); + assertNotNull(response); + } + + @Test + public void testProcessEntryOptions() { + EasyMock.replay(responseMock); + + EasyMock.expect(requestMock.getMethod()).andReturn("OPTIONS"); + EasyMock.replay(requestMock); + + EasyMock.expect(adapterMock.optionsEntry(requestMock)).andReturn(responseMock); + EasyMock.replay(adapterMock); + + ResponseContext response = processor.processEntry(requestMock, adapterMock); + assertNotNull(response); + } + + +} Propchange: abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/processors/EntryRequestProcessorTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/processors/EntryRequestProcessorTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/processors/MediaRequestProcessorTest.java URL: http://svn.apache.org/viewvc/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/processors/MediaRequestProcessorTest.java?rev=1039944&view=auto ============================================================================== --- abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/processors/MediaRequestProcessorTest.java (added) +++ abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/processors/MediaRequestProcessorTest.java Sun Nov 28 20:44:33 2010 @@ -0,0 +1,110 @@ +package org.apache.abdera.protocol.server.processors; + +import static org.junit.Assert.*; + +import org.apache.abdera.protocol.server.MediaCollectionAdapter; +import org.apache.abdera.protocol.server.RequestContext; +import org.apache.abdera.protocol.server.ResponseContext; +import org.easymock.EasyMock; +import org.junit.*; + +public class MediaRequestProcessorTest { + + private MediaRequestProcessor processor = new MediaRequestProcessor(); + private MediaCollectionAdapter adapterMock = EasyMock.createStrictMock(MediaCollectionAdapter.class); + private RequestContext requestMock = EasyMock.createStrictMock(RequestContext.class); + private ResponseContext responseMock = EasyMock.createStrictMock(ResponseContext.class); + + @After + public void verify() throws Exception { + EasyMock.verify(adapterMock); + EasyMock.verify(requestMock); + EasyMock.verify(responseMock); + } + + @Test + public void testProcessMediaGet() { + EasyMock.replay(responseMock); + + EasyMock.expect(requestMock.getMethod()).andReturn("GET"); + EasyMock.replay(requestMock); + + EasyMock.expect(adapterMock.getMedia(requestMock)).andReturn(responseMock); + EasyMock.replay(adapterMock); + + ResponseContext response = processor.processMedia(requestMock, adapterMock); + assertNotNull(response); + } + + @Test + public void testProcessMediaPost() { + EasyMock.replay(responseMock); + + EasyMock.expect(requestMock.getMethod()).andReturn("POST"); + EasyMock.replay(requestMock); + + EasyMock.expect(adapterMock.postMedia(requestMock)).andReturn(responseMock); + EasyMock.replay(adapterMock); + + ResponseContext response = processor.processMedia(requestMock, adapterMock); + assertNotNull(response); + } + + @Test + public void testProcessMediaPut() { + EasyMock.replay(responseMock); + + EasyMock.expect(requestMock.getMethod()).andReturn("PUT"); + EasyMock.replay(requestMock); + + EasyMock.expect(adapterMock.putMedia(requestMock)).andReturn(responseMock); + EasyMock.replay(adapterMock); + + ResponseContext response = processor.processMedia(requestMock, adapterMock); + assertNotNull(response); + } + + @Test + public void testProcessMediaDelete() { + EasyMock.replay(responseMock); + + EasyMock.expect(requestMock.getMethod()).andReturn("DELETE"); + EasyMock.replay(requestMock); + + EasyMock.expect(adapterMock.deleteMedia(requestMock)).andReturn(responseMock); + EasyMock.replay(adapterMock); + + ResponseContext response = processor.processMedia(requestMock, adapterMock); + assertNotNull(response); + } + + @Test + public void testProcessMediaHead() { + EasyMock.replay(responseMock); + + EasyMock.expect(requestMock.getMethod()).andReturn("HEAD"); + EasyMock.replay(requestMock); + + EasyMock.expect(adapterMock.headMedia(requestMock)).andReturn(responseMock); + EasyMock.replay(adapterMock); + + ResponseContext response = processor.processMedia(requestMock, adapterMock); + assertNotNull(response); + } + + @Test + public void testProcessMediaOptions() { + EasyMock.replay(responseMock); + + EasyMock.expect(requestMock.getMethod()).andReturn("OPTIONS"); + EasyMock.replay(requestMock); + + EasyMock.expect(adapterMock.optionsMedia(requestMock)).andReturn(responseMock); + EasyMock.replay(adapterMock); + + ResponseContext response = processor.processMedia(requestMock, adapterMock); + assertNotNull(response); + } + + +} Propchange: abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/processors/MediaRequestProcessorTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/processors/MediaRequestProcessorTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date