Support cloning of primitive arrays

2 files changed, 41 insertions, 21 deletions

diff --git a/processing/src/test/java/com/yahoo/processing/request/test/PropertyMapTestCase.java b/processing/src/test/java/com/yahoo/processing/request/test/PropertyMapTestCase.java
index 812ce2fae65..3822286daac 100644
--- a/processing/src/test/java/com/yahoo/processing/request/test/PropertyMapTestCase.java
+++ b/processing/src/test/java/com/yahoo/processing/request/test/PropertyMapTestCase.java
@@ -3,23 +3,30 @@ package com.yahoo.processing.request.test;
 
 import com.yahoo.processing.request.properties.PropertyMap;
 import com.yahoo.processing.request.properties.PublicCloneable;
+import org.junit.Test;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 /**
  * @author  bratseth
  */
-public class PropertyMapTestCase extends junit.framework.TestCase {
-
-    public void testCloning() {
-        PropertyMap map=new PropertyMap();
-        map.set("clonable",new ClonableObject());
-        map.set("publicClonable",new PublicClonableObject());
-        map.set("nonclonable",new NonClonableObject());
-        map.set("clonableArray",new ClonableObject[] {new ClonableObject()});
-        map.set("publicClonableArray",new ClonableObject[] {new ClonableObject()});
-        map.set("nonclonableArray",new NonClonableObject[] {new NonClonableObject()});
+public class PropertyMapTestCase {
+
+    @Test
+    public void testObjectCloning() {
+        PropertyMap map = new PropertyMap();
+        map.set("clonable", new ClonableObject());
+        map.set("publicClonable", new PublicClonableObject());
+        map.set("nonclonable", new NonClonableObject());
+        map.set("clonableArray", new ClonableObject[] {new ClonableObject()});
+        map.set("publicClonableArray", new ClonableObject[] {new ClonableObject()});
+        map.set("nonclonableArray", new NonClonableObject[] {new NonClonableObject()});
         map.set("clonableList", Collections.singletonList(new ClonableObject()));
         map.set("nonclonableList", Collections.singletonList(new NonClonableObject()));
         assertNotNull(map.get("clonable"));
@@ -36,6 +43,17 @@ public class PropertyMapTestCase extends junit.framework.TestCase {
         assertTrue(first(map.get("publicClonableArray")) != first(mapClone.get("publicClonableArray")));
         assertTrue(first(map.get("nonclonableArray")) == first(mapClone.get("nonclonableArray")));
     }
+    
+    @Test
+    public void testArrayCloning() {
+        PropertyMap map = new PropertyMap();
+        byte[] byteArray = new byte[] {2, 4, 7};
+        map.set("byteArray", byteArray);
+
+        PropertyMap mapClone = map.clone();
+        assertArrayEquals(byteArray, (byte[])mapClone.get("byteArray"));
+        assertTrue("Array was cloned", mapClone.get("byteArray") != byteArray);
+    }
 
     private Object first(Object object) {
         if (object instanceof Object[])
diff --git a/processing/src/test/java/com/yahoo/processing/request/test/RequestTestCase.java b/processing/src/test/java/com/yahoo/processing/request/test/RequestTestCase.java
index 7045ea1efbd..a2e26494113 100644
--- a/processing/src/test/java/com/yahoo/processing/request/test/RequestTestCase.java
+++ b/processing/src/test/java/com/yahoo/processing/request/test/RequestTestCase.java
@@ -8,6 +8,8 @@ import com.yahoo.processing.request.Properties;
 import com.yahoo.processing.request.properties.PropertyMap;
 import org.junit.Test;
 
+import java.util.Arrays;
+
 /**
  * Tests using requests
  *
@@ -117,17 +119,17 @@ public class RequestTestCase extends junit.framework.TestCase {
         request.properties().set("d", "d1");
         request.errors().add(new ErrorMessage("boz"));
 
-        assertEquals("a1",request.properties().get("a"));
-        assertEquals("a1",rcloned.properties().get("a"));
-        assertEquals("b1",request.properties().get("b"));
-        assertEquals("b1",rcloned.properties().get("b"));
-        assertEquals(null,request.properties().get("c"));
-        assertEquals("c1",rcloned.properties().get("c"));
-        assertEquals("d1",request.properties().get("d"));
-        assertEquals(null,rcloned.properties().get("d"));
-
-        assertEquals(3,request.errors().size());
-        assertEquals(1,rcloned.errors().size());
+        assertEquals("a1", request.properties().get("a"));
+        assertEquals("a1", rcloned.properties().get("a"));
+        assertEquals("b1", request.properties().get("b"));
+        assertEquals("b1", rcloned.properties().get("b"));
+        assertEquals(null, request.properties().get("c"));
+        assertEquals("c1", rcloned.properties().get("c"));
+        assertEquals("d1", request.properties().get("d"));
+        assertEquals(null, rcloned.properties().get("d"));
+
+        assertEquals(3, request.errors().size());
+        assertEquals(1, rcloned.errors().size());
         assertEquals("foo",request.errors().get(0).getMessage());
         assertEquals("bar",request.errors().get(1).getMessage());
         assertEquals("boz",request.errors().get(2).getMessage());