You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directmemory.apache.org by ol...@apache.org on 2012/02/22 15:29:14 UTC
svn commit: r1292310 - in /incubator/directmemory/trunk:
directmemory-tests/src/main/java/org/apache/directmemory/test/
server/directmemory-server/src/test/java/org/apache/directmemory/server/services/
Author: olamy
Date: Wed Feb 22 14:29:13 2012
New Revision: 1292310
URL: http://svn.apache.org/viewvc?rev=1292310&view=rev
Log:
refactor http client tests to be able to reuse code for other types
Added:
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java (contents, props changed)
- copied, changed from r1292309, incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/ServletWithClientTest.java
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/ServletWithClientJsonTypeTest.java (with props)
Removed:
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/ServletWithClientTest.java
Modified:
incubator/directmemory/trunk/directmemory-tests/src/main/java/org/apache/directmemory/test/AbstractSerializerTest.java
Modified: incubator/directmemory/trunk/directmemory-tests/src/main/java/org/apache/directmemory/test/AbstractSerializerTest.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-tests/src/main/java/org/apache/directmemory/test/AbstractSerializerTest.java?rev=1292310&r1=1292309&r2=1292310&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-tests/src/main/java/org/apache/directmemory/test/AbstractSerializerTest.java (original)
+++ incubator/directmemory/trunk/directmemory-tests/src/main/java/org/apache/directmemory/test/AbstractSerializerTest.java Wed Feb 22 14:29:13 2012
@@ -44,7 +44,8 @@ public abstract class AbstractSerializer
public void simpleSerialization()
throws Exception
{
- Wine wine = new Wine( "Gevrey-Chambertin", "nice French wine from Bourgogne" );
+ Wine wine = getWineInstance();
+
Serializer serializer = SerializerFactory.createNewSerializer( getSerializerClassName() );
byte[] bytes = serializer.serialize( wine );
@@ -55,4 +56,9 @@ public abstract class AbstractSerializer
assertEquals( wine.getDescription(), newWine.getDescription() );
}
+
+ protected Wine getWineInstance()
+ {
+ return new Wine( "Gevrey-Chambertin", "nice French wine from Bourgogne" );
+ }
}
Copied: incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java (from r1292309, incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/ServletWithClientTest.java)
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java?p2=incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java&p1=incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/ServletWithClientTest.java&r1=1292309&r2=1292310&rev=1292310&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/ServletWithClientTest.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java Wed Feb 22 14:29:13 2012
@@ -40,7 +40,7 @@ import static org.junit.Assert.*;
/**
* @author Olivier Lamy
*/
-public class ServletWithClientTest
+public abstract class AbstractServletWithClientTest
{
Logger log = LoggerFactory.getLogger( getClass() );
@@ -50,6 +50,7 @@ public class ServletWithClientTest
DirectMemoryServerClient client;
+ protected abstract ExchangeType getExchangeType();
@Before
public void initialize()
@@ -72,12 +73,9 @@ public class ServletWithClientTest
// START SNIPPET: client-configuration
DirectMemoryServerClientConfiguration configuration =
- new DirectMemoryServerClientConfiguration()
- .setHost( "localhost" )
- .setPort( port )
- .setHttpPath( "/direct-memory/CacheServlet" )
- .setSerializer( SerializerFactory.createNewSerializer())
- .setExchangeType( ExchangeType.JSON );
+ new DirectMemoryServerClientConfiguration().setHost( "localhost" ).setPort( port ).setHttpPath(
+ "/direct-memory/CacheServlet" ).setSerializer(
+ SerializerFactory.createNewSerializer() ).setExchangeType( getExchangeType() );
DirectMemoryHttpClient httpClient = HttpClientDirectMemoryHttpClient.instance( configuration );
configuration.setDirectMemoryHttpClient( httpClient );
@@ -99,14 +97,12 @@ public class ServletWithClientTest
// START SNIPPET: client-put
Wine bordeaux = new Wine( "Bordeaux", "very great wine" );
- client.put(
- new DirectMemoryCacheRequest<Wine>( "bordeaux", bordeaux ) );
+ client.put( new DirectMemoryCacheRequest<Wine>( "bordeaux", bordeaux ) );
// END SNIPPET: client-put
// START SNIPPET: client-get
- DirectMemoryCacheRequest rq =
- new DirectMemoryCacheRequest( "bordeaux", Wine.class );
+ DirectMemoryCacheRequest rq = new DirectMemoryCacheRequest( "bordeaux", Wine.class );
DirectMemoryCacheResponse<Wine> response = client.retrieve( rq );
@@ -122,8 +118,8 @@ public class ServletWithClientTest
throws Exception
{
- DirectMemoryCacheResponse<Wine> response = client.retrieve(
- new DirectMemoryCacheRequest( "Italian wine better than French", Wine.class ) );
+ DirectMemoryCacheResponse<Wine> response =
+ client.retrieve( new DirectMemoryCacheRequest( "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() );
@@ -138,8 +134,8 @@ public class ServletWithClientTest
client.put( new DirectMemoryCacheRequest<Wine>( "bordeaux", bordeaux ) );
- DirectMemoryCacheResponse<Wine> response = client.retrieve(
- new DirectMemoryCacheRequest( "bordeaux", Wine.class ) );
+ DirectMemoryCacheResponse<Wine> response =
+ client.retrieve( new DirectMemoryCacheRequest( "bordeaux", Wine.class ) );
assertTrue( response.isFound() );
Wine wine = response.getResponse();
@@ -148,8 +144,7 @@ public class ServletWithClientTest
// START SNIPPET: client-delete
- DirectMemoryCacheResponse deleteResponse =
- client.delete( new DirectMemoryCacheRequest<Wine>( "bordeaux" ) );
+ DirectMemoryCacheResponse deleteResponse = client.delete( new DirectMemoryCacheRequest<Wine>( "bordeaux" ) );
assertTrue( deleteResponse.isDeleted() );
// END SNIPPET: client-delete
@@ -165,8 +160,7 @@ public class ServletWithClientTest
public void deleteNotFound()
throws Exception
{
- DirectMemoryCacheResponse deleteResponse =
- client.delete( new DirectMemoryCacheRequest<Wine>( "fofoofofof" ) );
+ DirectMemoryCacheResponse deleteResponse = client.delete( new DirectMemoryCacheRequest<Wine>( "fofoofofof" ) );
assertFalse( deleteResponse.isDeleted() );
}
}
Propchange: incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/ServletWithClientJsonTypeTest.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/ServletWithClientJsonTypeTest.java?rev=1292310&view=auto
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/ServletWithClientJsonTypeTest.java (added)
+++ incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/ServletWithClientJsonTypeTest.java Wed Feb 22 14:29:13 2012
@@ -0,0 +1,34 @@
+package org.apache.directmemory.server.services;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.directmemory.server.commons.ExchangeType;
+
+/**
+ * @author Olivier Lamy
+ */
+public class ServletWithClientJsonTypeTest
+ extends AbstractServletWithClientTest
+{
+ @Override
+ protected ExchangeType getExchangeType()
+ {
+ return ExchangeType.JSON;
+ }
+}
Propchange: incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/ServletWithClientJsonTypeTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/ServletWithClientJsonTypeTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision