Tidied up unit tests, added a private variable to DataClassWithAdditionalFields

Author: YetAnotherMatt

kotlin-builder-example-usage/src/main/kotlin/com/thinkinglogic/example/DataClassWithAdditionalFields.kt

@@ -4,7 +4,8 @@ import com.thinkinglogic.builder.annotation.Builder
 
 @Builder
 data class DataClassWithAdditionalFields(
-        val constructorString: String
+        val constructorString: String,
+        private val privateString: String
 ) {
     val nonConstructorString = constructorString + "foo"
 

kotlin-builder-example-usage/src/test/kotlin/com/thinkinglogic/example/ArraysDataClassTest.kt

@@ -1,6 +1,6 @@
 package com.thinkinglogic.example
 
-import assertk.assertions.isEqualTo
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import java.time.LocalDate
 
@@ -27,7 +27,7 @@ internal class ArraysDataClassTest {
                 .build()
 
         // then
-        assertk.assert(actual).isEqualTo(expected)
+        assertThat(actual).isEqualTo(expected)
     }
 
 }

kotlin-builder-example-usage/src/test/kotlin/com/thinkinglogic/example/ClassWithConstructorParametersTest.kt

@@ -1,6 +1,6 @@
 package com.thinkinglogic.example
 
-import assertk.assertions.isEqualTo
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
 internal class ClassWithConstructorParametersTest {
@@ -24,7 +24,7 @@ internal class ClassWithConstructorParametersTest {
                 .build()
 
         // then
-        assertk.assert(actual).isEqualTo(expected)
+        assertThat(actual).isEqualTo(expected)
     }
 
     @Test
@@ -43,7 +43,7 @@ internal class ClassWithConstructorParametersTest {
                 .build()
 
         // then
-        assertk.assert(actual).isEqualTo(expected)
+        assertThat(actual).isEqualTo(expected)
     }
 
 }

kotlin-builder-example-usage/src/test/kotlin/com/thinkinglogic/example/CollectionsDataClassTest.kt

@@ -1,6 +1,6 @@
 package com.thinkinglogic.example
 
-import assertk.assertions.isEqualTo
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import java.time.LocalDate
 import java.util.*
@@ -32,7 +32,7 @@ internal class CollectionsDataClassTest {
                 .build()
 
         // then
-        assertk.assert(actual).isEqualTo(expected)
+        assertThat(actual).isEqualTo(expected)
     }
 
 }

kotlin-builder-example-usage/src/test/kotlin/com/thinkinglogic/example/DataClassWithAdditionalFieldsTest.kt

@@ -1,24 +1,27 @@
 package com.thinkinglogic.example
 
-import assertk.assertions.isEqualTo
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
 internal class DataClassWithAdditionalFieldsTest {
 
     @Test
     fun `builder should create object with correct properties`() {
         // given
+        val privateString = "barfoo"
         val expected = DataClassWithAdditionalFields(
-                constructorString = "foobar "
+                constructorString = "foobar ",
+                privateString = privateString
         )
 
         // when
         val actual = DataClassWithAdditionalFieldsBuilder()
                 .constructorString(expected.constructorString)
+                .privateString(privateString)
                 .build()
 
         // then
-        assertk.assert(actual).isEqualTo(expected)
+        assertThat(actual).isEqualTo(expected)
     }
 
 }

kotlin-builder-example-usage/src/test/kotlin/com/thinkinglogic/example/GenericTypeDataClassTest.kt

@@ -1,6 +1,6 @@
 package com.thinkinglogic.example
 
-import assertk.assertions.isEqualTo
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
 internal class GenericTypeDataClassTest {
@@ -18,7 +18,7 @@ internal class GenericTypeDataClassTest {
                 .build()
 
         // then
-        assertk.assert(actual).isEqualTo(expected)
+        assertThat(actual).isEqualTo(expected)
     }
 
 }

kotlin-builder-example-usage/src/test/kotlin/com/thinkinglogic/example/MutableCollectionsDataClassTest.kt

@@ -1,6 +1,6 @@
 package com.thinkinglogic.example
 
-import assertk.assertions.isEqualTo
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import java.time.LocalDate
 
@@ -28,7 +28,7 @@ internal class MutableCollectionsDataClassTest {
                 .build()
 
         // then
-        assertk.assert(actual).isEqualTo(expected)
+        assertThat(actual).isEqualTo(expected)
     }
 
 }

kotlin-builder-example-usage/src/test/kotlin/com/thinkinglogic/example/SimpleDataClassTest.kt

@@ -3,6 +3,7 @@ package com.thinkinglogic.example
 import assertk.assert
 import assertk.assertions.*
 import assertk.catch
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import java.time.LocalDate
 
@@ -30,7 +31,7 @@ internal class SimpleDataClassTest {
                 .build()
 
         // then
-        assert(actual).isEqualTo(expected)
+        assertThat(actual).isEqualTo(expected)
     }
 
     @Test
@@ -53,7 +54,7 @@ internal class SimpleDataClassTest {
                 .build()
 
         // then
-        assert(actual).isEqualTo(expected)
+        assertThat(actual).isEqualTo(expected)
     }
 
     @Test