diff options
Diffstat (limited to 'mdbc-server/src/test/java/org')
5 files changed, 22 insertions, 13 deletions
diff --git a/mdbc-server/src/test/java/org/onap/music/mdbc/MdbcTestUtils.java b/mdbc-server/src/test/java/org/onap/music/mdbc/MdbcTestUtils.java index 9bec5eb..96806a3 100644 --- a/mdbc-server/src/test/java/org/onap/music/mdbc/MdbcTestUtils.java +++ b/mdbc-server/src/test/java/org/onap/music/mdbc/MdbcTestUtils.java @@ -44,6 +44,7 @@ import org.onap.music.exceptions.MusicServiceException; import org.onap.music.lockingservice.cassandra.CassaLockStore; import org.onap.music.mdbc.mixins.MusicMixin; import org.onap.music.mdbc.mixins.PostgresMixin; +import org.powermock.reflect.Whitebox; public class MdbcTestUtils { @@ -198,6 +199,7 @@ public class MdbcTestUtils { static void stopMySql(){ try { db.stop(); + db=null; } catch (ManagedProcessException e) { e.printStackTrace(); fail("Error closing mysql"); @@ -231,14 +233,11 @@ public class MdbcTestUtils { session = EmbeddedCassandraServerHelper.getSession(); assertNotNull("Invalid configuration for cassandra", session); -// MusicDataStoreHandle.mDstoreHandle = new MusicDataStore(cluster, session); -// CassaLockStore store = new CassaLockStore(MusicDataStoreHandle.mDstoreHandle); - CassaLockStore store; - try { - store = new CassaLockStore(MusicDataStoreHandle.getDSHandle()); - } catch (MusicServiceException e) { - throw new MDBCServiceException(e); - } + + MusicDataStore mds = new MusicDataStore(cluster, session); + Whitebox.setInternalState(MusicDataStoreHandle.class, "mDstoreHandle", mds); + CassaLockStore store = new CassaLockStore(mds); + assertNotNull("Invalid configuration for music", store); } diff --git a/mdbc-server/src/test/java/org/onap/music/mdbc/mixins/MusicMixinTest.java b/mdbc-server/src/test/java/org/onap/music/mdbc/mixins/MusicMixinTest.java index 8ec2a0b..bf27ea8 100644 --- a/mdbc-server/src/test/java/org/onap/music/mdbc/mixins/MusicMixinTest.java +++ b/mdbc-server/src/test/java/org/onap/music/mdbc/mixins/MusicMixinTest.java @@ -144,11 +144,11 @@ public class MusicMixinTest { private DatabasePartition addRow(Set<Range> ranges,boolean isLatest){ final UUID uuid = MDBCUtils.generateTimebasedUniqueKey(); - DatabasePartition dbPartition = new DatabasePartition(ranges,uuid,null); + DatabasePartition dbPartition = new DatabasePartition(ranges,uuid); MusicRangeInformationRow newRow = new MusicRangeInformationRow(dbPartition, new ArrayList<>(), isLatest); DatabasePartition partition=null; try { - partition = mixin.createLockedMRIRow(newRow); + partition = mixin.createLockedMRIRow(newRow, ""); } catch (MDBCServiceException e) { fail("failure when creating new row"); } diff --git a/mdbc-server/src/test/java/org/onap/music/mdbc/mixins/MySQLMixinTest.java b/mdbc-server/src/test/java/org/onap/music/mdbc/mixins/MySQLMixinTest.java index bd493c7..1e42d1e 100644 --- a/mdbc-server/src/test/java/org/onap/music/mdbc/mixins/MySQLMixinTest.java +++ b/mdbc-server/src/test/java/org/onap/music/mdbc/mixins/MySQLMixinTest.java @@ -60,7 +60,7 @@ public class MySQLMixinTest { @AfterClass public static void close() throws Exception { - + MdbcTestUtils.cleanDatabase(DBType.MySQL); } @Before diff --git a/mdbc-server/src/test/java/org/onap/music/mdbc/ownership/OwnershipAndCheckpointTest.java b/mdbc-server/src/test/java/org/onap/music/mdbc/ownership/OwnershipAndCheckpointTest.java index 48ab711..e131caa 100644 --- a/mdbc-server/src/test/java/org/onap/music/mdbc/ownership/OwnershipAndCheckpointTest.java +++ b/mdbc-server/src/test/java/org/onap/music/mdbc/ownership/OwnershipAndCheckpointTest.java @@ -223,7 +223,7 @@ public class OwnershipAndCheckpointTest { Map<MusicRangeInformationRow, LockResult> locks = new HashMap<>(); if(own.getDag()!=null) { locks.put(own.getDag().getNode(own.getRangeId()).getRow(), - new LockResult(own.getRangeId(), own.getOwnerId(), true, + new LockResult(own.getRangeId(), own.getLockId(), true, ranges)); ownAndCheck.checkpoint(musicMixin, mysqlMixin, own.getDag(), ranges, ownOpId); } @@ -248,7 +248,7 @@ public class OwnershipAndCheckpointTest { Map<MusicRangeInformationRow, LockResult> locks = new HashMap<>(); if(own.getDag()!=null) { locks.put(own.getDag().getNode(own.getRangeId()).getRow(), - new LockResult(own.getRangeId(), own.getOwnerId(), true, + new LockResult(own.getRangeId(), own.getLockId(), true, ranges)); } ownAndCheck.warmup(musicMixin,mysqlMixin,ranges); diff --git a/mdbc-server/src/test/java/org/onap/music/mdbc/query/QueryProcessorTest.java b/mdbc-server/src/test/java/org/onap/music/mdbc/query/QueryProcessorTest.java index 8d851c7..99e8244 100644 --- a/mdbc-server/src/test/java/org/onap/music/mdbc/query/QueryProcessorTest.java +++ b/mdbc-server/src/test/java/org/onap/music/mdbc/query/QueryProcessorTest.java @@ -98,6 +98,16 @@ public class QueryProcessorTest { } @Test + public void deleteQuery() throws SQLException { + String sqlQuery = "delete from db.employees where personid = 721 and lastname = 'Lastname'"; + HashMap<String, List<SQLOperation>> expectedOut = new HashMap<>(); + List<SQLOperation> t1op = new ArrayList<>(); + t1op.add(SQLOperation.DELETE); + expectedOut.put("DB.EMPLOYEES", t1op); + assertEquals(expectedOut, QueryProcessor.parseSqlQuery(sqlQuery, null)); + } + + @Test public void insertSelect() throws SQLException { String sqlQuery = "INSERT INTO table1 (CustomerName, City, Country) SELECT SupplierName, City, Country FROM table2"; |