svn commit: r1402299 - in /directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory: DefaultMemoryManagerServiceTest.java MemoryManagerServiceImplTest.java

[no...@apache.org]

Author: noctarius
Date: Thu Oct 25 19:48:36 2012
New Revision: 1402299

URL: http://svn.apache.org/viewvc?rev=1402299&view=rev
Log:
Added @Parameters annotations to test all implementations of MemoryManagers

Modified:
    directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/DefaultMemoryManagerServiceTest.java
    directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/MemoryManagerServiceImplTest.java

Modified: directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/DefaultMemoryManagerServiceTest.java
URL: http://svn.apache.org/viewvc/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/DefaultMemoryManagerServiceTest.java?rev=1402299&r1=1402298&r2=1402299&view=diff
==============================================================================
--- directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/DefaultMemoryManagerServiceTest.java (original)
+++ directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/DefaultMemoryManagerServiceTest.java Thu Oct 25 19:48:36 2012
@@ -1,5 +1,12 @@
 package org.apache.directmemory.memory;
 
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,14 +26,26 @@ package org.apache.directmemory.memory;
  * under the License.
  */
 
+@RunWith(Parameterized.class)
 public class DefaultMemoryManagerServiceTest
     extends AbstractMemoryManagerServiceTest
 {
 
+    @Parameters
+    public static Collection<Object[]> data() {
+        return Arrays.asList( new Object[][] {{new MemoryManagerServiceImpl<Object>()},{new UnsafeMemoryManagerServiceImpl<Object>()}} );
+    }
+    
+    private final MemoryManagerService<Object> memoryManagerService;
+    
+    public DefaultMemoryManagerServiceTest(MemoryManagerService<Object> memoryManagerService) {
+        this.memoryManagerService = memoryManagerService;
+    }
+    
     @Override
     protected MemoryManagerService<Object> instanciateMemoryManagerService( int bufferSize )
     {
-        final MemoryManagerService<Object> mms = new MemoryManagerServiceImpl<Object>();
+        final MemoryManagerService<Object> mms = memoryManagerService;
         mms.init( 1, bufferSize );
         return mms;
     }

Modified: directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/MemoryManagerServiceImplTest.java
URL: http://svn.apache.org/viewvc/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/MemoryManagerServiceImplTest.java?rev=1402299&r1=1402298&r2=1402299&view=diff
==============================================================================
--- directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/MemoryManagerServiceImplTest.java (original)
+++ directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/MemoryManagerServiceImplTest.java Thu Oct 25 19:48:36 2012
@@ -19,6 +19,8 @@ package org.apache.directmemory.memory;
  * under the License.
  */
 
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Random;
 
 import junit.framework.Assert;
@@ -27,7 +29,11 @@ import org.apache.directmemory.memory.Me
 import org.apache.directmemory.memory.MemoryManagerServiceImpl;
 import org.apache.directmemory.memory.Pointer;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
 
+@RunWith( Parameterized.class )
 public class MemoryManagerServiceImplTest
 {
 
@@ -35,9 +41,25 @@ public class MemoryManagerServiceImplTes
 
     protected static final byte[] SMALL_PAYLOAD = "ABCD".getBytes();
 
+    @Parameters
+    public static Collection<Object[]> data()
+    {
+        Object[][] data =
+            new Object[][] { { new MemoryManagerServiceImpl<Object>() },
+                { new UnsafeMemoryManagerServiceImpl<Object>() } };
+        return Arrays.asList( data );
+    }
+
+    private final MemoryManagerService<Object> memoryManagerService;
+
+    public MemoryManagerServiceImplTest( MemoryManagerService<Object> memoryManagerService )
+    {
+        this.memoryManagerService = memoryManagerService;
+    }
+
     protected MemoryManagerService<Object> getMemoryManagerService()
     {
-        return new MemoryManagerServiceImpl<Object>();
+        return memoryManagerService;
     }
 
     @Test