Merge pull request #1686 from The-Lum/PatchBranch

refactor: Create `test/utils` directory and `CommandHelpThemeTest` on a more accurate folder

test/net/sourceforge/plantuml/LoadJsonTest.java

@@ -1,9 +1,9 @@
 package net.sourceforge.plantuml;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static net.sourceforge.plantuml.test.TestUtils.writeUtf8File;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.util.Lists.newArrayList;
+import static test.utils.TestUtils.writeUtf8File;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

test/net/sourceforge/plantuml/TestFileDirOption.java

@@ -1,9 +1,9 @@
 package net.sourceforge.plantuml;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static net.sourceforge.plantuml.test.TestUtils.writeUtf8File;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.util.Lists.newArrayList;
+import static test.utils.TestUtils.writeUtf8File;
 
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;

test/net/sourceforge/plantuml/help/CommandHelpThemeTest.java

@@ -0,0 +1,23 @@
+package net.sourceforge.plantuml.help;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static test.utils.PlantUmlTestUtils.exportDiagram;
+
+import org.junit.jupiter.api.Test;
+
+class CommandHelpThemeTest {
+
+	@Test
+	public void command_help_theme() throws Exception {
+
+		final String output = exportDiagram(
+				"@startuml",
+				"help themes",
+				"@enduml"
+		).asString();
+
+		assertThat(output)
+				.startsWith("                                \nHelp on themes")
+				.contains("bluegray", "hacker");
+	}
+}

test/net/sourceforge/plantuml/tim/stdlib/FeatureTest.java

@@ -1,8 +1,8 @@
 package net.sourceforge.plantuml.tim.stdlib;
 
-import static net.sourceforge.plantuml.test.JunitUtils.StringJsonConverter;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutput;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput;
+import static test.utils.JunitUtils.StringJsonConverter;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores;

test/net/sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java

@@ -1,8 +1,8 @@
 package net.sourceforge.plantuml.tim.stdlib;
 
-import static net.sourceforge.plantuml.test.JunitUtils.StringJsonConverter;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutput;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput;
+import static test.utils.JunitUtils.StringJsonConverter;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores;

test/net/sourceforge/plantuml/tim/stdlib/GetJsonTypeTest.java

@@ -1,8 +1,8 @@
 package net.sourceforge.plantuml.tim.stdlib;
 
-import static net.sourceforge.plantuml.test.JunitUtils.StringJsonConverter;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutput;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput;
+import static test.utils.JunitUtils.StringJsonConverter;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores;

test/net/sourceforge/plantuml/tim/stdlib/LowerTest.java

@@ -1,8 +1,8 @@
 package net.sourceforge.plantuml.tim.stdlib;
 
-import static net.sourceforge.plantuml.test.JunitUtils.StringJsonConverter;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutput;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput;
+import static test.utils.JunitUtils.StringJsonConverter;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores;

test/net/sourceforge/plantuml/tim/stdlib/SizeTest.java

@@ -1,8 +1,8 @@
 package net.sourceforge.plantuml.tim.stdlib;
 
-import static net.sourceforge.plantuml.test.JunitUtils.StringJsonConverter;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutput;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput;
+import static test.utils.JunitUtils.StringJsonConverter;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores;

test/net/sourceforge/plantuml/tim/stdlib/UpperTest.java

@@ -1,8 +1,8 @@
 package net.sourceforge.plantuml.tim.stdlib;
 
-import static net.sourceforge.plantuml.test.JunitUtils.StringJsonConverter;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutput;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput;
+import static test.utils.JunitUtils.StringJsonConverter;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores;

test/net/sourceforge/plantuml/tim/stdlib/_TemplateStdlibTest.template

@@ -1,8 +1,8 @@
 package net.sourceforge.plantuml.tim.stdlib;
 
-import static net.sourceforge.plantuml.test.JunitUtils.StringJsonConverter;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutput;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput;
+import static test.utils.JunitUtils.StringJsonConverter;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores;

test/test/example/TestExample.java

@@ -1,11 +1,11 @@
-package testhelper;
+package test.example;
 
-import static net.sourceforge.plantuml.test.PlantUmlTestUtils.exportDiagram;
+import static test.utils.PlantUmlTestUtils.exportDiagram;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
 
-class TestHelper {
+class TestExample {
 
 	@Test
 	public void test_help_themes() throws Exception {

test/test/utils/ImageTestUtils.java

@@ -1,4 +1,4 @@
-package net.sourceforge.plantuml.test;
+package test.utils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

test/test/utils/ImageTestUtilsTest.java

@@ -1,9 +1,9 @@
-package net.sourceforge.plantuml.test;
+package test.utils;
 
-import static net.sourceforge.plantuml.test.ImageTestUtils.assertImageSizeEqual;
-import static net.sourceforge.plantuml.test.ImageTestUtils.assertImagesEqual;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
+import static test.utils.ImageTestUtils.assertImageSizeEqual;
+import static test.utils.ImageTestUtils.assertImagesEqual;
 
 import java.awt.image.BufferedImage;
 

test/test/utils/JunitUtils.java

@@ -1,4 +1,4 @@
-package net.sourceforge.plantuml.test;
+package test.utils;
 
 import org.junit.jupiter.params.converter.ArgumentConversionException;
 import org.junit.jupiter.params.converter.SimpleArgumentConverter;

test/test/utils/PlantUmlTestUtils.java

@@ -1,4 +1,4 @@
-package net.sourceforge.plantuml.test;
+package test.utils;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;

test/test/utils/StringTestUtils.java

@@ -1,4 +1,4 @@
-package net.sourceforge.plantuml.test;
+package test.utils;
 
 import static java.util.Objects.requireNonNull;
 

test/test/utils/TestUtils.java

@@ -1,4 +1,4 @@
-package net.sourceforge.plantuml.test;
+package test.utils;
 
 import static java.nio.charset.StandardCharsets.UTF_8;