Modified: incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java?rev=1292582&r1=1292581&r2=1292582&view=diff ============================================================================== --- incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java (original) +++ incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java Wed Feb 22 23:24:14 2012 @@ -26,8 +26,8 @@ import org.apache.directmemory.server.cl import org.apache.directmemory.server.client.DirectMemoryHttpClient; import org.apache.directmemory.server.client.DirectMemoryClient; import org.apache.directmemory.server.client.HttpClientDirectMemoryHttpClient; -import org.apache.directmemory.server.commons.DirectMemoryCacheRequest; -import org.apache.directmemory.server.commons.DirectMemoryCacheResponse; +import org.apache.directmemory.server.commons.DirectMemoryRequest; +import org.apache.directmemory.server.commons.DirectMemoryResponse; import org.apache.directmemory.server.commons.ExchangeType; import org.apache.directmemory.test.Wine; import org.junit.Before; @@ -100,14 +100,14 @@ public abstract class AbstractServletWit // START SNIPPET: client-put Wine bordeaux = new Wine( "Bordeaux", "very great wine" ); - client.put( new DirectMemoryCacheRequest<Wine>( "bordeaux", bordeaux ) ); + client.put( new DirectMemoryRequest<Wine>( "bordeaux", bordeaux ) ); // END SNIPPET: client-put // START SNIPPET: client-get - DirectMemoryCacheRequest rq = new DirectMemoryCacheRequest( "bordeaux", Wine.class ); + DirectMemoryRequest rq = new DirectMemoryRequest( "bordeaux", Wine.class ); - DirectMemoryCacheResponse<Wine> response = client.retrieve( rq ); + DirectMemoryResponse<Wine> response = client.retrieve( rq ); assertTrue( response.isFound() ); Wine wine = response.getResponse(); @@ -121,8 +121,8 @@ public abstract class AbstractServletWit throws Exception { - DirectMemoryCacheResponse<Wine> response = - client.retrieve( new DirectMemoryCacheRequest( "Italian wine better than French", Wine.class ) ); + DirectMemoryResponse<Wine> response = + client.retrieve( new DirectMemoryRequest( "Italian wine better than French", Wine.class ) ); // due to the key used the server should response BAD Request but it says not found assertFalse( response.isFound() ); @@ -135,10 +135,10 @@ public abstract class AbstractServletWit { Wine bordeaux = new Wine( "Bordeaux", "very great wine" ); - client.put( new DirectMemoryCacheRequest<Wine>( "bordeaux", bordeaux ) ); + client.put( new DirectMemoryRequest<Wine>( "bordeaux", bordeaux ) ); - DirectMemoryCacheResponse<Wine> response = - client.retrieve( new DirectMemoryCacheRequest( "bordeaux", Wine.class ) ); + DirectMemoryResponse<Wine> response = + client.retrieve( new DirectMemoryRequest( "bordeaux", Wine.class ) ); assertTrue( response.isFound() ); Wine wine = response.getResponse(); @@ -147,12 +147,12 @@ public abstract class AbstractServletWit // START SNIPPET: client-delete - DirectMemoryCacheResponse deleteResponse = client.delete( new DirectMemoryCacheRequest<Wine>( "bordeaux" ) ); + DirectMemoryResponse deleteResponse = client.delete( new DirectMemoryRequest<Wine>( "bordeaux" ) ); assertTrue( deleteResponse.isDeleted() ); // END SNIPPET: client-delete - response = client.retrieve( new DirectMemoryCacheRequest( "bordeaux", Wine.class ) ); + response = client.retrieve( new DirectMemoryRequest( "bordeaux", Wine.class ) ); assertFalse( response.isFound() ); wine = response.getResponse(); @@ -163,7 +163,7 @@ public abstract class AbstractServletWit public void deleteNotFound() throws Exception { - DirectMemoryCacheResponse deleteResponse = client.delete( new DirectMemoryCacheRequest<Wine>( "fofoofofof" ) ); + DirectMemoryResponse deleteResponse = client.delete( new DirectMemoryRequest<Wine>( "fofoofofof" ) ); assertFalse( deleteResponse.isDeleted() ); } @@ -172,13 +172,13 @@ public abstract class AbstractServletWit throws Exception { - DirectMemoryCacheResponse deleteResponse = client.delete( new DirectMemoryCacheRequest<Wine>( "bordeaux" ) ); + DirectMemoryResponse deleteResponse = client.delete( new DirectMemoryRequest<Wine>( "bordeaux" ) ); Wine bordeaux = new Wine( "Bordeaux", "very great wine" ); - client.put( new DirectMemoryCacheRequest<Wine>( "bordeaux", bordeaux ).setExpiresIn( 1000 ) ); + client.put( new DirectMemoryRequest<Wine>( "bordeaux", bordeaux ).setExpiresIn( 1000 ) ); - DirectMemoryCacheRequest rq = new DirectMemoryCacheRequest( "bordeaux", Wine.class ); + DirectMemoryRequest rq = new DirectMemoryRequest( "bordeaux", Wine.class ); - DirectMemoryCacheResponse<Wine> response = client.retrieve( rq ); + DirectMemoryResponse<Wine> response = client.retrieve( rq ); assertTrue( response.isFound() ); Wine wine = response.getResponse(); @@ -188,7 +188,7 @@ public abstract class AbstractServletWit Thread.sleep( 10001 ); - rq = new DirectMemoryCacheRequest( "bordeaux", Wine.class ); + rq = new DirectMemoryRequest( "bordeaux", Wine.class ); response = client.retrieve( rq );
Modified: incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/CacheServletTest.java URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/CacheServletTest.java?rev=1292582&r1=1292581&r2=1292582&view=diff ============================================================================== --- incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/CacheServletTest.java (original) +++ incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/CacheServletTest.java Wed Feb 22 23:24:14 2012 @@ -20,10 +20,10 @@ package org.apache.directmemory.server.s import org.apache.directmemory.serialization.Serializer; import org.apache.directmemory.serialization.SerializerFactory; -import org.apache.directmemory.server.commons.DirectMemoryCacheParser; -import org.apache.directmemory.server.commons.DirectMemoryCacheRequest; -import org.apache.directmemory.server.commons.DirectMemoryCacheResponse; -import org.apache.directmemory.server.commons.DirectMemoryCacheWriter; +import org.apache.directmemory.server.commons.DirectMemoryParser; +import org.apache.directmemory.server.commons.DirectMemoryRequest; +import org.apache.directmemory.server.commons.DirectMemoryResponse; +import org.apache.directmemory.server.commons.DirectMemoryWriter; import org.apache.directmemory.test.Wine; import org.junit.Before; import org.junit.Test; @@ -49,9 +49,9 @@ public class CacheServletTest CacheServlet cacheServlet = new CacheServlet(); - DirectMemoryCacheWriter writer = DirectMemoryCacheWriter.instance(); + DirectMemoryWriter writer = DirectMemoryWriter.instance(); - DirectMemoryCacheParser parser = DirectMemoryCacheParser.instance(); + DirectMemoryParser parser = DirectMemoryParser.instance(); @Before public void init() @@ -112,10 +112,10 @@ public class CacheServletTest Wine bordeaux = new Wine( "Bordeaux", "very great wine" ); - DirectMemoryCacheRequest directMemoryCacheRequest = - new DirectMemoryCacheRequest().setKey( "bordeaux" ).setCacheContent( serializer.serialize( bordeaux ) ); + DirectMemoryRequest directMemoryRequest = + new DirectMemoryRequest().setKey( "bordeaux" ).setCacheContent( serializer.serialize( bordeaux ) ); - String rq = writer.generateJsonRequest( directMemoryCacheRequest ); + String rq = writer.generateJsonRequest( directMemoryRequest ); MockHttpServletRequest putRequest = new MockHttpServletRequest(); @@ -149,7 +149,7 @@ public class CacheServletTest assertEquals( MediaType.APPLICATION_JSON, getResponse.getContentType() ); - DirectMemoryCacheResponse response = + DirectMemoryResponse response = parser.buildResponse( new ByteArrayInputStream( getResponse.getContentAsByteArray() ) ); Wine wineFromCache = serializer.deserialize( response.getCacheContent(), Wine.class ); @@ -168,11 +168,11 @@ public class CacheServletTest Wine bordeaux = new Wine( "Bordeaux", "very great wine" ); - DirectMemoryCacheRequest directMemoryCacheRequest = - new DirectMemoryCacheRequest().setKey( "bordeaux" ).setCacheContent( + DirectMemoryRequest directMemoryRequest = + new DirectMemoryRequest().setKey( "bordeaux" ).setCacheContent( serializer.serialize( bordeaux ) ).setExpiresIn( 3 ); - String rq = writer.generateJsonRequest( directMemoryCacheRequest ); + String rq = writer.generateJsonRequest( directMemoryRequest ); MockHttpServletRequest putRequest = new MockHttpServletRequest(); @@ -219,10 +219,10 @@ public class CacheServletTest Wine bordeaux = new Wine( "Bordeaux", "very great wine" ); - DirectMemoryCacheRequest directMemoryCacheRequest = - new DirectMemoryCacheRequest().setKey( "bordeaux" ).setCacheContent( serializer.serialize( bordeaux ) ); + DirectMemoryRequest directMemoryRequest = + new DirectMemoryRequest().setKey( "bordeaux" ).setCacheContent( serializer.serialize( bordeaux ) ); - String rq = writer.generateJsonRequest( directMemoryCacheRequest ); + String rq = writer.generateJsonRequest( directMemoryRequest ); MockHttpServletRequest putRequest = new MockHttpServletRequest(); @@ -256,7 +256,7 @@ public class CacheServletTest assertEquals( MediaType.APPLICATION_JSON, getResponse.getContentType() ); - DirectMemoryCacheResponse response = + DirectMemoryResponse response = parser.buildResponse( new ByteArrayInputStream( getResponse.getContentAsByteArray() ) ); Wine wineFromCache = serializer.deserialize( response.getCacheContent(), Wine.class );
