diff options
| author |   Tschaen, Brendan <ctschaen@att.com> | 2018-11-20 15:29:12 -0500 |
|---|---|---|
| committer | Tschaen, Brendan <ctschaen@att.com> | 2018-11-20 15:43:30 -0500 |
| commit | 1359f1023594c201b91fff73b2baa3f5d5cf6fd6 (patch) | |
| tree | 30c3ac2940f82414a76e59bc8ed916ab9599b5f2 /mdbc-server/src/test/java/org/onap/music | |
| parent | 83db3eb4ccf7e636f586a6873a966e14ba1685ae (diff) | |
MusicSqlManager Removal, othe code refactors
MusicSqlManager not required in current setup
Current code condensed and absorbed into MdbcConnection and MusicMixin
Modify deprecated names "CassandraMixin" to "MusicMixin"
Change-Id: If68f8937a385c19d901c56e5795ddc0acf45d399
Issue-ID: MUSIC-198
Signed-off-by: Tschaen, Brendan <ctschaen@att.com>
Diffstat (limited to 'mdbc-server/src/test/java/org/onap/music')
| -rw-r--r-- | mdbc-server/src/test/java/org/onap/music/mdbc/MusicTxDigestTest.java | 8 | ||||
| -rwxr-xr-x | mdbc-server/src/test/java/org/onap/music/mdbc/test/TestCommon.java | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/mdbc-server/src/test/java/org/onap/music/mdbc/MusicTxDigestTest.java b/mdbc-server/src/test/java/org/onap/music/mdbc/MusicTxDigestTest.java index eab38d3..388f8b8 100644 --- a/mdbc-server/src/test/java/org/onap/music/mdbc/MusicTxDigestTest.java +++ b/mdbc-server/src/test/java/org/onap/music/mdbc/MusicTxDigestTest.java @@ -38,5 +38,13 @@ public class MusicTxDigestTest { HashMap<Range, StagingTable> digest = (HashMap<Range, StagingTable>) MDBCUtils.fromString(t1); txDigest.replayTxDigest(digest); } + + @Test + public void testEmptyDigest() throws Exception { + String t1 = "rO0ABXNyABFqYXZhLnV0aWwuSGFzaE1hcAUH2sHDFmDRAwACRgAKbG9hZEZhY3RvckkACXRocmVzaG9sZHhwP0AAAAAAAAB3CAAAABAAAAAAeA=="; + MusicTxDigest txDigest = new MusicTxDigest(null); + HashMap<Range, StagingTable> digest = (HashMap<Range, StagingTable>) MDBCUtils.fromString(t1); + txDigest.replayTxDigest(digest); + } } diff --git a/mdbc-server/src/test/java/org/onap/music/mdbc/test/TestCommon.java b/mdbc-server/src/test/java/org/onap/music/mdbc/test/TestCommon.java index c618f3b..7e7dc88 100755 --- a/mdbc-server/src/test/java/org/onap/music/mdbc/test/TestCommon.java +++ b/mdbc-server/src/test/java/org/onap/music/mdbc/test/TestCommon.java @@ -24,7 +24,7 @@ import java.sql.DriverManager; import java.sql.SQLException; import java.util.Properties; -import org.onap.music.mdbc.mixins.CassandraMixin; +import org.onap.music.mdbc.mixins.MusicMixin; public class TestCommon { public static final String DB_DRIVER = "avatica.Driver"; @@ -34,9 +34,9 @@ public class TestCommon { public Connection getDBConnection(String url, String keyspace, String id) throws SQLException, ClassNotFoundException { Class.forName(DB_DRIVER); Properties driver_info = new Properties(); - driver_info.put(CassandraMixin.KEY_MY_ID, id); - driver_info.put(CassandraMixin.KEY_REPLICAS, "0,1,2"); - driver_info.put(CassandraMixin.KEY_MUSIC_ADDRESS, "localhost"); + driver_info.put(MusicMixin.KEY_MY_ID, id); + driver_info.put(MusicMixin.KEY_REPLICAS, "0,1,2"); + driver_info.put(MusicMixin.KEY_MUSIC_ADDRESS, "localhost"); driver_info.put("user", DB_USER); driver_info.put("password", DB_PASSWORD); return DriverManager.getConnection(url, driver_info); |