test: Fix for JVM 8

Author: jGleitz

build.gradle.kts

@@ -1,6 +1,6 @@
+import de.marcphilipp.gradle.nexus.NexusRepository
 import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import de.marcphilipp.gradle.nexus.NexusRepository
 
 plugins {
 	kotlin("jvm").version("1.3.61")

src/test/kotlin/BaseNotationTest.kt

@@ -3,6 +3,7 @@ package de.joshuagleitze.stringnotation
 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.Assumptions.assumeTrue
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.Arguments
@@ -11,29 +12,32 @@ import org.junit.jupiter.params.provider.MethodSource
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 abstract class BaseNotationTest(
 	private val notation: StringNotation,
-	private val unchangedWords: List<Pair<String, Word>>,
-	private val parseOnlyWords: List<Pair<String, Word>> = emptyList(),
-	private val printOnlyWords: List<Pair<Word, String>> = emptyList()
+	private val unchangedWords: List<NotationTestData>,
+	private val parseOnlyWords: List<NotationTestData> = emptyList(),
+	private val printOnlyWords: List<NotationTestData> = emptyList()
 ) {
-	@ParameterizedTest(name = "\"{0}\" -> {1}")
+	@ParameterizedTest(name = "\"{1}\" -> {2}")
 	@MethodSource("parseWords")
-	fun `parses words correctly`(input: String, expectedWord: Word) {
+	fun `parses words correctly`(minimumJavaVersion: Int, input: String, expectedWord: Word) {
+		assumeTrue(currentJavaVersion >= minimumJavaVersion, "Requires at least Java $minimumJavaVersion")
 		expect(input.fromNotation(notation)) {
 			feature(Word::partsList).toBe(expectedWord.partsList)
 		}
 	}
 
-	@ParameterizedTest(name = "{1} -> \"{0}\"")
+	@ParameterizedTest(name = "{2} -> \"{1}\"")
 	@MethodSource("printWords")
-	fun `prints words correctly`(sourceWord: Word, expectedResult: String) {
+	fun `prints words correctly`(minimumJavaVersion: Int, expectedResult: String, sourceWord: Word) {
+		assumeTrue(currentJavaVersion >= minimumJavaVersion, "Requires at least Java $minimumJavaVersion")
 		expect(sourceWord) {
 			feature(Word::toNotation, notation).toBe(expectedResult)
 		}
 	}
 
-	@ParameterizedTest(name = "\"{0}\"")
+	@ParameterizedTest(name = "\"{1}\"")
 	@MethodSource("unchangedWords")
-	fun `parsing and printing a word written in this notation does not change the word`(word: String) {
+	fun `parsing and printing a word written in this notation does not change the word`(minimumJavaVersion: Int, word: String) {
+		assumeTrue(currentJavaVersion >= minimumJavaVersion, "Requires at least Java $minimumJavaVersion")
 		expect(word) {
 			feature(String::fromNotation, notation) {
 				feature(Word::toNotation, notation).toBe(word)
@@ -42,15 +46,27 @@ abstract class BaseNotationTest(
 	}
 
 	private fun parseWords() = asArguments(unchangedWords + parseOnlyWords)
-	private fun printWords() = asArguments(unchangedWords.map { it.swap() } + printOnlyWords)
+	private fun printWords() = asArguments(unchangedWords + printOnlyWords)
 	private fun unchangedWords() = asArguments(unchangedWords)
 
-	private fun asArguments(pairs: List<Pair<*, *>>) = pairs.map {
+	private fun asArguments(pairs: List<NotationTestData>) = pairs.map {
 		Arguments.arguments(
-			it.first,
-			it.second
+			it.minimumJavaVersion,
+			it.string,
+			it.word
 		)
 	}
+}
+
+data class NotationTestData(val word: Word, val string: String, var minimumJavaVersion: Int = 0)
+
+infix fun Word.to(string: String) = NotationTestData(this, string)
+infix fun String.to(word: Word) = NotationTestData(word, this)
+infix fun NotationTestData.ifJvmVersionIsAtLeast(minimumJavaVersion: Int) = this.apply { this.minimumJavaVersion = minimumJavaVersion }
 
-	private fun <First, Second> Pair<First, Second>.swap() = Pair(this.second, this.first)
+val currentJavaVersion by lazy {
+	System.getProperty("java.runtime.version")
+		.split(".")
+		.let { if (it[0] == "1") it.drop(1) else it }[0]
+		.toInt()
 }

src/test/kotlin/JavaNotationsTest.kt

@@ -9,8 +9,9 @@ class JavaTypeNameTest: BaseNotationTest(
 		Word("removes", "upperCase") to "RemovesUppercase",
 		Word("") to "__",
 		Word("1") to "__",
-		Word("8if") to "if_",
-		Word("_") to "__"
+		Word("8if") to "If",
+		Word("enum") to "Enum",
+		Word("_") to "__" ifJvmVersionIsAtLeast 9
 	)
 )
 
@@ -27,7 +28,8 @@ class JavaMemberNameTest: BaseNotationTest(
 		Word("") to "__",
 		Word("1") to "__",
 		Word("8if") to "if_",
-		Word("_") to "__"
+		Word("enum") to "enum_",
+		Word("_") to "__" ifJvmVersionIsAtLeast 9
 	)
 )
 
@@ -46,7 +48,8 @@ class JavaPackagePartTest: BaseNotationTest(
 		Word("") to "__",
 		Word("1") to "__",
 		Word("8if") to "if_",
-		Word("_") to "__"
+		Word("enum") to "enum_",
+		Word("_") to "__" ifJvmVersionIsAtLeast 9
 	)
 )
 
@@ -58,8 +61,9 @@ class JavaPackageNameTest: BaseNotationTest(
 		"if.true" to Word("if", "true")
 	),
 	printOnlyWords = listOf(
+		Word("enum") to "enum_",
 		Word("if", "", "cApitAls") to "if_.__.capitals",
-		Word("_") to "__"
+		Word("_") to "__" ifJvmVersionIsAtLeast 9
 	)
 
 )
@@ -76,6 +80,7 @@ class JavaConstantNameTest: BaseNotationTest(
 		Word("") to "__",
 		Word("1") to "__",
 		Word("8if") to "IF",
-		Word("_") to "__"
+		Word("enum") to "enum_",
+		Word("_") to "__" ifJvmVersionIsAtLeast 9
 	)
 )