Merge pull request #19 from jGleitz/fix-atrium-deprecations

test: Fix atrium’s deprecations

Author: jGleitz

src/test/kotlin/NotationsTest.kt

@@ -1,9 +1,8 @@
 package de.joshuagleitze.stringnotation
 
-import ch.tutteli.atrium.api.cc.en_GB.property
-import ch.tutteli.atrium.api.cc.en_GB.returnValueOf
-import ch.tutteli.atrium.api.cc.en_GB.toBe
-import ch.tutteli.atrium.verbs.expect
+import ch.tutteli.atrium.api.fluent.en_GB.feature
+import ch.tutteli.atrium.api.fluent.en_GB.toBe
+import ch.tutteli.atrium.api.verbs.expect
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS
 import org.junit.jupiter.params.ParameterizedTest
@@ -21,24 +20,24 @@ abstract class BaseNotationTest(
 	@MethodSource("parseWords")
 	fun `parses words correctly`(input: String, expectedWord: Word) {
 		expect(input.fromNotation(notation)) {
-			property(Word::partsList).toBe(expectedWord.partsList)
+			feature(Word::partsList).toBe(expectedWord.partsList)
 		}
 	}
 
 	@ParameterizedTest(name = "{1} -> \"{0}\"")
 	@MethodSource("printWords")
 	fun `prints words correctly`(sourceWord: Word, expectedResult: String) {
 		expect(sourceWord) {
-			returnValueOf(subject::toNotation, notation).toBe(expectedResult)
+			feature(Word::toNotation, notation).toBe(expectedResult)
 		}
 	}
 
 	@ParameterizedTest(name = "\"{0}\"")
 	@MethodSource("unchangedWords")
 	fun `parsing and printing a word written in this notation does not change the word`(word: String) {
 		expect(word) {
-			returnValueOf(subject::fromNotation, notation) {
-				returnValueOf(subject::toNotation, notation).toBe(word)
+			feature(String::fromNotation, notation) {
+				feature(Word::toNotation, notation).toBe(word)
 			}
 		}
 	}

src/test/kotlin/WordTest.kt

@@ -1,28 +1,28 @@
 package de.joshuagleitze.stringnotation
 
-import ch.tutteli.atrium.api.cc.en_GB.asIterable
-import ch.tutteli.atrium.api.cc.en_GB.containsExactly
-import ch.tutteli.atrium.api.cc.en_GB.property
-import ch.tutteli.atrium.verbs.expect
+import ch.tutteli.atrium.api.fluent.en_GB.asIterable
+import ch.tutteli.atrium.api.fluent.en_GB.containsExactly
+import ch.tutteli.atrium.api.fluent.en_GB.feature
+import ch.tutteli.atrium.api.verbs.expect
 import org.junit.jupiter.api.Test
 
 class WordTest {
 	@Test
 	fun `exposes parts as list`() {
-		expect(Word("with", "parts")).property(Word::partsList).containsExactly("with", "parts")
-		expect(Word(listOf("with", "parts"))).property(Word::partsList).containsExactly("with", "parts")
-		expect(Word(sequenceOf("with", "parts"))).property(Word::partsList).containsExactly("with", "parts")
+		expect(Word("with", "parts")).feature(Word::partsList).containsExactly("with", "parts")
+		expect(Word(listOf("with", "parts"))).feature(Word::partsList).containsExactly("with", "parts")
+		expect(Word(sequenceOf("with", "parts"))).feature(Word::partsList).containsExactly("with", "parts")
 	}
 
 	@Test
 	fun `exposes parts as sequence`() {
-		expect(Word("with", "parts")).property(Word::parts).asIterable().containsExactly("with", "parts")
-		expect(Word(listOf("with", "parts"))).property(Word::parts).asIterable().containsExactly("with", "parts")
-		expect(Word(sequenceOf("with", "parts"))).property(Word::parts).asIterable().containsExactly("with", "parts")
+		expect(Word("with", "parts")).feature(Word::parts).asIterable().containsExactly("with", "parts")
+		expect(Word(listOf("with", "parts"))).feature(Word::parts).asIterable().containsExactly("with", "parts")
+		expect(Word(sequenceOf("with", "parts"))).feature(Word::parts).asIterable().containsExactly("with", "parts")
 	}
 
 	@Test
 	fun `allows to add parts`() {
-		expect((Word("with") + "more" + "parts")).property(Word::partsList).containsExactly("with", "more", "parts")
+		expect((Word("with") + "more" + "parts")).feature(Word::partsList).containsExactly("with", "more", "parts")
 	}
 }