Sarthak: Added parallel execution support for table. added Awaitality…

… to test parallel execution,
dataanon · Nov 9, 2017 · d916978 · d916978
1 parent 2b9874f
commit d916978
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -58,6 +58,12 @@
             <version>42.1.4</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/src/main/kotlin/com/github/dataanon/dsl/Strategy.kt b/src/main/kotlin/com/github/dataanon/dsl/Strategy.kt
@@ -6,14 +6,15 @@ import com.github.dataanon.model.DbConfig
 import com.github.dataanon.model.Table
 import com.github.dataanon.utils.ProgressBarGenerator
 import reactor.core.publisher.Flux
+import reactor.core.scheduler.Schedulers
 
 abstract class Strategy {
     protected val tables = mutableListOf<Table>()
 
     fun execute(limit: Long = -1, progressBarEnabled: Boolean = true) {
         Flux.fromIterable(tables)
-//                .parallel()
-//                .runOn(Schedulers.parallel())
+                .parallel()
+                .runOn(Schedulers.parallel())
                 .log()
                 .subscribe { table -> executeOnTable(table, limit, progressBarEnabled) }
     }

diff --git a/src/main/kotlin/com/github/dataanon/model/Table.kt b/src/main/kotlin/com/github/dataanon/model/Table.kt
@@ -5,7 +5,7 @@ import com.github.dataanon.utils.DefaultAnonymizationStrategies
 
 abstract class Table(val name: String) {
     private val columnStrategyContainer = mutableMapOf<String, ColumnStrategy>()
-    var whereCondition = ""
+    internal var whereCondition = ""
 
     fun anonymize(columnName: String): ColumnStrategy {
         val columnStrategy = ColumnStrategy()
@@ -28,7 +28,7 @@ abstract class Table(val name: String) {
     }
 
     internal fun generateSelectQuery(limit: Long): String {
-        val columns = allColumns().joinToString(",")
+        val columns     = allColumns().joinToString(",")
         val limitClause = if(limit > 0) " LIMIT $limit " else ""
         val whereClause = if(whereCondition.isNotEmpty()) " WHERE $whereCondition " else ""
 

diff --git a/src/test/kotlin/com/github/dataanon/integration/SpecialFeaturesIntegrationTest.kt b/src/test/kotlin/com/github/dataanon/integration/SpecialFeaturesIntegrationTest.kt
@@ -6,7 +6,9 @@ import com.github.dataanon.model.DbConfig
 import com.github.dataanon.strategy.string.FixedString
 import com.github.dataanon.support.MoviesTable
 import io.kotlintest.specs.FunSpec
+import org.awaitility.Awaitility.await
 import java.sql.Date
+import java.util.concurrent.TimeUnit
 import java.util.regex.Pattern
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
@@ -31,6 +33,7 @@ class SpecialFeaturesIntegrationTest : FunSpec() {
                         anonymize("GENRE").using(FixedString("Action"))
                     }.execute(progressBarEnabled = false)
 
+            await().timeout(2, TimeUnit.SECONDS).until { destTable.findAll()[0]["TITLE"].toString().equals("MY VALUE") }
             val records = destTable.findAll()
 
             assertEquals(1, records.size)
@@ -54,6 +57,7 @@ class SpecialFeaturesIntegrationTest : FunSpec() {
                         anonymize("GENRE")
                     }.execute(progressBarEnabled = true)
 
+            await().timeout(2, TimeUnit.SECONDS).until { moviesTable.findAll()[0]["TITLE"].toString().equals("MY VALUE") }
             val records = moviesTable.findAll()
 
             assertEquals(1, records.size)
@@ -81,6 +85,7 @@ class SpecialFeaturesIntegrationTest : FunSpec() {
                         anonymize("GENRE").using(FixedString("Action"))
                     }.execute(limit = 1, progressBarEnabled = false)
 
+            await().timeout(2, TimeUnit.SECONDS).until { destTable.findAll()[0]["TITLE"].toString().equals("MY VALUE") }
             val records = destTable.findAll()
 
             assertEquals(1, records.size)

diff --git a/...m/github/dataanon/integration/blacklist/BlacklistMoviesSimplePrimaryKeyIntegrationTest.kt b/...m/github/dataanon/integration/blacklist/BlacklistMoviesSimplePrimaryKeyIntegrationTest.kt
@@ -5,7 +5,9 @@ import com.github.dataanon.model.DbConfig
 import com.github.dataanon.strategy.string.FixedString
 import com.github.dataanon.support.MoviesTable
 import io.kotlintest.specs.FunSpec
+import org.awaitility.Awaitility.await
 import java.sql.Date
+import java.util.concurrent.TimeUnit
 import java.util.regex.Pattern
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
@@ -25,6 +27,7 @@ class BlacklistMoviesSimplePrimaryKeyIntegrationTest : FunSpec() {
                         anonymize("GENRE")
                     }.execute(progressBarEnabled = false)
 
+            await().timeout(2, TimeUnit.SECONDS).until { moviesTable.findAll()[0]["TITLE"].toString().equals("MY VALUE") }
             val records = moviesTable.findAll()
 
             assertEquals(1,records.size)
@@ -46,6 +49,7 @@ class BlacklistMoviesSimplePrimaryKeyIntegrationTest : FunSpec() {
                         anonymize("GENRE")
                     }.execute(progressBarEnabled = false)
 
+            await().timeout(2, TimeUnit.SECONDS).until { moviesTable.findAll()[0]["TITLE"].toString().equals("MY VALUE") }
             val records = moviesTable.findAll()
 
             assertEquals(2,records.size)

diff --git a/...kotlin/com/github/dataanon/integration/blacklist/BlacklistMultipleTableIntegrationTest.kt b/...kotlin/com/github/dataanon/integration/blacklist/BlacklistMultipleTableIntegrationTest.kt
@@ -7,8 +7,10 @@ import com.github.dataanon.strategy.string.FixedString
 import com.github.dataanon.support.MoviesTable
 import com.github.dataanon.support.RatingsTable
 import io.kotlintest.specs.FunSpec
+import org.awaitility.Awaitility.await
 import java.sql.Date
 import java.sql.Timestamp
+import java.util.concurrent.TimeUnit
 import java.util.regex.Pattern
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
@@ -31,6 +33,7 @@ class BlacklistMultipleTableIntegrationTest : FunSpec() {
                     }
                     .execute(progressBarEnabled = false)
 
+            await().timeout(2, TimeUnit.SECONDS).until { moviesTable.findAll()[0]["TITLE"].toString().equals("MY VALUE") }
             val moviesRecords = moviesTable.findAll()
             val ratingRecords = ratingsTable.findAll()
 

diff --git a/...thub/dataanon/integration/blacklist/BlacklistRatingsCompositePrimaryKeyIntegrationTest.kt b/...thub/dataanon/integration/blacklist/BlacklistRatingsCompositePrimaryKeyIntegrationTest.kt
@@ -5,7 +5,9 @@ import com.github.dataanon.model.DbConfig
 import com.github.dataanon.strategy.number.FixedInt
 import com.github.dataanon.support.RatingsTable
 import io.kotlintest.specs.FunSpec
+import org.awaitility.Awaitility.await
 import java.sql.Timestamp
+import java.util.concurrent.TimeUnit
 import kotlin.test.assertEquals
 
 class BlacklistRatingsCompositePrimaryKeyIntegrationTest : FunSpec() {
@@ -19,6 +21,7 @@ class BlacklistRatingsCompositePrimaryKeyIntegrationTest : FunSpec() {
                         anonymize("RATING").using(FixedInt(3))
                     }.execute(progressBarEnabled = false)
 
+            await().timeout(2, TimeUnit.SECONDS).until { ratingsTable.findAll()[0]["RATING"].toString().equals("3") }
             val records = ratingsTable.findAll()
 
             assertEquals(2,records.size)

diff --git a/...m/github/dataanon/integration/whitelist/WhitelistMoviesSimplePrimaryKeyIntegrationTest.kt b/...m/github/dataanon/integration/whitelist/WhitelistMoviesSimplePrimaryKeyIntegrationTest.kt
@@ -5,7 +5,9 @@ import com.github.dataanon.model.DbConfig
 import com.github.dataanon.strategy.string.FixedString
 import com.github.dataanon.support.MoviesTable
 import io.kotlintest.specs.FunSpec
+import org.awaitility.Awaitility.await
 import java.sql.Date
+import java.util.concurrent.TimeUnit
 import java.util.regex.Pattern
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
@@ -29,6 +31,7 @@ class WhitelistMoviesSimplePrimaryKeyIntegrationTest : FunSpec() {
                         anonymize("RELEASE_DATE")
                     }.execute(progressBarEnabled = false)
 
+            await().timeout(2, TimeUnit.SECONDS).until { destTable.findAll()[0]["TITLE"].toString().equals("MY VALUE") }
             val records = destTable.findAll()
 
             assertEquals(2,records.size)