From aa6b92dbbec71a0d4bd0506b04550d73360d9b2b Mon Sep 17 00:00:00 2001 From: sunitparekh Date: Mon, 21 May 2018 14:54:34 +0530 Subject: [PATCH] upgraded to latest kotlintest --- pom.xml | 25 +++++++++++-------- .../kotlin/com/github/dataanon/Matchers.kt | 5 ++-- .../SpecialFeaturesIntegrationTest.kt | 6 ++++- ...BlacklistMoviesNullValueIntegrationTest.kt | 4 +-- ...stMoviesSimplePrimaryKeyIntegrationTest.kt | 4 +-- .../BlacklistMultipleTableIntegrationTest.kt | 8 +++--- ...tingsCompositePrimaryKeyIntegrationTest.kt | 2 +- ...stMoviesSimplePrimaryKeyIntegrationTest.kt | 6 ++--- .../jdbc/TableReaderIntegrationTest.kt | 2 +- .../dataanon/model/BlacklistTableUnitTest.kt | 2 +- .../dataanon/model/WhitelistTableUnitTest.kt | 2 +- .../CopyAnonymizationStrategyUnitTest.kt | 8 +++--- .../strategy/bool/RandomBooleanUnitTest.kt | 2 +- .../strategy/datetime/DateRandomDeltaTest.kt | 10 ++++---- .../datetime/DateTimeRandomDeltaTest.kt | 10 ++++---- .../strategy/email/RandomEmailUnitTest.kt | 4 +-- .../strategy/list/PickFromDatabaseUnitTest.kt | 4 +-- .../strategy/list/PickFromFileUnitTest.kt | 4 +-- .../strategy/list/PickFromListUnitTest.kt | 4 +-- .../strategy/name/RandomFirstNameUnitTest.kt | 4 +-- .../strategy/name/RandomFullNameUnitTest.kt | 8 +++--- .../strategy/name/RandomLastNameUnitTest.kt | 2 +- .../number/RandomDoubleDeltaUnitTest.kt | 2 +- .../strategy/number/RandomDoubleUnitTest.kt | 2 +- .../number/RandomFloatDeltaUnitTest.kt | 2 +- .../strategy/number/RandomFloatUnitTest.kt | 2 +- .../strategy/number/RandomIntDeltaUnitTest.kt | 2 +- .../strategy/number/RandomIntUnitTest.kt | 2 +- .../strategy/string/LoremIpsumUnitTest.kt | 2 +- .../string/RandomFormattedStringUnitTest.kt | 12 ++++----- .../strategy/string/RandomStringUnitTest.kt | 8 +++--- .../strategy/string/StringTemplateUnitTest.kt | 18 ++++++------- .../DefaultAnonymizationStrategiesUnitTest.kt | 4 +-- .../dataanon/utils/RandomUtilsUnitTest.kt | 10 ++++---- 34 files changed, 101 insertions(+), 91 deletions(-) diff --git a/pom.xml b/pom.xml index 7b72444..8c8382a 100644 --- a/pom.xml +++ b/pom.xml @@ -18,8 +18,7 @@ UTF-8 - 1.2.40 - 2.0.7 + 1.2.41 0.8.1 @@ -94,16 +93,10 @@ progressbar 0.6.0 - - org.jetbrains.kotlin - kotlin-test - ${kotlin.version} - test - io.kotlintest - kotlintest - ${kotlin.test.version} + kotlintest-runner-junit5 + 3.1.2 test @@ -129,6 +122,18 @@ src/main/kotlin src/test/kotlin + + org.apache.maven.plugins + maven-surefire-plugin + 2.21.0 + + + org.junit.platform + junit-platform-surefire-provider + 1.2.0 + + + org.jetbrains.kotlin kotlin-maven-plugin diff --git a/src/test/kotlin/com/github/dataanon/Matchers.kt b/src/test/kotlin/com/github/dataanon/Matchers.kt index 95f9f2d..f0c4ece 100644 --- a/src/test/kotlin/com/github/dataanon/Matchers.kt +++ b/src/test/kotlin/com/github/dataanon/Matchers.kt @@ -1,7 +1,8 @@ package com.github.dataanon -import io.kotlintest.matchers.Matcher -import io.kotlintest.matchers.Result +import io.kotlintest.Matcher +import io.kotlintest.Result + interface Matchers { diff --git a/src/test/kotlin/com/github/dataanon/integration/SpecialFeaturesIntegrationTest.kt b/src/test/kotlin/com/github/dataanon/integration/SpecialFeaturesIntegrationTest.kt index 412e5a3..d192af4 100644 --- a/src/test/kotlin/com/github/dataanon/integration/SpecialFeaturesIntegrationTest.kt +++ b/src/test/kotlin/com/github/dataanon/integration/SpecialFeaturesIntegrationTest.kt @@ -7,7 +7,11 @@ import com.github.dataanon.strategy.string.FixedString import com.github.dataanon.support.MoviesTable import com.github.dataanon.support.MoviesTableHavingGenreSize10 import com.github.dataanon.utils.DataAnonTestLogHandler -import io.kotlintest.matchers.* +import io.kotlintest.matchers.beLessThan +import io.kotlintest.matchers.haveSubstring +import io.kotlintest.matchers.match +import io.kotlintest.should +import io.kotlintest.shouldBe import io.kotlintest.specs.FunSpec import java.time.LocalDate import java.util.logging.Level diff --git a/src/test/kotlin/com/github/dataanon/integration/blacklist/BlacklistMoviesNullValueIntegrationTest.kt b/src/test/kotlin/com/github/dataanon/integration/blacklist/BlacklistMoviesNullValueIntegrationTest.kt index 81d7d8d..9c196e1 100644 --- a/src/test/kotlin/com/github/dataanon/integration/blacklist/BlacklistMoviesNullValueIntegrationTest.kt +++ b/src/test/kotlin/com/github/dataanon/integration/blacklist/BlacklistMoviesNullValueIntegrationTest.kt @@ -6,8 +6,8 @@ import com.github.dataanon.strategy.string.FixedString import com.github.dataanon.strategy.string.RandomAlphabetic import com.github.dataanon.support.MoviesTable import io.kotlintest.matchers.match -import io.kotlintest.matchers.should -import io.kotlintest.matchers.shouldBe +import io.kotlintest.should +import io.kotlintest.shouldBe import io.kotlintest.specs.FunSpec import java.time.LocalDate diff --git a/src/test/kotlin/com/github/dataanon/integration/blacklist/BlacklistMoviesSimplePrimaryKeyIntegrationTest.kt b/src/test/kotlin/com/github/dataanon/integration/blacklist/BlacklistMoviesSimplePrimaryKeyIntegrationTest.kt index 9869273..194ceff 100644 --- a/src/test/kotlin/com/github/dataanon/integration/blacklist/BlacklistMoviesSimplePrimaryKeyIntegrationTest.kt +++ b/src/test/kotlin/com/github/dataanon/integration/blacklist/BlacklistMoviesSimplePrimaryKeyIntegrationTest.kt @@ -8,8 +8,8 @@ import com.github.dataanon.strategy.list.PickFromDatabase import com.github.dataanon.strategy.string.FixedString import com.github.dataanon.support.MoviesTable import io.kotlintest.matchers.match -import io.kotlintest.matchers.should -import io.kotlintest.matchers.shouldBe +import io.kotlintest.should +import io.kotlintest.shouldBe import io.kotlintest.specs.FunSpec import java.time.LocalDate diff --git a/src/test/kotlin/com/github/dataanon/integration/blacklist/BlacklistMultipleTableIntegrationTest.kt b/src/test/kotlin/com/github/dataanon/integration/blacklist/BlacklistMultipleTableIntegrationTest.kt index ea6118d..4203848 100644 --- a/src/test/kotlin/com/github/dataanon/integration/blacklist/BlacklistMultipleTableIntegrationTest.kt +++ b/src/test/kotlin/com/github/dataanon/integration/blacklist/BlacklistMultipleTableIntegrationTest.kt @@ -9,8 +9,8 @@ import com.github.dataanon.strategy.string.FixedString import com.github.dataanon.support.MoviesTable import com.github.dataanon.support.RatingsTable import io.kotlintest.matchers.match -import io.kotlintest.matchers.should -import io.kotlintest.matchers.shouldBe +import io.kotlintest.should +import io.kotlintest.shouldBe import io.kotlintest.specs.FunSpec import java.time.Duration import java.time.LocalDate @@ -50,13 +50,13 @@ class BlacklistMultipleTableIntegrationTest : FunSpec(), Matchers { ratingRecords[0]["USER_ID"] shouldBe 1 ratingRecords[0]["RATING"] shouldBe 3 val timestamp1 = LocalDateTime.ofEpochSecond(1509701304, 0, ZoneOffset.UTC) - (ratingRecords[0]["CREATED_AT"] as LocalDateTime) should beIn(timestamp1.minusSeconds(250)..timestamp1.plusSeconds(250)) + (ratingRecords[0]["CREATED_AT"] as LocalDateTime) should beIn(timestamp1.minusSeconds(300)..timestamp1.plusSeconds(300)) ratingRecords[1]["MOVIE_ID"] shouldBe 1 ratingRecords[1]["USER_ID"] shouldBe 2 ratingRecords[1]["RATING"] shouldBe 3 val timestamp2 = LocalDateTime.ofEpochSecond(1509701310, 0, ZoneOffset.UTC) - (ratingRecords[0]["CREATED_AT"] as LocalDateTime) should beIn(timestamp2.minusSeconds(250)..timestamp2.plusSeconds(250)) + (ratingRecords[0]["CREATED_AT"] as LocalDateTime) should beIn(timestamp2.minusSeconds(300)..timestamp2.plusSeconds(300)) closeResources(moviesTable, ratingsTable) } diff --git a/src/test/kotlin/com/github/dataanon/integration/blacklist/BlacklistRatingsCompositePrimaryKeyIntegrationTest.kt b/src/test/kotlin/com/github/dataanon/integration/blacklist/BlacklistRatingsCompositePrimaryKeyIntegrationTest.kt index 18423c5..c2a239c 100644 --- a/src/test/kotlin/com/github/dataanon/integration/blacklist/BlacklistRatingsCompositePrimaryKeyIntegrationTest.kt +++ b/src/test/kotlin/com/github/dataanon/integration/blacklist/BlacklistRatingsCompositePrimaryKeyIntegrationTest.kt @@ -4,7 +4,7 @@ import com.github.dataanon.dsl.Blacklist import com.github.dataanon.model.DbConfig import com.github.dataanon.strategy.number.FixedInt import com.github.dataanon.support.RatingsTable -import io.kotlintest.matchers.shouldBe +import io.kotlintest.shouldBe import io.kotlintest.specs.FunSpec import java.time.LocalDateTime import java.time.ZoneOffset diff --git a/src/test/kotlin/com/github/dataanon/integration/whitelist/WhitelistMoviesSimplePrimaryKeyIntegrationTest.kt b/src/test/kotlin/com/github/dataanon/integration/whitelist/WhitelistMoviesSimplePrimaryKeyIntegrationTest.kt index acc915a..c602fe0 100644 --- a/src/test/kotlin/com/github/dataanon/integration/whitelist/WhitelistMoviesSimplePrimaryKeyIntegrationTest.kt +++ b/src/test/kotlin/com/github/dataanon/integration/whitelist/WhitelistMoviesSimplePrimaryKeyIntegrationTest.kt @@ -5,11 +5,11 @@ import com.github.dataanon.model.DbConfig import com.github.dataanon.strategy.string.FixedString import com.github.dataanon.support.MoviesTable import io.kotlintest.matchers.match -import io.kotlintest.matchers.should -import io.kotlintest.matchers.shouldBe +import io.kotlintest.should +import io.kotlintest.shouldBe import io.kotlintest.specs.FunSpec +import org.junit.jupiter.api.Assertions.assertEquals import java.time.LocalDate -import kotlin.test.assertEquals class WhitelistMoviesSimplePrimaryKeyIntegrationTest : FunSpec() { diff --git a/src/test/kotlin/com/github/dataanon/jdbc/TableReaderIntegrationTest.kt b/src/test/kotlin/com/github/dataanon/jdbc/TableReaderIntegrationTest.kt index f28f03f..cafe059 100644 --- a/src/test/kotlin/com/github/dataanon/jdbc/TableReaderIntegrationTest.kt +++ b/src/test/kotlin/com/github/dataanon/jdbc/TableReaderIntegrationTest.kt @@ -3,7 +3,7 @@ package com.github.dataanon.jdbc import com.github.dataanon.model.BlacklistTable import com.github.dataanon.model.DbConfig import com.github.dataanon.support.MoviesTable -import io.kotlintest.matchers.shouldBe +import io.kotlintest.shouldBe import io.kotlintest.specs.FunSpec import java.time.LocalDate diff --git a/src/test/kotlin/com/github/dataanon/model/BlacklistTableUnitTest.kt b/src/test/kotlin/com/github/dataanon/model/BlacklistTableUnitTest.kt index 68e18f2..b737cc3 100644 --- a/src/test/kotlin/com/github/dataanon/model/BlacklistTableUnitTest.kt +++ b/src/test/kotlin/com/github/dataanon/model/BlacklistTableUnitTest.kt @@ -1,6 +1,6 @@ package com.github.dataanon.model -import io.kotlintest.matchers.shouldBe +import io.kotlintest.shouldBe import io.kotlintest.specs.FunSpec class BlacklistTableUnitTest : FunSpec() { diff --git a/src/test/kotlin/com/github/dataanon/model/WhitelistTableUnitTest.kt b/src/test/kotlin/com/github/dataanon/model/WhitelistTableUnitTest.kt index defc71c..72dffcf 100644 --- a/src/test/kotlin/com/github/dataanon/model/WhitelistTableUnitTest.kt +++ b/src/test/kotlin/com/github/dataanon/model/WhitelistTableUnitTest.kt @@ -1,7 +1,7 @@ package com.github.dataanon.model import com.github.dataanon.strategy.AnonymizationStrategy -import io.kotlintest.matchers.shouldBe +import io.kotlintest.shouldBe import io.kotlintest.specs.FunSpec class WhitelistTableUnitTest : FunSpec() { diff --git a/src/test/kotlin/com/github/dataanon/strategy/CopyAnonymizationStrategyUnitTest.kt b/src/test/kotlin/com/github/dataanon/strategy/CopyAnonymizationStrategyUnitTest.kt index 47eb1d9..c69f17a 100644 --- a/src/test/kotlin/com/github/dataanon/strategy/CopyAnonymizationStrategyUnitTest.kt +++ b/src/test/kotlin/com/github/dataanon/strategy/CopyAnonymizationStrategyUnitTest.kt @@ -2,7 +2,7 @@ package com.github.dataanon.strategy import com.github.dataanon.model.Field import com.github.dataanon.model.Record -import io.kotlintest.matchers.shouldEqual +import io.kotlintest.shouldBe import io.kotlintest.specs.FunSpec class CopyAnonymizationStrategyUnitTest : FunSpec() { @@ -16,7 +16,7 @@ class CopyAnonymizationStrategyUnitTest : FunSpec() { val copyAnonymizationStrategy = CopyAnonymizationStrategy() val anonymized = copyAnonymizationStrategy.anonymize(field, emptyRecord) - anonymized shouldEqual "John" + anonymized shouldBe "John" } test("should return Double value as is given CopyAnonymizationStrategy") { @@ -25,7 +25,7 @@ class CopyAnonymizationStrategyUnitTest : FunSpec() { val copyAnonymizationStrategy = CopyAnonymizationStrategy() val anonymized = copyAnonymizationStrategy.anonymize(field, emptyRecord) - anonymized shouldEqual 12.56 + anonymized shouldBe 12.56 } test("should return Int value as is given CopyAnonymizationStrategy") { @@ -34,7 +34,7 @@ class CopyAnonymizationStrategyUnitTest : FunSpec() { val copyAnonymizationStrategy = CopyAnonymizationStrategy() val anonymized = copyAnonymizationStrategy.anonymize(field, emptyRecord) - anonymized shouldEqual 12 + anonymized shouldBe 12 } } } \ No newline at end of file diff --git a/src/test/kotlin/com/github/dataanon/strategy/bool/RandomBooleanUnitTest.kt b/src/test/kotlin/com/github/dataanon/strategy/bool/RandomBooleanUnitTest.kt index 458a8b6..7f91383 100644 --- a/src/test/kotlin/com/github/dataanon/strategy/bool/RandomBooleanUnitTest.kt +++ b/src/test/kotlin/com/github/dataanon/strategy/bool/RandomBooleanUnitTest.kt @@ -3,7 +3,7 @@ package com.github.dataanon.strategy.bool import com.github.dataanon.Matchers import com.github.dataanon.model.Field import com.github.dataanon.model.Record -import io.kotlintest.matchers.should +import io.kotlintest.should import io.kotlintest.specs.FunSpec class RandomBooleanUnitTest : FunSpec(), Matchers { diff --git a/src/test/kotlin/com/github/dataanon/strategy/datetime/DateRandomDeltaTest.kt b/src/test/kotlin/com/github/dataanon/strategy/datetime/DateRandomDeltaTest.kt index fdbbfb5..4a3888e 100644 --- a/src/test/kotlin/com/github/dataanon/strategy/datetime/DateRandomDeltaTest.kt +++ b/src/test/kotlin/com/github/dataanon/strategy/datetime/DateRandomDeltaTest.kt @@ -3,12 +3,12 @@ package com.github.dataanon.strategy.datetime import com.github.dataanon.Matchers import com.github.dataanon.model.Field import com.github.dataanon.model.Record -import io.kotlintest.matchers.should -import io.kotlintest.properties.forAll -import io.kotlintest.properties.headers -import io.kotlintest.properties.row -import io.kotlintest.properties.table +import io.kotlintest.should import io.kotlintest.specs.FunSpec +import io.kotlintest.tables.forAll +import io.kotlintest.tables.headers +import io.kotlintest.tables.row +import io.kotlintest.tables.table import java.time.LocalDate class DateRandomDeltaTest : FunSpec(), Matchers { diff --git a/src/test/kotlin/com/github/dataanon/strategy/datetime/DateTimeRandomDeltaTest.kt b/src/test/kotlin/com/github/dataanon/strategy/datetime/DateTimeRandomDeltaTest.kt index 1af70e5..c0ce68e 100644 --- a/src/test/kotlin/com/github/dataanon/strategy/datetime/DateTimeRandomDeltaTest.kt +++ b/src/test/kotlin/com/github/dataanon/strategy/datetime/DateTimeRandomDeltaTest.kt @@ -3,12 +3,12 @@ package com.github.dataanon.strategy.datetime import com.github.dataanon.Matchers import com.github.dataanon.model.Field import com.github.dataanon.model.Record -import io.kotlintest.matchers.should -import io.kotlintest.properties.forAll -import io.kotlintest.properties.headers -import io.kotlintest.properties.row -import io.kotlintest.properties.table +import io.kotlintest.should import io.kotlintest.specs.FunSpec +import io.kotlintest.tables.forAll +import io.kotlintest.tables.headers +import io.kotlintest.tables.row +import io.kotlintest.tables.table import java.time.Duration import java.time.LocalDateTime import java.time.ZoneOffset diff --git a/src/test/kotlin/com/github/dataanon/strategy/email/RandomEmailUnitTest.kt b/src/test/kotlin/com/github/dataanon/strategy/email/RandomEmailUnitTest.kt index 457acf1..1f2d663 100644 --- a/src/test/kotlin/com/github/dataanon/strategy/email/RandomEmailUnitTest.kt +++ b/src/test/kotlin/com/github/dataanon/strategy/email/RandomEmailUnitTest.kt @@ -3,8 +3,8 @@ package com.github.dataanon.strategy.email import com.github.dataanon.Matchers import com.github.dataanon.model.Field import com.github.dataanon.model.Record -import io.kotlintest.matchers.should -import io.kotlintest.matchers.shouldThrow +import io.kotlintest.should +import io.kotlintest.shouldThrow import io.kotlintest.specs.FunSpec class RandomEmailUnitTest : FunSpec(), Matchers { diff --git a/src/test/kotlin/com/github/dataanon/strategy/list/PickFromDatabaseUnitTest.kt b/src/test/kotlin/com/github/dataanon/strategy/list/PickFromDatabaseUnitTest.kt index 111c37b..b082096 100644 --- a/src/test/kotlin/com/github/dataanon/strategy/list/PickFromDatabaseUnitTest.kt +++ b/src/test/kotlin/com/github/dataanon/strategy/list/PickFromDatabaseUnitTest.kt @@ -5,8 +5,8 @@ import com.github.dataanon.model.DbConfig import com.github.dataanon.model.Field import com.github.dataanon.model.Record import com.github.dataanon.support.MoviesTable -import io.kotlintest.matchers.should -import io.kotlintest.matchers.shouldThrow +import io.kotlintest.should +import io.kotlintest.shouldThrow import io.kotlintest.specs.FunSpec import java.time.LocalDate diff --git a/src/test/kotlin/com/github/dataanon/strategy/list/PickFromFileUnitTest.kt b/src/test/kotlin/com/github/dataanon/strategy/list/PickFromFileUnitTest.kt index 824a708..07fb306 100644 --- a/src/test/kotlin/com/github/dataanon/strategy/list/PickFromFileUnitTest.kt +++ b/src/test/kotlin/com/github/dataanon/strategy/list/PickFromFileUnitTest.kt @@ -4,8 +4,8 @@ import com.github.dataanon.Matchers import com.github.dataanon.model.Field import com.github.dataanon.model.Record import com.github.dataanon.strategy.string.PickStringFromFile -import io.kotlintest.matchers.should -import io.kotlintest.matchers.shouldThrow +import io.kotlintest.should +import io.kotlintest.shouldThrow import io.kotlintest.specs.FunSpec import java.io.File diff --git a/src/test/kotlin/com/github/dataanon/strategy/list/PickFromListUnitTest.kt b/src/test/kotlin/com/github/dataanon/strategy/list/PickFromListUnitTest.kt index 737178d..209463c 100644 --- a/src/test/kotlin/com/github/dataanon/strategy/list/PickFromListUnitTest.kt +++ b/src/test/kotlin/com/github/dataanon/strategy/list/PickFromListUnitTest.kt @@ -4,8 +4,8 @@ import com.github.dataanon.Matchers import com.github.dataanon.model.Field import com.github.dataanon.model.Record import com.github.dataanon.strategy.list.PickFromList -import io.kotlintest.matchers.should -import io.kotlintest.matchers.shouldThrow +import io.kotlintest.should +import io.kotlintest.shouldThrow import io.kotlintest.specs.FunSpec class PickFromListUnitTest : FunSpec(), Matchers { diff --git a/src/test/kotlin/com/github/dataanon/strategy/name/RandomFirstNameUnitTest.kt b/src/test/kotlin/com/github/dataanon/strategy/name/RandomFirstNameUnitTest.kt index b8ebfb7..1b887ce 100644 --- a/src/test/kotlin/com/github/dataanon/strategy/name/RandomFirstNameUnitTest.kt +++ b/src/test/kotlin/com/github/dataanon/strategy/name/RandomFirstNameUnitTest.kt @@ -3,8 +3,8 @@ package com.github.dataanon.strategy.name import com.github.dataanon.Matchers import com.github.dataanon.model.Field import com.github.dataanon.model.Record -import io.kotlintest.matchers.should -import io.kotlintest.matchers.shouldThrow +import io.kotlintest.should +import io.kotlintest.shouldThrow import io.kotlintest.specs.FunSpec import java.io.File diff --git a/src/test/kotlin/com/github/dataanon/strategy/name/RandomFullNameUnitTest.kt b/src/test/kotlin/com/github/dataanon/strategy/name/RandomFullNameUnitTest.kt index 2378649..faa8230 100644 --- a/src/test/kotlin/com/github/dataanon/strategy/name/RandomFullNameUnitTest.kt +++ b/src/test/kotlin/com/github/dataanon/strategy/name/RandomFullNameUnitTest.kt @@ -3,8 +3,8 @@ package com.github.dataanon.strategy.name import com.github.dataanon.Matchers import com.github.dataanon.model.Field import com.github.dataanon.model.Record -import io.kotlintest.matchers.should -import io.kotlintest.matchers.shouldEqual +import io.kotlintest.should +import io.kotlintest.shouldBe import io.kotlintest.specs.FunSpec import java.io.File @@ -33,7 +33,7 @@ class RandomFullNameUnitTest : FunSpec(), Matchers { val anonymized = randomFullName.anonymize(field, emptyRecord) val nameComponents = anonymized.split(" ") - nameComponents.size shouldEqual 2 + nameComponents.size shouldBe 2 } test("should return random full name from provided sources") { @@ -60,7 +60,7 @@ class RandomFullNameUnitTest : FunSpec(), Matchers { val anonymized = randomFullName.anonymize(field, emptyRecord) val nameComponents = anonymized.split(" ") - nameComponents.size shouldEqual 2 + nameComponents.size shouldBe 2 } } } \ No newline at end of file diff --git a/src/test/kotlin/com/github/dataanon/strategy/name/RandomLastNameUnitTest.kt b/src/test/kotlin/com/github/dataanon/strategy/name/RandomLastNameUnitTest.kt index 1250dab..1ac89a3 100644 --- a/src/test/kotlin/com/github/dataanon/strategy/name/RandomLastNameUnitTest.kt +++ b/src/test/kotlin/com/github/dataanon/strategy/name/RandomLastNameUnitTest.kt @@ -3,7 +3,7 @@ package com.github.dataanon.strategy.name import com.github.dataanon.Matchers import com.github.dataanon.model.Field import com.github.dataanon.model.Record -import io.kotlintest.matchers.should +import io.kotlintest.should import io.kotlintest.specs.FunSpec import java.io.File diff --git a/src/test/kotlin/com/github/dataanon/strategy/number/RandomDoubleDeltaUnitTest.kt b/src/test/kotlin/com/github/dataanon/strategy/number/RandomDoubleDeltaUnitTest.kt index d8ac88f..765ee04 100644 --- a/src/test/kotlin/com/github/dataanon/strategy/number/RandomDoubleDeltaUnitTest.kt +++ b/src/test/kotlin/com/github/dataanon/strategy/number/RandomDoubleDeltaUnitTest.kt @@ -3,7 +3,7 @@ package com.github.dataanon.strategy.number import com.github.dataanon.Matchers import com.github.dataanon.model.Field import com.github.dataanon.model.Record -import io.kotlintest.matchers.should +import io.kotlintest.should import io.kotlintest.specs.FunSpec class RandomDoubleDeltaUnitTest : FunSpec(), Matchers{ diff --git a/src/test/kotlin/com/github/dataanon/strategy/number/RandomDoubleUnitTest.kt b/src/test/kotlin/com/github/dataanon/strategy/number/RandomDoubleUnitTest.kt index bad700b..bee7fd6 100644 --- a/src/test/kotlin/com/github/dataanon/strategy/number/RandomDoubleUnitTest.kt +++ b/src/test/kotlin/com/github/dataanon/strategy/number/RandomDoubleUnitTest.kt @@ -3,7 +3,7 @@ package com.github.dataanon.strategy.number import com.github.dataanon.Matchers import com.github.dataanon.model.Field import com.github.dataanon.model.Record -import io.kotlintest.matchers.should +import io.kotlintest.should import io.kotlintest.specs.FunSpec class RandomDoubleUnitTest : FunSpec(), Matchers { diff --git a/src/test/kotlin/com/github/dataanon/strategy/number/RandomFloatDeltaUnitTest.kt b/src/test/kotlin/com/github/dataanon/strategy/number/RandomFloatDeltaUnitTest.kt index ada993b..3de1dc0 100644 --- a/src/test/kotlin/com/github/dataanon/strategy/number/RandomFloatDeltaUnitTest.kt +++ b/src/test/kotlin/com/github/dataanon/strategy/number/RandomFloatDeltaUnitTest.kt @@ -3,7 +3,7 @@ package com.github.dataanon.strategy.number import com.github.dataanon.Matchers import com.github.dataanon.model.Field import com.github.dataanon.model.Record -import io.kotlintest.matchers.should +import io.kotlintest.should import io.kotlintest.specs.FunSpec class RandomFloatDeltaUnitTest : FunSpec(), Matchers { diff --git a/src/test/kotlin/com/github/dataanon/strategy/number/RandomFloatUnitTest.kt b/src/test/kotlin/com/github/dataanon/strategy/number/RandomFloatUnitTest.kt index aa531b0..63fffd1 100644 --- a/src/test/kotlin/com/github/dataanon/strategy/number/RandomFloatUnitTest.kt +++ b/src/test/kotlin/com/github/dataanon/strategy/number/RandomFloatUnitTest.kt @@ -3,7 +3,7 @@ package com.github.dataanon.strategy.number import com.github.dataanon.Matchers import com.github.dataanon.model.Field import com.github.dataanon.model.Record -import io.kotlintest.matchers.should +import io.kotlintest.should import io.kotlintest.specs.FunSpec class RandomFloatUnitTest : FunSpec(), Matchers { diff --git a/src/test/kotlin/com/github/dataanon/strategy/number/RandomIntDeltaUnitTest.kt b/src/test/kotlin/com/github/dataanon/strategy/number/RandomIntDeltaUnitTest.kt index 02c47ce..7de62f1 100644 --- a/src/test/kotlin/com/github/dataanon/strategy/number/RandomIntDeltaUnitTest.kt +++ b/src/test/kotlin/com/github/dataanon/strategy/number/RandomIntDeltaUnitTest.kt @@ -3,7 +3,7 @@ package com.github.dataanon.strategy.number import com.github.dataanon.Matchers import com.github.dataanon.model.Field import com.github.dataanon.model.Record -import io.kotlintest.matchers.should +import io.kotlintest.should import io.kotlintest.specs.FunSpec class RandomIntDeltaUnitTest : FunSpec(), Matchers { diff --git a/src/test/kotlin/com/github/dataanon/strategy/number/RandomIntUnitTest.kt b/src/test/kotlin/com/github/dataanon/strategy/number/RandomIntUnitTest.kt index af9a533..f3eb986 100644 --- a/src/test/kotlin/com/github/dataanon/strategy/number/RandomIntUnitTest.kt +++ b/src/test/kotlin/com/github/dataanon/strategy/number/RandomIntUnitTest.kt @@ -3,7 +3,7 @@ package com.github.dataanon.strategy.number import com.github.dataanon.Matchers import com.github.dataanon.model.Field import com.github.dataanon.model.Record -import io.kotlintest.matchers.should +import io.kotlintest.should import io.kotlintest.specs.FunSpec class RandomIntUnitTest : FunSpec(), Matchers { diff --git a/src/test/kotlin/com/github/dataanon/strategy/string/LoremIpsumUnitTest.kt b/src/test/kotlin/com/github/dataanon/strategy/string/LoremIpsumUnitTest.kt index de4d547..0350c28 100644 --- a/src/test/kotlin/com/github/dataanon/strategy/string/LoremIpsumUnitTest.kt +++ b/src/test/kotlin/com/github/dataanon/strategy/string/LoremIpsumUnitTest.kt @@ -2,7 +2,7 @@ package com.github.dataanon.strategy.string import com.github.dataanon.model.Field import com.github.dataanon.model.Record -import io.kotlintest.matchers.shouldBe +import io.kotlintest.shouldBe import io.kotlintest.specs.FunSpec class LoremIpsumUnitTest : FunSpec() { diff --git a/src/test/kotlin/com/github/dataanon/strategy/string/RandomFormattedStringUnitTest.kt b/src/test/kotlin/com/github/dataanon/strategy/string/RandomFormattedStringUnitTest.kt index c0d38b0..38173a4 100644 --- a/src/test/kotlin/com/github/dataanon/strategy/string/RandomFormattedStringUnitTest.kt +++ b/src/test/kotlin/com/github/dataanon/strategy/string/RandomFormattedStringUnitTest.kt @@ -3,8 +3,8 @@ package com.github.dataanon.strategy.string import com.github.dataanon.Matchers import com.github.dataanon.model.Field import com.github.dataanon.model.Record -import io.kotlintest.matchers.should -import io.kotlintest.matchers.shouldEqual +import io.kotlintest.should +import io.kotlintest.shouldBe import io.kotlintest.specs.FunSpec import java.util.regex.Pattern @@ -18,7 +18,7 @@ class RandomFormattedStringUnitTest : FunSpec(), Matchers { val field = Field("card", "9090-1232-0876-3409") val anonymized = randomFormattedString.anonymize(field, emptyRecord) - anonymized.length shouldEqual 19 + anonymized.length shouldBe 19 } test("should return a formatted string replacing numeric digit with a random number"){ @@ -34,7 +34,7 @@ class RandomFormattedStringUnitTest : FunSpec(), Matchers { val field = Field("card", "ab-pp-QA") val anonymized = randomFormattedString.anonymize(field, emptyRecord) - anonymized.length shouldEqual 8 + anonymized.length shouldBe 8 } test("should return a formatted string replacing character with a random character"){ @@ -51,7 +51,7 @@ class RandomFormattedStringUnitTest : FunSpec(), Matchers { val anonymized = randomFormattedString.anonymize(field, emptyRecord) - anonymized.length shouldEqual 11 + anonymized.length shouldBe 11 } test("should return a formatted string replacing character with a random character and a digit with a random digit"){ @@ -61,7 +61,7 @@ class RandomFormattedStringUnitTest : FunSpec(), Matchers { val anonymized = randomFormattedString.anonymize(field, emptyRecord) val matcher = Pattern.compile("([A-Z]{5})([0-9]{4})-([A-Z]{1})").matcher(anonymized) - matcher.matches() shouldEqual true + matcher.matches() shouldBe true } } } \ No newline at end of file diff --git a/src/test/kotlin/com/github/dataanon/strategy/string/RandomStringUnitTest.kt b/src/test/kotlin/com/github/dataanon/strategy/string/RandomStringUnitTest.kt index d4c3ff5..bf7934b 100644 --- a/src/test/kotlin/com/github/dataanon/strategy/string/RandomStringUnitTest.kt +++ b/src/test/kotlin/com/github/dataanon/strategy/string/RandomStringUnitTest.kt @@ -3,9 +3,9 @@ package com.github.dataanon.strategy.string import com.github.dataanon.Matchers import com.github.dataanon.model.Field import com.github.dataanon.model.Record -import io.kotlintest.matchers.should -import io.kotlintest.matchers.shouldBe -import io.kotlintest.matchers.shouldEqual +import io.kotlintest.should +import io.kotlintest.shouldBe +import io.kotlintest.shouldBe import io.kotlintest.specs.FunSpec class RandomStringUnitTest : FunSpec(), Matchers { @@ -52,7 +52,7 @@ class RandomStringUnitTest : FunSpec(), Matchers { val field = Field("first_name", "John") val anonymized = strategy.anonymize(field, emptyRecord) - anonymized.length shouldEqual 4 + anonymized.length shouldBe 4 } test("should return a random alphabetic string") { diff --git a/src/test/kotlin/com/github/dataanon/strategy/string/StringTemplateUnitTest.kt b/src/test/kotlin/com/github/dataanon/strategy/string/StringTemplateUnitTest.kt index 63f0abc..403bc83 100644 --- a/src/test/kotlin/com/github/dataanon/strategy/string/StringTemplateUnitTest.kt +++ b/src/test/kotlin/com/github/dataanon/strategy/string/StringTemplateUnitTest.kt @@ -3,9 +3,9 @@ package com.github.dataanon.strategy.string import com.github.dataanon.Matchers import com.github.dataanon.model.Field import com.github.dataanon.model.Record -import io.kotlintest.matchers.should -import io.kotlintest.matchers.shouldEqual -import io.kotlintest.matchers.shouldThrow +import io.kotlintest.should +import io.kotlintest.shouldBe +import io.kotlintest.shouldThrow import io.kotlintest.specs.FunSpec import java.io.File @@ -20,7 +20,7 @@ class StringTemplateUnitTest : FunSpec(), Matchers { val anonymized = stringTemplate.anonymize(field, Record(listOf(), 100)) - anonymized shouldEqual "user_100" + anonymized shouldBe "user_100" } test("should return a string after evaluating row number with field value") { @@ -29,7 +29,7 @@ class StringTemplateUnitTest : FunSpec(), Matchers { val anonymized = stringTemplate.anonymize(field, Record(listOf(), 100)) - anonymized shouldEqual "John_100" + anonymized shouldBe "John_100" } test("should return a string with random full name consisting of first name and last name separated by underscore") { @@ -39,7 +39,7 @@ class StringTemplateUnitTest : FunSpec(), Matchers { val anonymized = stringTemplate.anonymize(field, emptyRecord) val nameComponents = anonymized.split("_") - nameComponents.size shouldEqual 2 + nameComponents.size shouldBe 2 } test("should return a string with random first name and last name") { @@ -69,7 +69,7 @@ class StringTemplateUnitTest : FunSpec(), Matchers { val field = Field("user_name", "John") val anonymized = stringTemplate.anonymize(field, emptyRecord) - anonymized shouldEqual "John@thoughtworks.com" + anonymized shouldBe "John@thoughtworks.com" } test("should return a random alphabetic string with length based on field value") { @@ -77,7 +77,7 @@ class StringTemplateUnitTest : FunSpec(), Matchers { val field = Field("user_name", "John") val anonymized = stringTemplate.anonymize(field, emptyRecord) - anonymized.length shouldEqual 4 + anonymized.length shouldBe 4 } test("should return a random alphabetic string") { @@ -93,7 +93,7 @@ class StringTemplateUnitTest : FunSpec(), Matchers { val field = Field("user_name", "John") val anonymized = stringTemplate.anonymize(field, emptyRecord) - anonymized.length shouldEqual 4 + anonymized.length shouldBe 4 } test("should throw IllegalArgumentException given template is blank"){ diff --git a/src/test/kotlin/com/github/dataanon/utils/DefaultAnonymizationStrategiesUnitTest.kt b/src/test/kotlin/com/github/dataanon/utils/DefaultAnonymizationStrategiesUnitTest.kt index fa82f6f..d4666a5 100644 --- a/src/test/kotlin/com/github/dataanon/utils/DefaultAnonymizationStrategiesUnitTest.kt +++ b/src/test/kotlin/com/github/dataanon/utils/DefaultAnonymizationStrategiesUnitTest.kt @@ -6,7 +6,7 @@ import com.github.dataanon.strategy.number.RandomFloat import com.github.dataanon.strategy.number.RandomInt import com.github.dataanon.strategy.string.RandomAlphabetic import io.kotlintest.matchers.beInstanceOf -import io.kotlintest.matchers.should +import io.kotlintest.should import io.kotlintest.specs.FunSpec import java.util.* @@ -17,7 +17,7 @@ class DefaultAnonymizationStrategiesUnitTest : FunSpec(){ val kClassString = String::class val anonymizationStrategy = DefaultAnonymizationStrategies.getAnonymizationStrategy(kClassString) - anonymizationStrategy.should { beInstanceOf(RandomAlphabetic::class) } + anonymizationStrategy should { beInstanceOf(RandomAlphabetic::class) } } test("should return RandomInt for Int as default AnonymizationStrategy"){ diff --git a/src/test/kotlin/com/github/dataanon/utils/RandomUtilsUnitTest.kt b/src/test/kotlin/com/github/dataanon/utils/RandomUtilsUnitTest.kt index 5db9b7c..16cfa1b 100644 --- a/src/test/kotlin/com/github/dataanon/utils/RandomUtilsUnitTest.kt +++ b/src/test/kotlin/com/github/dataanon/utils/RandomUtilsUnitTest.kt @@ -1,9 +1,9 @@ package com.github.dataanon.utils import com.github.dataanon.Matchers -import io.kotlintest.matchers.should -import io.kotlintest.matchers.shouldBe -import io.kotlintest.matchers.shouldThrow +import io.kotlintest.should +import io.kotlintest.shouldBe +import io.kotlintest.shouldThrow import io.kotlintest.specs.FunSpec class RandomUtilsUnitTest : FunSpec(), Matchers { @@ -45,7 +45,7 @@ class RandomUtilsUnitTest : FunSpec(), Matchers { random should beIn(100.0..250.0) } - test("should throw IllegalArgumentException") { + test("should throw IllegalArgumentException 1") { shouldThrow { RandomUtils.generateRandomDouble(from = 10.0, to = 0.0) } @@ -61,7 +61,7 @@ class RandomUtilsUnitTest : FunSpec(), Matchers { random should beIn (100..250) } - test("should throw IllegalArgumentException") { + test("should throw IllegalArgumentException 2") { shouldThrow { RandomUtils.generateRandomInt(from = 10, to = 0) }