From d927fa46b8a97fe58dce5ec13fbb09bb22fd129b Mon Sep 17 00:00:00 2001 From: Mohammad Salehe Date: Mon, 26 Nov 2018 19:32:55 -0500 Subject: Move runnable test classes Move runnable test classes which are not actually tests from src/test to src/main in order for maven to include them in fat jar Change-Id: Ib57db631b1c91ae796fa33becc9f06d05eef4219 Issue-ID: MUSIC-148 Signed-off-by: Mohammad Salehe --- .../onap/music/unittests/ComparisonPoints1.java | 239 --------------------- .../org/onap/music/unittests/TestVotingApp.java | 118 ---------- 2 files changed, 357 deletions(-) delete mode 100644 src/test/java/org/onap/music/unittests/ComparisonPoints1.java delete mode 100644 src/test/java/org/onap/music/unittests/TestVotingApp.java (limited to 'src/test') diff --git a/src/test/java/org/onap/music/unittests/ComparisonPoints1.java b/src/test/java/org/onap/music/unittests/ComparisonPoints1.java deleted file mode 100644 index 1f74d39e..00000000 --- a/src/test/java/org/onap/music/unittests/ComparisonPoints1.java +++ /dev/null @@ -1,239 +0,0 @@ -package org.onap.music.unittests; - -import com.datastax.driver.core.ResultSet; -import org.onap.music.datastore.PreparedQueryObject; -import org.onap.music.exceptions.MusicLockingException; -import org.onap.music.exceptions.MusicQueryException; -import org.onap.music.exceptions.MusicServiceException; -import org.onap.music.main.MusicCore; - -import java.util.HashMap; -import java.util.Map; - -/** - * - */ -public class ComparisonPoints1 -{ - String keyspaceName; - int BENCH_TIMES = 100; - - public ComparisonPoints1() { - keyspaceName = "ComparisonPoints1_"+System.currentTimeMillis(); - } - - private void initialize() throws MusicServiceException { - createKeyspace(); - System.out.println("Created keyspaces"); - } - - private int readAge(String tableName, String name) throws MusicServiceException { - PreparedQueryObject query = new PreparedQueryObject(); - query.appendQueryString("SELECT age FROM " + keyspaceName + "." + tableName + " WHERE name = ?;"); - query.addValue(name); - ResultSet rs = MusicCore.get(query); - return rs.one().getInt("age"); - } - - private void check(String tableName, String name1, int age) throws MusicServiceException { - int readage = readAge(tableName, name1); - if (age != readage) - System.out.println("Inconsistency: age = " + readage + " != " + age); - } - - private void performMusicEntryConsistentPut(String tableName, String name, int age) throws MusicServiceException, MusicLockingException, MusicQueryException { - - PreparedQueryObject query = new PreparedQueryObject(); - query.appendQueryString( - "INSERT INTO " + keyspaceName + "." + tableName + " (name, age) " - + "VALUES (?, ?);"); - query.addValue(name); - query.addValue(age); - - MusicCore.atomicPut(keyspaceName, tableName, name, query, null); - } - - private void warmup() throws Exception { - String tableName = "warmup"; - System.out.println("Warming Up"); - createTable(tableName); - System.out.println("Created tables"); - Thread.sleep(1000); - - long btime = System.currentTimeMillis(); - for (int i = 0; i < BENCH_TIMES; i++) { - String name = "Joe" + i; - int age = i + 10; - performMusicEntryConsistentPut(tableName, name, age); -// check(tableName, name, age); - } - long bdur = System.currentTimeMillis() - btime; - - System.out.println("done"); - } - - private void testMusicEntryConsistentPut() throws Exception { - String tableName = "mentry2"; - System.out.println("Test music entry consistent put 2"); - createTable(tableName); - System.out.println("Created tables"); - Thread.sleep(1000); - - long btime = System.currentTimeMillis(); - for (int i = 0; i < BENCH_TIMES; i++) { - String name = "Joe" + i; - int age = i + 10; - performMusicEntryConsistentPut(tableName, name, age); -// check(tableName, name, age); - } - long bdur = System.currentTimeMillis() - btime; - - System.out.println("done " + ((float)bdur / BENCH_TIMES)); - } - - private void performMusicSequentialConsistentPut(String tableName, String name, int age) throws MusicServiceException, MusicLockingException, MusicQueryException { - PreparedQueryObject query = new PreparedQueryObject(); - query.appendQueryString( - "INSERT INTO " + keyspaceName + "." + tableName + " (name, age) " - + "VALUES (?, ?) IF NOT EXISTS;"); - query.addValue(name); - query.addValue(age); - - MusicCore.atomicPut(keyspaceName, tableName, name, query, null); - } - - private void testMusicSequentialConsistentPut() throws Exception { - String tableName = "mseq"; - System.out.println("Test music sequential consistent put"); - createTable(tableName); - System.out.println("Created tables"); - Thread.sleep(1000); - - long btime = System.currentTimeMillis(); - for (int i = 0; i < BENCH_TIMES; i++) { - String name = "Joe" + i; - int age = i + 10; - performMusicSequentialConsistentPut(tableName, name, age); -// check(tableName, name, age); - } - long bdur = System.currentTimeMillis() - btime; - - System.out.println("done " + ((float)bdur / BENCH_TIMES)); - } - - private void performEventualPut(String tableName, String name, int age) throws MusicServiceException, MusicLockingException, MusicQueryException { - PreparedQueryObject query = new PreparedQueryObject(); - query.appendQueryString( - "INSERT INTO " + keyspaceName + "." + tableName + " (name, age) " - + "VALUES (?, ?);"); - query.addValue(name); - query.addValue(age); - - MusicCore.eventualPut(query); - } - - private void testEventualPut() throws Exception { - String tableName = "eventual"; - System.out.println("Test eventual put"); - createTable(tableName); - System.out.println("Created tables"); - Thread.sleep(1000); - - long btime = System.currentTimeMillis(); - for (int i = 0; i < BENCH_TIMES; i++) { - String name = "Joe" + i; - int age = i + 10; - performEventualPut(tableName, name, age); -// check(tableName, name, age); - } - long bdur = System.currentTimeMillis() - btime; - - System.out.println("done " + ((float)bdur / BENCH_TIMES)); - } - - private void performPureConsistentPut(String tableName, String name, int age) throws MusicServiceException, MusicLockingException, MusicQueryException { - PreparedQueryObject query = new PreparedQueryObject(); - query.appendQueryString( - "INSERT INTO " + keyspaceName + "." + tableName + " (name, age) " - + "VALUES (?, ?) IF NOT EXISTS;"); - query.addValue(name); - query.addValue(age); - - MusicCore.eventualPut(query); - } - - private void testPureConsistentPut() throws Exception { - String tableName = "pure"; - System.out.println("Performing pure consistent put"); - createTable(tableName); - System.out.println("Created tables"); - Thread.sleep(1000); - - long btime = System.currentTimeMillis(); - for (int i = 0; i < BENCH_TIMES; i++) { - String name = "Joe" + i; - int age = i + 10; - performPureConsistentPut(tableName, name, age); -// check(tableName, name, age); - } - long bdur = System.currentTimeMillis() - btime; - - System.out.println("done " + ((float)bdur / BENCH_TIMES)); - } - - private void createKeyspace() throws MusicServiceException { - Map replicationInfo = new HashMap(); - replicationInfo.put("'class'", "'SimpleStrategy'"); - replicationInfo.put("'replication_factor'", 3); - - PreparedQueryObject queryObject = new PreparedQueryObject(); - queryObject.appendQueryString( - "CREATE KEYSPACE " + keyspaceName + " WITH REPLICATION = " + replicationInfo.toString().replaceAll("=", ":")); - - try { - MusicCore.nonKeyRelatedPut(queryObject, "eventual"); - } catch (MusicServiceException e) { - throw(e); - } - } - - private void createTable(String tableName) throws MusicServiceException { - PreparedQueryObject queryObject = new PreparedQueryObject(); - queryObject.appendQueryString( - "CREATE TABLE " + keyspaceName + "." + tableName + " (name text PRIMARY KEY, age int);"); - - try { - MusicCore.createTable(keyspaceName, tableName, queryObject, "eventual"); - } catch (MusicServiceException e) { - throw (e); - } - } - - public static void main( String[] args ) throws Exception { - ComparisonPoints1 cp1 = new ComparisonPoints1(); - cp1.initialize(); - Thread.sleep(2000); - - cp1.warmup(); - System.out.println("-----\n\n"); - Thread.sleep(2000); - - cp1.testEventualPut(); - System.out.println("-----\n\n"); - Thread.sleep(2000); - - cp1.testMusicSequentialConsistentPut(); - System.out.println("-----\n\n"); - Thread.sleep(2000); - - cp1.testPureConsistentPut(); - System.out.println("-----\n\n"); - Thread.sleep(2000); - - cp1.testMusicEntryConsistentPut(); - System.out.println("-----\n\n"); - - System.exit(0); - } - -} \ No newline at end of file diff --git a/src/test/java/org/onap/music/unittests/TestVotingApp.java b/src/test/java/org/onap/music/unittests/TestVotingApp.java deleted file mode 100644 index 863959eb..00000000 --- a/src/test/java/org/onap/music/unittests/TestVotingApp.java +++ /dev/null @@ -1,118 +0,0 @@ -package org.onap.music.unittests; - -import java.util.HashMap; -import java.util.Map; - -import org.onap.music.datastore.PreparedQueryObject; -import org.onap.music.exceptions.MusicLockingException; -import org.onap.music.exceptions.MusicQueryException; -import org.onap.music.exceptions.MusicServiceException; -import org.onap.music.main.MusicCore; - -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.Row; - -/** - * - */ -public class TestVotingApp -{ - String keyspaceName; - String tableName; - - public TestVotingApp() throws MusicServiceException { - keyspaceName = "VotingAppForMusic"+System.currentTimeMillis(); - tableName = "votecount"; - } - - private void initialize() throws MusicServiceException { - createVotingKeyspace(); - System.out.println("Created keyspaces"); - createVotingTable(); - System.out.println("Created tables"); - - createEntryForCandidate("Popeye"); - createEntryForCandidate("Judy"); - createEntryForCandidate("Flash"); - createEntryForCandidate("Mickey"); - System.out.println("Created candidates"); - } - - private void createVotingKeyspace() throws MusicServiceException { - Map replicationInfo = new HashMap(); - replicationInfo.put("'class'", "'SimpleStrategy'"); - replicationInfo.put("'replication_factor'", 1); - - PreparedQueryObject queryObject = new PreparedQueryObject(); - queryObject.appendQueryString( - "CREATE KEYSPACE " + keyspaceName + " WITH REPLICATION = " + replicationInfo.toString().replaceAll("=", ":")); - - try { - MusicCore.nonKeyRelatedPut(queryObject, "eventual"); - } catch (MusicServiceException e) { - throw(e); - } - } - - private void createVotingTable() throws MusicServiceException { - PreparedQueryObject queryObject = new PreparedQueryObject(); - queryObject.appendQueryString( - "CREATE TABLE " + keyspaceName + "." + tableName + " (name text PRIMARY KEY, count int);"); - - try { - MusicCore.createTable(keyspaceName, tableName, queryObject, "eventual"); - } catch (MusicServiceException e) { - throw (e); - } - } - - private void createEntryForCandidate(String candidateName) throws MusicServiceException { - PreparedQueryObject queryObject = new PreparedQueryObject(); - queryObject.appendQueryString( - "INSERT INTO " + keyspaceName + "." + tableName + " (name, count) " - + "VALUES ('"+candidateName+"', 0);"); - - MusicCore.eventualPut(queryObject); - } - - - private void updateVoteCount(String candidateName, int numVotes) throws MusicLockingException, MusicQueryException, MusicServiceException { - PreparedQueryObject queryObject = new PreparedQueryObject(); - queryObject.appendQueryString( - "UPDATE " + keyspaceName + "." + tableName + " SET count=" +numVotes + " where name='" + candidateName + "';"); - MusicCore.atomicPut(keyspaceName, tableName, candidateName, queryObject, null); - } - - private HashMap readAllVotes() throws MusicServiceException { - PreparedQueryObject queryObject = new PreparedQueryObject(); - queryObject.appendQueryString("SELECT * FROM " + keyspaceName + "." + tableName); - ResultSet rs = MusicCore.get(queryObject); - HashMap voteCount = new HashMap(); - for(Row candidate : rs.all()) { - voteCount.put(candidate.getString("name"), candidate.getInt("count")); - } - return voteCount; - } - - public static void main( String[] args ) throws Exception { - TestVotingApp tva = new TestVotingApp(); - tva.initialize(); - - tva.updateVoteCount("Popeye",5); - tva.updateVoteCount("Judy",9); - tva.updateVoteCount("Mickey",8); - tva.updateVoteCount("Flash",1); - tva.updateVoteCount("Flash",2); - tva.updateVoteCount("Flash",3); - - HashMap voteCount = tva.readAllVotes(); - System.out.println(voteCount); - - assert(voteCount.get("Popeye") == 5); - assert(voteCount.get("Judy") == 9); - assert(voteCount.get("Mickey") == 8); - assert(voteCount.get("Flash") == 3); - System.exit(0); - } - -} \ No newline at end of file -- cgit 1.2.3-korg