Merge pull request #3 from XYOracleNetwork/develop

add to set

.gitignore

@@ -14,4 +14,5 @@ google-services.json
 core-android-sample/local.properties
 gradle/
 /xyo
-/out
+/out
+testingDb/

src/main/java/network/xyo/sdkobjectmodelkotlin/objects/sets/XyoObjectSetCreator.kt

@@ -60,4 +60,30 @@ object XyoObjectSetCreator {
         return XyoObjectCreator.createObject(schema, buffer.array())
     }
 
+    /**
+     * Adds to a set
+     */
+    fun addToIterableObject (item : ByteArray, set : ByteArray) : ByteArray {
+        val setSchema = XyoObjectSchema.createFromHeader(set.copyOfRange(0, 2))
+        val setValue = XyoObjectCreator.getObjectValue(set)
+
+        if (!setSchema.isIterable) throw XyoObjectExceotion("Can no add to non-iterable object.")
+
+        if (setSchema.isTyped) {
+            val schemaOfType = set.copyOfRange(2 + setSchema.sizeIdentifier, 4 + setSchema.sizeIdentifier)
+
+            if (!schemaOfType.contentEquals(item.copyOfRange(0, 2))) throw XyoObjectExceotion("Can not add different " +
+                    "type to typed array!")
+
+            val buffer = ByteBuffer.allocate(setValue.size + item.size - 2)
+            buffer.put(setValue)
+            buffer.put(item.copyOfRange(2, item.size))
+            return XyoObjectCreator.createObject(setSchema, buffer.array())
+        }
+
+        val buffer = ByteBuffer.allocate(setValue.size + item.size)
+        buffer.put(setValue)
+        buffer.put(item)
+        return XyoObjectCreator.createObject(setSchema, buffer.array())
+    }
 }

src/test/java/network/xyo/sdkobjectmodelkotlin/XyoObjectSetCreatorTest.kt

@@ -1,6 +1,7 @@
 package network.xyo.sdkobjectmodelkotlin
 
 import network.xyo.sdkobjectmodelkotlin.objects.XyoObjectCreator
+import network.xyo.sdkobjectmodelkotlin.objects.sets.XyoObjectIterator
 import network.xyo.sdkobjectmodelkotlin.objects.sets.XyoObjectSetCreator
 import network.xyo.sdkobjectmodelkotlin.schema.XyoObjectSchema
 import org.junit.Assert
@@ -61,4 +62,20 @@ class XyoObjectSetCreatorTest {
 
         Assert.assertArrayEquals(expectedSet, createdSet)
     }
+
+    @Test
+    fun addToUntypedArray () {
+        val originalSet = byteArrayOf(0x20, 0x41, 0x09, 0x00, 0x44, 0x02, 0x13, 0x00, 0x42, 0x02, 0x37)
+        val addedSet = XyoObjectSetCreator.addToIterableObject(originalSet, originalSet)
+        Assert.assertArrayEquals(originalSet, XyoObjectIterator(addedSet)[2])
+    }
+
+    @Test
+    fun addToTypedArray () {
+        val originalSet = byteArrayOf(0x30, 0x41, 0x07, 0x00, 0x44, 0x02, 0x13, 0x02, 0x37)
+        val itemToAdd = byteArrayOf(0x00, 0x44, 0x02, 0x18)
+        val addedSet = XyoObjectSetCreator.addToIterableObject(itemToAdd, originalSet)
+        Assert.assertArrayEquals(byteArrayOf(0x30, 0x41, 0x09, 0x00, 0x44, 0x02, 0x13, 0x02, 0x37, 0x02, 0x18), addedSet)
+        Assert.assertArrayEquals(itemToAdd, XyoObjectIterator(addedSet)[2])
+    }
 }