aboutsummaryrefslogtreecommitdiffstats
path: root/src/test
diff options
context:
space:
mode:
authorThomas Nelson Jr (arthurdent3) <tn1381@att.com>2018-02-23 15:14:24 -0500
committerThomas Nelson Jr (arthurdent3) <tn1381@att.com>2018-02-23 15:29:08 -0500
commitb6a14a0dc52c9ed43b035aff79831fc32fd52fe3 (patch)
tree400ba474c44d779632406d3d998e65038816eed1 /src/test
parent3acbae6bf3be04f352bfaac340b8303064a2f7c4 (diff)
Changes related to Authentication and Atomic
Authentication Fixes Atomic with delete added. Issue-ID: MUSIC-38,MUSIC-39 Change-Id: Ide2974a42ff8618d8a94ef7e8a1b0abde3630550 Signed-off-by: Thomas Nelson Jr (arthurdent3) <tn1381@att.com>
Diffstat (limited to 'src/test')
-rw-r--r--src/test/java/org/onap/music/unittests/CassandraCQL.java73
-rw-r--r--src/test/java/org/onap/music/unittests/TestMusicCore.java17
2 files changed, 39 insertions, 51 deletions
diff --git a/src/test/java/org/onap/music/unittests/CassandraCQL.java b/src/test/java/org/onap/music/unittests/CassandraCQL.java
index cbca37b2..ed8f13f4 100644
--- a/src/test/java/org/onap/music/unittests/CassandraCQL.java
+++ b/src/test/java/org/onap/music/unittests/CassandraCQL.java
@@ -19,7 +19,9 @@
* ============LICENSE_END=============================================
* ====================================================================
*/
+
package org.onap.music.unittests;
+
/**
* @author srupane
*
@@ -37,42 +39,43 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.UUID;
+import com.datastax.driver.core.Cluster;
+import com.datastax.driver.core.Session;
+import com.datastax.driver.core.exceptions.NoHostAvailableException;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.thrift.transport.TTransportException;
import org.cassandraunit.utils.EmbeddedCassandraServerHelper;
import org.onap.music.datastore.MusicDataStore;
import org.onap.music.datastore.PreparedQueryObject;
-import com.datastax.driver.core.Cluster;
-import com.datastax.driver.core.Session;
-import com.datastax.driver.core.exceptions.NoHostAvailableException;
public class CassandraCQL {
public static final String createKeySpace =
- "CREATE KEYSPACE IF NOT EXISTS testCassa WITH replication = {'class':'SimpleStrategy','replication_factor':1} AND durable_writes = true;";
+ "CREATE KEYSPACE IF NOT EXISTS testCassa WITH replication = "
+ +"{'class':'SimpleStrategy','replication_factor':1} AND durable_writes = true;";
public static final String dropKeyspace = "DROP KEYSPACE IF EXISTS testCassa";
public static final String createTableEmployees =
"CREATE TABLE IF NOT EXISTS testCassa.employees "
- + "(vector_ts text,emp_id uuid,emp_name text,emp_salary varint,address Map<text,text>,PRIMARY KEY (emp_name)) "
- + "WITH comment='Financial Info of employees' "
- + "AND compression={'sstable_compression':'DeflateCompressor','chunk_length_kb':64} "
- + "AND compaction={'class':'SizeTieredCompactionStrategy','min_threshold':6};";
+ + "(vector_ts text,empId uuid,empName text,empSalary varint,address Map<text,text>,PRIMARY KEY (empName)) "
+ + "WITH comment='Financial Info of employees' "
+ + "AND compression={'sstable_compression':'DeflateCompressor','chunk_length_kb':64} "
+ + "AND compaction={'class':'SizeTieredCompactionStrategy','min_threshold':6};";
public static final String insertIntoTablePrepared1 =
- "INSERT INTO testCassa.employees (vector_ts,emp_id,emp_name,emp_salary) VALUES (?,?,?,?); ";
+ "INSERT INTO testCassa.employees (vector_ts,empId,empName,empSalary) VALUES (?,?,?,?); ";
public static final String insertIntoTablePrepared2 =
- "INSERT INTO testCassa.employees (vector_ts,emp_id,emp_name,emp_salary,address) VALUES (?,?,?,?,?);";
+ "INSERT INTO testCassa.employees (vector_ts,empId,empName,empSalary,address) VALUES (?,?,?,?,?);";
public static final String selectALL = "SELECT * FROM testCassa.employees;";
public static final String selectSpecific =
- "SELECT * FROM testCassa.employees WHERE emp_name= ?;";
+ "SELECT * FROM testCassa.employees WHERE empName= ?;";
public static final String updatePreparedQuery =
- "UPDATE testCassa.employees SET vector_ts=?,address= ? WHERE emp_name= ?;";
+ "UPDATE testCassa.employees SET vector_ts=?,address= ? WHERE empName= ?;";
public static final String deleteFromTable = " ";
@@ -85,13 +88,13 @@ public class CassandraCQL {
List<Object> preppreparedInsertValues1 = new ArrayList<>();
String vectorTs =
String.valueOf(Thread.currentThread().getId() + System.currentTimeMillis());
- UUID emp_id = UUID.fromString("abc66ccc-d857-4e90-b1e5-df98a3d40cd6");
- BigInteger emp_salary = BigInteger.valueOf(23443);
- String emp_name = "Mr Test one";
+ UUID empId = UUID.fromString("abc66ccc-d857-4e90-b1e5-df98a3d40cd6");
+ BigInteger empSalary = BigInteger.valueOf(23443);
+ String empName = "Mr Test one";
preppreparedInsertValues1.add(vectorTs);
- preppreparedInsertValues1.add(emp_id);
- preppreparedInsertValues1.add(emp_name);
- preppreparedInsertValues1.add(emp_salary);
+ preppreparedInsertValues1.add(empId);
+ preppreparedInsertValues1.add(empName);
+ preppreparedInsertValues1.add(empSalary);
return preppreparedInsertValues1;
}
@@ -100,14 +103,14 @@ public class CassandraCQL {
List<Object> preparedInsertValues2 = new ArrayList<>();
String vectorTs =
String.valueOf(Thread.currentThread().getId() + System.currentTimeMillis());
- UUID emp_id = UUID.fromString("abc434cc-d657-4e90-b4e5-df4223d40cd6");
- BigInteger emp_salary = BigInteger.valueOf(45655);
- String emp_name = "Mr Test two";
+ UUID empId = UUID.fromString("abc434cc-d657-4e90-b4e5-df4223d40cd6");
+ BigInteger empSalary = BigInteger.valueOf(45655);
+ String empName = "Mr Test two";
Map<String, String> address = new HashMap<>();
preparedInsertValues2.add(vectorTs);
- preparedInsertValues2.add(emp_id);
- preparedInsertValues2.add(emp_name);
- preparedInsertValues2.add(emp_salary);
+ preparedInsertValues2.add(empId);
+ preparedInsertValues2.add(empName);
+ preparedInsertValues2.add(empSalary);
address.put("Street", "1 some way");
address.put("City", "Some town");
preparedInsertValues2.add(address);
@@ -121,33 +124,33 @@ public class CassandraCQL {
String.valueOf(Thread.currentThread().getId() + System.currentTimeMillis());
Map<String, String> address = new HashMap<>();
preparedUpdateValues.add(vectorTs);
- String emp_name = "Mr Test one";
+ String empName = "Mr Test one";
address.put("Street", "101 Some Way");
address.put("City", "New York");
preparedUpdateValues.add(address);
- preparedUpdateValues.add(emp_name);
+ preparedUpdateValues.add(empName);
return preparedUpdateValues;
}
// Generate Different Prepared Query Objects
/**
- * Query Object for Get
+ * Query Object for Get.
*
* @return
*/
public static PreparedQueryObject setPreparedGetQuery() {
PreparedQueryObject queryObject = new PreparedQueryObject();
- String emp_name1 = "Mr Test one";
+ String empName1 = "Mr Test one";
queryObject.appendQueryString(selectSpecific);
- queryObject.addValue(emp_name1);
+ queryObject.addValue(empName1);
return queryObject;
}
/**
- * Query Object 1 for Insert
+ * Query Object 1 for Insert.
*
- * @return
+ * @return {@link PreparedQueryObject}
*/
public static PreparedQueryObject setPreparedInsertQueryObject1() {
@@ -164,9 +167,9 @@ public class CassandraCQL {
}
/**
- * Query Object 2 for Insert
+ * Query Object 2 for Insert.
*
- * @return
+ * @return {@link PreparedQueryObject}
*/
public static PreparedQueryObject setPreparedInsertQueryObject2() {
@@ -183,9 +186,9 @@ public class CassandraCQL {
}
/**
- * Query Object for Update
+ * Query Object for Update.
*
- * @return
+ * @return {@link PreparedQueryObject}
*/
public static PreparedQueryObject setPreparedUpdateQueryObject() {
diff --git a/src/test/java/org/onap/music/unittests/TestMusicCore.java b/src/test/java/org/onap/music/unittests/TestMusicCore.java
index ed328c26..2deb3496 100644
--- a/src/test/java/org/onap/music/unittests/TestMusicCore.java
+++ b/src/test/java/org/onap/music/unittests/TestMusicCore.java
@@ -139,7 +139,7 @@ public class TestMusicCore {
@Test
public void testAcquireLockifLockRefDoesntExist() {
- Mockito.when(mLockHandle.lockIdExists("bs1")).thenReturn(false);
+ Mockito.when(mLockHandle.lockIdExists("bs1")).thenReturn(false);
ReturnType lock = MusicCore.acquireLock("ks1.ts1", "bs1");
assertEquals(lock.getResult(), ResultType.FAILURE);
assertEquals(lock.getMessage(), "Lockid doesn't exist");
@@ -351,19 +351,12 @@ public class TestMusicCore {
mDstoreHandle = Mockito.mock(MusicDataStore.class);
preparedQueryObject = Mockito.mock(PreparedQueryObject.class);
Mockito.when(mLockHandle.createLockId("/" + "ks1.tn1.pk1")).thenReturn("id1");
- MusicLockState musicLockState = new MusicLockState(LockStatus.LOCKED, "id1");
ReturnType expectedResult = new ReturnType(ResultType.FAILURE, "Failure");
- Mockito.when(mLockHandle.getLockState("ks1.tn1.pk1")).thenReturn(musicLockState);
Mockito.when(mLockHandle.isMyTurn("id1")).thenReturn(false);
- Mockito.when(mLockHandle.getLockState("ks1" + "." + "tn1" + "." + "pk1"))
- .thenReturn(musicLockState);
ReturnType returnType =
MusicCore.atomicPut("ks1", "tn1", "pk1", preparedQueryObject, condition);
assertEquals(expectedResult.getResult(), returnType.getResult());
- Mockito.verify(mLockHandle, Mockito.atLeastOnce()).getLockState("ks1.tn1.pk1");
Mockito.verify(mLockHandle).isMyTurn("id1");
- Mockito.verify(mLockHandle, Mockito.atLeastOnce())
- .getLockState("ks1" + "." + "tn1" + "." + "pk1");
Mockito.verify(mLockHandle).createLockId("/" + "ks1.tn1.pk1");
}
@@ -396,19 +389,11 @@ public class TestMusicCore {
preparedQueryObject = Mockito.mock(PreparedQueryObject.class);
rs = Mockito.mock(ResultSet.class);
Mockito.when(mLockHandle.createLockId("/" + "ks1.tn1.pk1")).thenReturn("id1");
- MusicLockState musicLockState = new MusicLockState(LockStatus.LOCKED, "id1");
- Mockito.when(mLockHandle.getLockState("ks1.tn1.pk1")).thenReturn(musicLockState);
Mockito.when(mLockHandle.isMyTurn("id1")).thenReturn(false);
- Mockito.when(mLockHandle.getLockState("ks1" + "." + "tn1" + "." + "pk1"))
- .thenReturn(musicLockState);
ResultSet rs1 = MusicCore.atomicGet("ks1", "tn1", "pk1", preparedQueryObject);
assertNull(rs1);
Mockito.verify(mLockHandle).createLockId("/" + "ks1.tn1.pk1");
- Mockito.verify(mLockHandle, Mockito.atLeastOnce()).getLockState("ks1.tn1.pk1");
Mockito.verify(mLockHandle).isMyTurn("id1");
- Mockito.verify(mLockHandle, Mockito.atLeastOnce())
- .getLockState("ks1" + "." + "tn1" + "." + "pk1");
-
}
@Test