From 9143e96b01802a2f8a6ec95d1060cb059648bd31 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Mon, 21 Oct 2019 10:40:56 +0200
Subject: [PATCH] Polish "Identify reserved keywords in package name"

See gh-1018
---
 .../InitializrConfigurationTests.java         | 48 +++++--------------
 1 file changed, 12 insertions(+), 36 deletions(-)

diff --git a/initializr-metadata/src/test/java/io/spring/initializr/metadata/InitializrConfigurationTests.java b/initializr-metadata/src/test/java/io/spring/initializr/metadata/InitializrConfigurationTests.java
index 054a6717..52918ea8 100755
--- a/initializr-metadata/src/test/java/io/spring/initializr/metadata/InitializrConfigurationTests.java
+++ b/initializr-metadata/src/test/java/io/spring/initializr/metadata/InitializrConfigurationTests.java
@@ -16,14 +16,9 @@
 
 package io.spring.initializr.metadata;
 
-import java.util.Arrays;
-import java.util.stream.Stream;
-
 import io.spring.initializr.generator.version.Version;
 import io.spring.initializr.metadata.InitializrConfiguration.Env.Kotlin;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -35,14 +30,6 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 class InitializrConfigurationTests {
 
-	// Taken from https://docs.oracle.com/javase/specs/jls/se8/html/jls-3.html#jls-3.9
-	private static final String[] RESERVED_KEYWORDS = { "abstract", "assert", "boolean", "break", "byte", "case",
-			"catch", "char", "class", "const", "continue", "default", "do", "double", "else", "enum", "extends",
-			"false", "final", "finally", "float", "for", "goto", "if", "implements", "import", "instanceof", "int",
-			"interface", "long", "native", "new", "null", "package", "private", "protected", "public", "return",
-			"short", "static", "strictfp", "super", "switch", "synchronized", "this", "throw", "throws", "transient",
-			"try", "true", "void", "volatile", "while" };
-
 	private final InitializrConfiguration properties = new InitializrConfiguration();
 
 	@Test
@@ -185,35 +172,24 @@ class InitializrConfigurationTests {
 		assertThat(this.properties.cleanPackageName("org.springframework", "com.example")).isEqualTo("com.example");
 	}
 
-	@ParameterizedTest
-	@MethodSource("reservedKeywords")
-	void generatePackageNameReservedKeywordsMiddleOfPackageName(final String keyword) {
-		final String badPackageName = String.format("com.%s.foo", keyword);
-		assertThat(this.properties.cleanPackageName(badPackageName, "com.example")).isEqualTo("com.example");
+	@Test
+	void generatePackageNameReservedKeywordsMiddleOfPackageName() {
+		assertThat(this.properties.cleanPackageName("com.return.foo", "com.example")).isEqualTo("com.example");
 	}
 
-	@ParameterizedTest
-	@MethodSource("reservedKeywords")
-	void generatePackageNameReservedKeywordsStartOfPackageName(final String keyword) {
-		final String badPackageName = String.format("%s.com.foo", keyword);
-		assertThat(this.properties.cleanPackageName(badPackageName, "com.example")).isEqualTo("com.example");
+	@Test
+	void generatePackageNameReservedKeywordsStartOfPackageName() {
+		assertThat(this.properties.cleanPackageName("false.com.foo", "com.example")).isEqualTo("com.example");
 	}
 
-	@ParameterizedTest
-	@MethodSource("reservedKeywords")
-	void generatePackageNameReservedKeywordsEndOfPackageName(final String keyword) {
-		final String badPackageName = String.format("com.foo.%s", keyword);
-		assertThat(this.properties.cleanPackageName(badPackageName, "com.example")).isEqualTo("com.example");
+	@Test
+	void generatePackageNameReservedKeywordsEndOfPackageName() {
+		assertThat(this.properties.cleanPackageName("com.foo.null", "com.example")).isEqualTo("com.example");
 	}
 
-	@ParameterizedTest
-	@MethodSource("reservedKeywords")
-	void generatePackageNameReservedKeywordsEntirePackageName(final String keyword) {
-		assertThat(this.properties.cleanPackageName(keyword, "com.example")).isEqualTo("com.example");
-	}
-
-	private static Stream<String> reservedKeywords() {
-		return Arrays.stream(RESERVED_KEYWORDS);
+	@Test
+	void generatePackageNameReservedKeywordsEntirePackageName() {
+		assertThat(this.properties.cleanPackageName("public", "com.example")).isEqualTo("com.example");
 	}
 
 	@Test