From: Brendan Tschaen <ctschaen@att.com>
Date: Thu, 7 May 2020 18:29:46 +0000 (+0000)
Subject: Merge "Junit for JSONObject"
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=886394400a8e64b5938fe264dc9a79856b4fd3f6;hp=5d480f9f08ec7e16418b4143cd14bbfdc9c6c95b;p=music.git

Merge "Junit for JSONObject"
---

diff --git a/music-core/src/test/java/org/onap/music/datastore/MusicDataStoreTest.java b/music-core/src/test/java/org/onap/music/datastore/MusicDataStoreTest.java
index 4de995f7..9260cd92 100644
--- a/music-core/src/test/java/org/onap/music/datastore/MusicDataStoreTest.java
+++ b/music-core/src/test/java/org/onap/music/datastore/MusicDataStoreTest.java
@@ -80,10 +80,6 @@ public class MusicDataStoreTest {
         dataStore = new MusicDataStore(cluster, session);
     }
 
-    @Test
-    public void testMusicDataStore() {
-        //MusicDataStore mds = new MusicDataStore();
-    }
     
     @Test
     public void testMusicDataStoreClusterSession() {
diff --git a/music-core/src/test/java/org/onap/music/datastore/jsonobjects/JsonDeleteTest.java b/music-core/src/test/java/org/onap/music/datastore/jsonobjects/JsonDeleteTest.java
index 0014f823..5b9cef8b 100644
--- a/music-core/src/test/java/org/onap/music/datastore/jsonobjects/JsonDeleteTest.java
+++ b/music-core/src/test/java/org/onap/music/datastore/jsonobjects/JsonDeleteTest.java
@@ -82,4 +82,32 @@ public class JsonDeleteTest {
 
     }
 
+    @Test
+    public void testGetKeyspaceName() {
+        jd.setKeyspaceName("keyspace");
+        assertEquals("keyspace",jd.getKeyspaceName());
+
+    }
+
+    @Test
+    public void testGetTableName() {
+        jd.setTableName("tablename");
+        assertEquals("tablename",jd.getTableName());
+
+    }
+
+    @Test
+    public void testGetPrimarKeyValue() {
+        jd.setPrimarKeyValue("primarykey");
+        assertEquals("primarykey",jd.getPrimarKeyValue());
+
+    }
+
+    @Test
+    public void testRowIdString() {
+        StringBuilder builder = new StringBuilder("testing");
+        jd.setRowIdString(builder);
+        assertEquals(jd.getRowIdString().toString(),builder.toString());
+    }
+
 }
diff --git a/music-core/src/test/java/org/onap/music/datastore/jsonobjects/JsonSelectTest.java b/music-core/src/test/java/org/onap/music/datastore/jsonobjects/JsonSelectTest.java
index 21c022ab..baada1d5 100644
--- a/music-core/src/test/java/org/onap/music/datastore/jsonobjects/JsonSelectTest.java
+++ b/music-core/src/test/java/org/onap/music/datastore/jsonobjects/JsonSelectTest.java
@@ -33,10 +33,10 @@ import java.util.Map;
 import org.junit.Test;
 
 public class JsonSelectTest {
+    JsonSelect js = new JsonSelect();
 
     @Test
     public void testGetConsistencyInfo() {
-        JsonSelect js = new JsonSelect();
         Map<String, String> mapSs = new HashMap<>();
         mapSs.put("k1", "one");
         js.setConsistencyInfo(mapSs);
@@ -45,11 +45,24 @@ public class JsonSelectTest {
 
     @Test
     public void testSerialize() throws IOException {
-        JsonSelect js = new JsonSelect();
         Map<String, String> mapSs = new HashMap<>();
         mapSs.put("Key", "Value");
         js.setConsistencyInfo(mapSs);
         js.serialize();
     }
 
+    @Test
+    public void testGetKeyspaceName() {
+        js.setKeyspaceName("testkeyspace");
+        assertEquals("testkeyspace",js.getKeyspaceName());
+
+    }
+
+    @Test
+    public void testGetTableName() {
+        js.setTableName("testkeyspace");
+        assertEquals("testkeyspace",js.getTableName());
+
+    }
+
 }
diff --git a/music-core/src/test/java/org/onap/music/datastore/jsonobjects/RowIdentifierTest.java b/music-core/src/test/java/org/onap/music/datastore/jsonobjects/RowIdentifierTest.java
new file mode 100644
index 00000000..e29f0377
--- /dev/null
+++ b/music-core/src/test/java/org/onap/music/datastore/jsonobjects/RowIdentifierTest.java
@@ -0,0 +1,60 @@
+/*-
+ * ============LICENSE_START==========================================
+ * ONAP MUSIC
+ * ===================================================================
+ * Copyright (C) 2020 IBM Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software 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.
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * 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.
+ *
+ * ============LICENSE_END============================================
+ *
+ *
+ */
+package org.onap.music.datastore.jsonobjects;
+
+import org.onap.music.datastore.PreparedQueryObject;
+import org.onap.music.datastore.jsonobjects.JsonUpdate;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class RowIdentifierTest {
+    String primarykey="primarykey";
+    String rowIdString="123";
+    PreparedQueryObject queryObject=new PreparedQueryObject("select * from employee");
+    JsonUpdate ju=new JsonUpdate();
+    JsonUpdate.RowIdentifier rowId= ju.new RowIdentifier(primarykey,rowIdString,queryObject);
+    @Test
+    public void testConstructor(){
+        rowId.setPrimaryKeyValue(primarykey);
+        rowId.setRowIdString(rowIdString);
+        assertEquals(rowId.getPrimaryKeyValue(),"primarykey");
+        assertEquals(rowId.getRowIdString(),"123");
+    }
+}