From f44f8edef60ffe42922942f732bcae9c303812fb Mon Sep 17 00:00:00 2001 From: Ashley Scopes <73482956+ascopes@users.noreply.github.com> Date: Sun, 15 Dec 2024 11:17:02 +0000 Subject: [PATCH] Remove JPMS from unit tests as a simplification --- .../dogfood/JctDogfoodTest.java | 67 ------------ .../jct/junit/AbstractCompilersProvider.java | 24 +---- .../src/main/java/module-info.java | 30 ------ .../AbstractContainerGroupAssertTest.java | 6 +- .../assertions/AbstractEnumAssertTest.java | 3 +- .../AbstractJavaFileObjectAssertTest.java | 12 +-- .../assertions/ClassLoaderAssertTest.java | 3 +- .../assertions/DiagnosticKindAssertTest.java | 3 +- .../assertions/JavaFileObjectAssertTest.java | 6 +- .../JavaFileObjectKindAssertTest.java | 3 +- .../assertions/JctAssertionsTest.java | 14 +-- .../assertions/JctCompilationAssertTest.java | 12 +-- .../assertions/LocationAssertTest.java | 7 +- .../ModuleContainerGroupAssertTest.java | 3 +- .../OutputContainerGroupAssertTest.java | 3 +- .../PackageContainerGroupAssertTest.java | 7 +- .../assertions/PathFileObjectAssertTest.java | 7 +- .../assertions/StackTraceAssertTest.java | 3 +- .../StackTraceElementAssertTest.java | 3 +- .../assertions/TraceDiagnosticAssertTest.java | 9 +- .../TraceDiagnosticListAssertTest.java | 9 +- .../compilers/AbstractJctCompilerTest.java | 29 ++--- .../compilers/DebuggingInfoTest.java | 4 +- .../compilers/JctCompilationTest.java | 3 +- .../unit => }/compilers/JctCompilerTest.java | 5 +- .../unit => }/compilers/JctCompilersTest.java | 5 +- .../impl/JavacJctCompilerImplTest.java | 6 +- .../impl/JavacJctFlagBuilderImplTest.java | 9 +- .../impl/JctCompilationFactoryImplTest.java | 19 ++-- .../impl/JctCompilationImplTest.java | 5 +- .../AbstractPackageContainerGroupTest.java | 3 +- .../ContainerGroupRepositoryImplTest.java | 10 +- ...ckageContainerGroupUrlClassLoaderTest.java | 9 +- .../unit => }/diagnostics/TeeWriterTest.java | 5 +- .../diagnostics/TraceDiagnosticTest.java | 17 ++- .../TracingDiagnosticListenerTest.java | 16 ++- .../ex/JctCompilerExceptionTest.java | 3 +- .../ex/JctIllegalInputExceptionTest.java | 3 +- .../ex/JctJunitConfigurerExceptionTest.java | 3 +- .../ex/JctNotFoundExceptionTest.java | 3 +- .../unit => }/ex/JctNotImplementedTest.java | 3 +- .../filemanagers/JctFileManagerTest.java | 3 +- .../filemanagers/JctFileManagersTest.java | 7 +- .../filemanagers/ModuleLocationTest.java | 8 +- ...ationProcessorClassPathConfigurerTest.java | 3 +- .../JctFileManagerConfigurerChainTest.java | 4 +- .../config/JctFileManagerConfigurerTest.java | 3 +- ...FileManagerJvmClassPathConfigurerTest.java | 5 +- ...nagerJvmClassPathModuleConfigurerTest.java | 5 +- ...ileManagerJvmModulePathConfigurerTest.java | 5 +- ...ManagerJvmSystemModulesConfigurerTest.java | 5 +- ...FileManagerLoggingProxyConfigurerTest.java | 3 +- ...anagerRequiredLocationsConfigurerTest.java | 3 +- ...JctFileManagerWorkspaceConfigurerTest.java | 7 +- .../impl/JctFileManagerFactoryImplTest.java | 6 +- .../impl/JctFileManagerImplTest.java | 35 +++--- .../impl/LoggingFileManagerProxyTest.java | 19 ++-- .../impl/PathFileObjectImplTest.java | 17 ++- .../ExtraArgumentMatchers.java | 10 +- .../{tests/helpers => fixtures}/Fixtures.java | 2 +- .../helpers => fixtures}/Slf4jLoggerFake.java | 2 +- .../UtilityClassTestTemplate.java | 2 +- .../integration/AbstractIntegrationTest.java | 9 +- ...BasicLegacyCompilationIntegrationTest.java | 4 +- ...BasicModuleCompilationIntegrationTest.java | 4 +- ...MultiModuleCompilationIntegrationTest.java | 4 +- ...mpilingSpecificClassesIntegrationTest.java | 4 +- ...MultiTieredCompilationIntegrationTest.java | 4 +- .../junit/JctExtensionIntegrationTest.java | 2 +- .../junit/AbstractCompilersProviderTest.java | 100 +----------------- .../junit/JavacCompilersProviderTest.java | 5 +- .../unit => }/junit/JctExtensionTest.java | 4 +- .../unit => }/junit/VersionStrategyTest.java | 5 +- .../repr/LocationRepresentationTest.java | 5 +- .../repr/StackTraceRepresentationTest.java | 3 +- ...TraceDiagnosticListRepresentationTest.java | 6 +- .../TraceDiagnosticRepresentationTest.java | 5 +- .../integration/compilation/package-info.java | 17 --- .../tests/integration/junit/package-info.java | 17 --- .../jct/tests/integration/package-info.java | 17 --- .../tests/unit/assertions/package-info.java | 17 --- .../unit/compilers/impl/package-info.java | 17 --- .../tests/unit/compilers/package-info.java | 17 --- .../unit/containers/impl/package-info.java | 17 --- .../tests/unit/containers/package-info.java | 17 --- .../tests/unit/diagnostics/package-info.java | 19 ---- .../jct/tests/unit/ex/package-info.java | 17 --- .../tests/unit/filemanagers/package-info.java | 17 --- .../jct/tests/unit/junit/package-info.java | 17 --- .../ascopes/jct/tests/unit/package-info.java | 17 --- .../jct/tests/unit/repr/package-info.java | 17 --- .../jct/tests/unit/utils/package-info.java | 17 --- .../unit/workspaces/impl/package-info.java | 16 --- .../tests/unit/workspaces/package-info.java | 17 --- .../{tests/unit => }/utils/FileUtilsTest.java | 8 +- .../unit => }/utils/IoExceptionUtilsTest.java | 5 +- .../unit => }/utils/IterableUtilsTest.java | 5 +- .../jct/{tests/unit => }/utils/LazyTest.java | 3 +- .../unit => }/utils/LoomPolyfillTest.java | 7 +- .../unit => }/utils/ModuleDiscovererTest.java | 8 +- .../utils/SpecialLocationsUtilsTest.java | 9 +- .../unit => }/utils/StringSlicerTest.java | 3 +- .../unit => }/utils/StringUtilsTest.java | 7 +- .../unit => }/utils/ToStringBuilderTest.java | 3 +- .../workspaces/ManagedDirectoryTest.java | 3 +- .../workspaces/PathStrategyTest.java | 6 +- .../unit => }/workspaces/WorkspaceTest.java | 8 +- .../unit => }/workspaces/WorkspacesTest.java | 5 +- .../workspaces/impl/JarFactoryImplTest.java | 5 +- .../MemoryFileSystemProviderImplTest.java | 22 +--- .../impl/WrappingDirectoryImplTest.java | 5 +- .../src/test/java/module-info.java | 44 -------- .../HelloWorld.java | 0 .../com/example/HelloWorld.java | 0 .../module-info.java | 0 .../greeter/com/example/greeter/Greeter.java | 0 .../greeter/module-info.java | 0 .../com/example/HelloWorld.java | 0 .../hello.world.crossmodule/module-info.java | 0 .../com/example/HelloWorld.java | 0 .../hello.world.singlemodule/module-info.java | 0 .../Fibonacci.java | 0 .../HelloWorld.java | 0 .../Sum.java | 0 .../first/Adder.java | 0 .../second/Main.java | 0 pom.xml | 10 +- 127 files changed, 245 insertions(+), 923 deletions(-) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/assertions/AbstractContainerGroupAssertTest.java (95%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/assertions/AbstractEnumAssertTest.java (99%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/assertions/AbstractJavaFileObjectAssertTest.java (95%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/assertions/ClassLoaderAssertTest.java (91%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/assertions/DiagnosticKindAssertTest.java (98%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/assertions/JavaFileObjectAssertTest.java (83%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/assertions/JavaFileObjectKindAssertTest.java (97%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/assertions/JctAssertionsTest.java (85%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/assertions/JctCompilationAssertTest.java (98%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/assertions/LocationAssertTest.java (97%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/assertions/ModuleContainerGroupAssertTest.java (98%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/assertions/OutputContainerGroupAssertTest.java (95%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/assertions/PackageContainerGroupAssertTest.java (98%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/assertions/PathFileObjectAssertTest.java (91%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/assertions/StackTraceAssertTest.java (95%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/assertions/StackTraceElementAssertTest.java (98%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/assertions/TraceDiagnosticAssertTest.java (97%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/assertions/TraceDiagnosticListAssertTest.java (99%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/compilers/AbstractJctCompilerTest.java (98%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/compilers/DebuggingInfoTest.java (93%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/compilers/JctCompilationTest.java (99%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/compilers/JctCompilerTest.java (98%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/compilers/JctCompilersTest.java (90%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/compilers/impl/JavacJctCompilerImplTest.java (96%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/compilers/impl/JavacJctFlagBuilderImplTest.java (98%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/compilers/impl/JctCompilationFactoryImplTest.java (97%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/compilers/impl/JctCompilationImplTest.java (98%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/containers/impl/AbstractPackageContainerGroupTest.java (96%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/containers/impl/ContainerGroupRepositoryImplTest.java (95%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/containers/impl/PackageContainerGroupUrlClassLoaderTest.java (96%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/diagnostics/TeeWriterTest.java (97%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/diagnostics/TraceDiagnosticTest.java (95%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/diagnostics/TracingDiagnosticListenerTest.java (96%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/ex/JctCompilerExceptionTest.java (95%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/ex/JctIllegalInputExceptionTest.java (94%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/ex/JctJunitConfigurerExceptionTest.java (94%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/ex/JctNotFoundExceptionTest.java (92%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/ex/JctNotImplementedTest.java (92%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/filemanagers/JctFileManagerTest.java (98%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/filemanagers/JctFileManagersTest.java (84%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/filemanagers/ModuleLocationTest.java (97%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/filemanagers/config/JctFileManagerAnnotationProcessorClassPathConfigurerTest.java (96%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/filemanagers/config/JctFileManagerConfigurerChainTest.java (96%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/filemanagers/config/JctFileManagerConfigurerTest.java (90%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/filemanagers/config/JctFileManagerJvmClassPathConfigurerTest.java (94%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/filemanagers/config/JctFileManagerJvmClassPathModuleConfigurerTest.java (95%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/filemanagers/config/JctFileManagerJvmModulePathConfigurerTest.java (94%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/filemanagers/config/JctFileManagerJvmSystemModulesConfigurerTest.java (94%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/filemanagers/config/JctFileManagerLoggingProxyConfigurerTest.java (96%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/filemanagers/config/JctFileManagerRequiredLocationsConfigurerTest.java (96%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/filemanagers/config/JctFileManagerWorkspaceConfigurerTest.java (90%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/filemanagers/impl/JctFileManagerFactoryImplTest.java (95%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/filemanagers/impl/JctFileManagerImplTest.java (97%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/filemanagers/impl/LoggingFileManagerProxyTest.java (96%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/filemanagers/impl/PathFileObjectImplTest.java (97%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/helpers => fixtures}/ExtraArgumentMatchers.java (94%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/helpers => fixtures}/Fixtures.java (99%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/helpers => fixtures}/Slf4jLoggerFake.java (99%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/helpers => fixtures}/UtilityClassTestTemplate.java (99%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests => }/integration/AbstractIntegrationTest.java (83%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests => }/integration/compilation/BasicLegacyCompilationIntegrationTest.java (95%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests => }/integration/compilation/BasicModuleCompilationIntegrationTest.java (95%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests => }/integration/compilation/BasicMultiModuleCompilationIntegrationTest.java (98%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests => }/integration/compilation/CompilingSpecificClassesIntegrationTest.java (92%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests => }/integration/compilation/MultiTieredCompilationIntegrationTest.java (96%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests => }/integration/junit/JctExtensionIntegrationTest.java (99%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/junit/AbstractCompilersProviderTest.java (80%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/junit/JavacCompilersProviderTest.java (96%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/junit/JctExtensionTest.java (99%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/junit/VersionStrategyTest.java (95%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/repr/LocationRepresentationTest.java (90%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/repr/StackTraceRepresentationTest.java (95%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/repr/TraceDiagnosticListRepresentationTest.java (92%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/repr/TraceDiagnosticRepresentationTest.java (97%) delete mode 100644 java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/compilation/package-info.java delete mode 100644 java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/junit/package-info.java delete mode 100644 java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/package-info.java delete mode 100644 java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/package-info.java delete mode 100644 java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/impl/package-info.java delete mode 100644 java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/package-info.java delete mode 100644 java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/containers/impl/package-info.java delete mode 100644 java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/containers/package-info.java delete mode 100644 java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/diagnostics/package-info.java delete mode 100644 java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/ex/package-info.java delete mode 100644 java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/package-info.java delete mode 100644 java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/junit/package-info.java delete mode 100644 java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/package-info.java delete mode 100644 java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/repr/package-info.java delete mode 100644 java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/package-info.java delete mode 100644 java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/impl/package-info.java delete mode 100644 java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/package-info.java rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/utils/FileUtilsTest.java (98%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/utils/IoExceptionUtilsTest.java (97%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/utils/IterableUtilsTest.java (97%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/utils/LazyTest.java (99%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/utils/LoomPolyfillTest.java (92%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/utils/ModuleDiscovererTest.java (97%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/utils/SpecialLocationsUtilsTest.java (96%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/utils/StringSlicerTest.java (97%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/utils/StringUtilsTest.java (98%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/utils/ToStringBuilderTest.java (99%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/workspaces/ManagedDirectoryTest.java (93%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/workspaces/PathStrategyTest.java (92%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/workspaces/WorkspaceTest.java (98%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/workspaces/WorkspacesTest.java (92%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/workspaces/impl/JarFactoryImplTest.java (97%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/workspaces/impl/MemoryFileSystemProviderImplTest.java (90%) rename java-compiler-testing/src/test/java/io/github/ascopes/jct/{tests/unit => }/workspaces/impl/WrappingDirectoryImplTest.java (97%) delete mode 100644 java-compiler-testing/src/test/java/module-info.java rename java-compiler-testing/src/test/resources/io/github/ascopes/jct/{tests/integration/compilation/BasicLegacyCompilationIntegrationTest => integration/compilation/BasicLegacyCompilationIntegrationTest_resources}/HelloWorld.java (100%) rename java-compiler-testing/src/test/resources/io/github/ascopes/jct/{tests/integration/compilation/BasicModuleCompilationIntegrationTest => integration/compilation/BasicModuleCompilationIntegrationTest_resources}/com/example/HelloWorld.java (100%) rename java-compiler-testing/src/test/resources/io/github/ascopes/jct/{tests/integration/compilation/BasicModuleCompilationIntegrationTest => integration/compilation/BasicModuleCompilationIntegrationTest_resources}/module-info.java (100%) rename java-compiler-testing/src/test/resources/io/github/ascopes/jct/{tests/integration/compilation/BasicMultiModuleCompilationIntegrationTest => integration/compilation/BasicMultiModuleCompilationIntegrationTest_resources}/greeter/com/example/greeter/Greeter.java (100%) rename java-compiler-testing/src/test/resources/io/github/ascopes/jct/{tests/integration/compilation/BasicMultiModuleCompilationIntegrationTest => integration/compilation/BasicMultiModuleCompilationIntegrationTest_resources}/greeter/module-info.java (100%) rename java-compiler-testing/src/test/resources/io/github/ascopes/jct/{tests/integration/compilation/BasicMultiModuleCompilationIntegrationTest => integration/compilation/BasicMultiModuleCompilationIntegrationTest_resources}/hello.world.crossmodule/com/example/HelloWorld.java (100%) rename java-compiler-testing/src/test/resources/io/github/ascopes/jct/{tests/integration/compilation/BasicMultiModuleCompilationIntegrationTest => integration/compilation/BasicMultiModuleCompilationIntegrationTest_resources}/hello.world.crossmodule/module-info.java (100%) rename java-compiler-testing/src/test/resources/io/github/ascopes/jct/{tests/integration/compilation/BasicMultiModuleCompilationIntegrationTest => integration/compilation/BasicMultiModuleCompilationIntegrationTest_resources}/hello.world.singlemodule/com/example/HelloWorld.java (100%) rename java-compiler-testing/src/test/resources/io/github/ascopes/jct/{tests/integration/compilation/BasicMultiModuleCompilationIntegrationTest => integration/compilation/BasicMultiModuleCompilationIntegrationTest_resources}/hello.world.singlemodule/module-info.java (100%) rename java-compiler-testing/src/test/resources/io/github/ascopes/jct/{tests/integration/compilation/CompilingSpecificClassesIntegrationTest => integration/compilation/CompilingSpecificClassesIntegrationTest_resources}/Fibonacci.java (100%) rename java-compiler-testing/src/test/resources/io/github/ascopes/jct/{tests/integration/compilation/CompilingSpecificClassesIntegrationTest => integration/compilation/CompilingSpecificClassesIntegrationTest_resources}/HelloWorld.java (100%) rename java-compiler-testing/src/test/resources/io/github/ascopes/jct/{tests/integration/compilation/CompilingSpecificClassesIntegrationTest => integration/compilation/CompilingSpecificClassesIntegrationTest_resources}/Sum.java (100%) rename java-compiler-testing/src/test/resources/io/github/ascopes/jct/{tests/integration/compilation/MultiTieredCompilationIntegrationTest => integration/compilation/MultiTieredCompilationIntegrationTest_resources}/first/Adder.java (100%) rename java-compiler-testing/src/test/resources/io/github/ascopes/jct/{tests/integration/compilation/MultiTieredCompilationIntegrationTest => integration/compilation/MultiTieredCompilationIntegrationTest_resources}/second/Main.java (100%) diff --git a/java-compiler-testing/src/it/dogfood/src/test/java/io/github/ascopes/jct/acceptancetests/dogfood/JctDogfoodTest.java b/java-compiler-testing/src/it/dogfood/src/test/java/io/github/ascopes/jct/acceptancetests/dogfood/JctDogfoodTest.java index a788a3121..ce02ca7be 100644 --- a/java-compiler-testing/src/it/dogfood/src/test/java/io/github/ascopes/jct/acceptancetests/dogfood/JctDogfoodTest.java +++ b/java-compiler-testing/src/it/dogfood/src/test/java/io/github/ascopes/jct/acceptancetests/dogfood/JctDogfoodTest.java @@ -36,7 +36,6 @@ class JctDogfoodTest { static final String MAIN_MODULE = "io.github.ascopes.jct"; - static final String TEST_MODULE = "io.github.ascopes.jct.testing"; static final Path PROJECT_ROOT = projectBase() .resolve("java-compiler-testing") @@ -48,19 +47,10 @@ class JctDogfoodTest { .resolve("main") .resolve("java"); - static final Path SRC_TEST_JAVA = PROJECT_ROOT - .resolve("src") - .resolve("test") - .resolve("java"); - static final Path TARGET_CLASSES = PROJECT_ROOT .resolve("target") .resolve("classes"); - static final Path TARGET_TEST_CLASSES = PROJECT_ROOT - .resolve("target") - .resolve("test-classes"); - @DisplayName("JCT can compile itself as a legacy module source") @JavacCompilerTest(minVersion = 11, configurers = JctCompilationConfigurer.class) void jctCanCompileItselfAsLegacyModule(JctCompiler compiler) throws IOException { @@ -83,63 +73,6 @@ void jctCanCompileItselfAsLegacyModule(JctCompiler compiler) throws IOException } } - @DisplayName("JCT can compile its unit tests as a legacy module source") - @JavacCompilerTest(minVersion = 11, configurers = JctCompilationConfigurer.class) - void jctCanCompileUnitTestsAsLegacyModule(JctCompiler compiler) throws IOException { - // Given - try (var workspace = Workspaces.newWorkspace()) { - workspace - .createSourcePathPackage() - .copyContentsFrom(SRC_TEST_JAVA); - - // When - var compilation = compiler.compile(workspace); - - // Then - assertThat(compilation) - .isSuccessful(); - - assertThat(compilation) - .classPathPackages() - .allFilesExist(getClassesFrom(TARGET_TEST_CLASSES)); - } - } - - @DisplayName("JCT can compile itself and its unit tests as a multiple-module source") - @JavacCompilerTest(minVersion = 11, configurers = JctCompilationConfigurer.class) - void jctCanCompileItselfAndUnitTestsAsMultiModule(JctCompiler compiler) throws IOException { - // Given - try (var workspace = Workspaces.newWorkspace()) { - workspace - .createSourcePathModule(MAIN_MODULE) - .copyContentsFrom(SRC_MAIN_JAVA); - workspace - .createSourcePathModule(TEST_MODULE) - .copyContentsFrom(SRC_TEST_JAVA); - - // When - var compilation = compiler.compile(workspace); - - // Then - var expectedMainFiles = getClassesFrom(TARGET_CLASSES); - var expectedTestFiles = getClassesFrom(TARGET_TEST_CLASSES); - - assertThat(compilation) - .isSuccessful(); - - assertThat(compilation) - .classOutputModules() - .satisfies( - modules -> assertThat(modules.getModule(MAIN_MODULE)) - .withFailMessage("Missing classes from main source root") - .allFilesExist(expectedMainFiles), - modules -> assertThat(modules.getModule(TEST_MODULE)) - .withFailMessage("Missing classes from test source root") - .allFilesExist(expectedTestFiles) - ); - } - } - private static Set getClassesFrom(Path location) throws IOException { try (var walker = Files.walk(location)) { return walker diff --git a/java-compiler-testing/src/main/java/io/github/ascopes/jct/junit/AbstractCompilersProvider.java b/java-compiler-testing/src/main/java/io/github/ascopes/jct/junit/AbstractCompilersProvider.java index 40e6b645c..e3a21d5ba 100644 --- a/java-compiler-testing/src/main/java/io/github/ascopes/jct/junit/AbstractCompilersProvider.java +++ b/java-compiler-testing/src/main/java/io/github/ascopes/jct/junit/AbstractCompilersProvider.java @@ -275,29 +275,7 @@ private JctCompilerConfigurer initializeConfigurer( ); } - try { - // Force-enable reflective access. If the user is using a SecurityManager for any reason then - // tough luck. JVM go bang. - // If the module is not open to JCT, then we will get an InaccessibleObjectException that - // we should wrap and rethrow. - constructor.setAccessible(true); - - } catch (InaccessibleObjectException ex) { - - throw new JctJunitConfigurerException( - "The constructor in " + configurerClass.getSimpleName() + " cannot be called from JCT." - + "\n" - + "This is likely because JPMS modules are in use and you have not granted " - + "permission for JCT to access your classes reflectively." - + "\n" - + "To fix this, add the following line into your module-info.java within the " - + "'module' block:" - + "\n\n" - + " opens " + constructor.getDeclaringClass().getPackageName() + " to " - + getClass().getModule().getName() + ";", - ex - ); - } + constructor.setAccessible(true); try { return constructor.newInstance(); diff --git a/java-compiler-testing/src/main/java/module-info.java b/java-compiler-testing/src/main/java/module-info.java index 672ecf2cb..91527f8c2 100644 --- a/java-compiler-testing/src/main/java/module-info.java +++ b/java-compiler-testing/src/main/java/module-info.java @@ -150,34 +150,4 @@ /////////////////////////////////// provides URLStreamHandlerProvider with MemoryFileSystemUrlHandlerProvider; - - ////////////////////////////////////////////////////// - /// EXPOSURE OF INTERNALS TO THE TESTING NAMESPACE /// - ////////////////////////////////////////////////////// - - exports io.github.ascopes.jct.compilers.impl to io.github.ascopes.jct.testing; - exports io.github.ascopes.jct.containers.impl to io.github.ascopes.jct.testing; - exports io.github.ascopes.jct.filemanagers.impl to io.github.ascopes.jct.testing; - exports io.github.ascopes.jct.utils to io.github.ascopes.jct.testing; - exports io.github.ascopes.jct.workspaces.impl to io.github.ascopes.jct.testing; - - ////////////////////////////////////////////////////////////////////////// - /// EXPOSURE OF ALL COMPONENTS TO THE TESTING NAMESPACE FOR REFLECTION /// - ////////////////////////////////////////////////////////////////////////// - - opens io.github.ascopes.jct.assertions to io.github.ascopes.jct.testing; - opens io.github.ascopes.jct.compilers to io.github.ascopes.jct.testing; - opens io.github.ascopes.jct.compilers.impl to io.github.ascopes.jct.testing; - opens io.github.ascopes.jct.containers to io.github.ascopes.jct.testing; - opens io.github.ascopes.jct.containers.impl to io.github.ascopes.jct.testing; - opens io.github.ascopes.jct.diagnostics to io.github.ascopes.jct.testing; - opens io.github.ascopes.jct.ex to io.github.ascopes.jct.testing; - opens io.github.ascopes.jct.filemanagers to io.github.ascopes.jct.testing; - opens io.github.ascopes.jct.filemanagers.config to io.github.ascopes.jct.testing; - opens io.github.ascopes.jct.filemanagers.impl to io.github.ascopes.jct.testing; - opens io.github.ascopes.jct.junit to io.github.ascopes.jct.testing; - opens io.github.ascopes.jct.repr to io.github.ascopes.jct.testing; - opens io.github.ascopes.jct.utils to io.github.ascopes.jct.testing; - opens io.github.ascopes.jct.workspaces to io.github.ascopes.jct.testing; - opens io.github.ascopes.jct.workspaces.impl to io.github.ascopes.jct.testing; } diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/AbstractContainerGroupAssertTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/AbstractContainerGroupAssertTest.java similarity index 95% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/AbstractContainerGroupAssertTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/AbstractContainerGroupAssertTest.java index 1f424a5fe..edd5849b5 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/AbstractContainerGroupAssertTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/AbstractContainerGroupAssertTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.assertions; +package io.github.ascopes.jct.assertions; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someLocation; +import static io.github.ascopes.jct.fixtures.Fixtures.someLocation; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.any; @@ -24,8 +24,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import io.github.ascopes.jct.assertions.AbstractContainerGroupAssert; -import io.github.ascopes.jct.assertions.LocationAssert; import io.github.ascopes.jct.containers.ContainerGroup; import java.util.List; import java.util.ServiceLoader; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/AbstractEnumAssertTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/AbstractEnumAssertTest.java similarity index 99% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/AbstractEnumAssertTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/AbstractEnumAssertTest.java index c053e955c..9bfd93e0b 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/AbstractEnumAssertTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/AbstractEnumAssertTest.java @@ -13,12 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.assertions; +package io.github.ascopes.jct.assertions; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import io.github.ascopes.jct.assertions.AbstractEnumAssert; import java.util.Arrays; import java.util.List; import org.jspecify.annotations.Nullable; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/AbstractJavaFileObjectAssertTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/AbstractJavaFileObjectAssertTest.java similarity index 95% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/AbstractJavaFileObjectAssertTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/AbstractJavaFileObjectAssertTest.java index 76b34776e..54fd78f41 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/AbstractJavaFileObjectAssertTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/AbstractJavaFileObjectAssertTest.java @@ -13,18 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.assertions; +package io.github.ascopes.jct.assertions; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someBinaryData; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someCharset; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someJavaFileObject; -import static io.github.ascopes.jct.tests.helpers.Fixtures.somePath; +import static io.github.ascopes.jct.fixtures.Fixtures.someBinaryData; +import static io.github.ascopes.jct.fixtures.Fixtures.someCharset; +import static io.github.ascopes.jct.fixtures.Fixtures.someJavaFileObject; +import static io.github.ascopes.jct.fixtures.Fixtures.somePath; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.when; -import io.github.ascopes.jct.assertions.AbstractJavaFileObjectAssert; -import io.github.ascopes.jct.assertions.JavaFileObjectKindAssert; import java.io.ByteArrayInputStream; import java.io.IOException; import java.nio.charset.Charset; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/ClassLoaderAssertTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/ClassLoaderAssertTest.java similarity index 91% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/ClassLoaderAssertTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/ClassLoaderAssertTest.java index 377ac480b..70a3ea657 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/ClassLoaderAssertTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/ClassLoaderAssertTest.java @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.assertions; +package io.github.ascopes.jct.assertions; import static org.mockito.Mockito.mock; -import io.github.ascopes.jct.assertions.ClassLoaderAssert; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/DiagnosticKindAssertTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/DiagnosticKindAssertTest.java similarity index 98% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/DiagnosticKindAssertTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/DiagnosticKindAssertTest.java index b824d56f0..370c8b422 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/DiagnosticKindAssertTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/DiagnosticKindAssertTest.java @@ -13,12 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.assertions; +package io.github.ascopes.jct.assertions; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import io.github.ascopes.jct.assertions.DiagnosticKindAssert; import javax.tools.Diagnostic.Kind; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/JavaFileObjectAssertTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/JavaFileObjectAssertTest.java similarity index 83% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/JavaFileObjectAssertTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/JavaFileObjectAssertTest.java index 8b8c4cfab..22688b661 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/JavaFileObjectAssertTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/JavaFileObjectAssertTest.java @@ -13,13 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.assertions; +package io.github.ascopes.jct.assertions; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someJavaFileObject; +import static io.github.ascopes.jct.fixtures.Fixtures.someJavaFileObject; import static org.assertj.core.api.Assertions.assertThat; -import io.github.ascopes.jct.assertions.AbstractJavaFileObjectAssert; -import io.github.ascopes.jct.assertions.JavaFileObjectAssert; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/JavaFileObjectKindAssertTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/JavaFileObjectKindAssertTest.java similarity index 97% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/JavaFileObjectKindAssertTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/JavaFileObjectKindAssertTest.java index 1a67758e7..a254cf804 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/JavaFileObjectKindAssertTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/JavaFileObjectKindAssertTest.java @@ -13,12 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.assertions; +package io.github.ascopes.jct.assertions; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import io.github.ascopes.jct.assertions.JavaFileObjectKindAssert; import javax.tools.JavaFileObject; import javax.tools.JavaFileObject.Kind; import org.assertj.core.api.AbstractStringAssert; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/JctAssertionsTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/JctAssertionsTest.java similarity index 85% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/JctAssertionsTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/JctAssertionsTest.java index 35c7c8175..c817b5a6f 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/JctAssertionsTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/JctAssertionsTest.java @@ -13,24 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.assertions; +package io.github.ascopes.jct.assertions; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.params.provider.Arguments.arguments; import static org.mockito.Mockito.mock; -import io.github.ascopes.jct.assertions.DiagnosticKindAssert; -import io.github.ascopes.jct.assertions.JavaFileObjectAssert; -import io.github.ascopes.jct.assertions.JavaFileObjectKindAssert; -import io.github.ascopes.jct.assertions.JctAssertions; -import io.github.ascopes.jct.assertions.JctCompilationAssert; -import io.github.ascopes.jct.assertions.LocationAssert; -import io.github.ascopes.jct.assertions.ModuleContainerGroupAssert; -import io.github.ascopes.jct.assertions.OutputContainerGroupAssert; -import io.github.ascopes.jct.assertions.PackageContainerGroupAssert; -import io.github.ascopes.jct.assertions.PathFileObjectAssert; -import io.github.ascopes.jct.assertions.TraceDiagnosticAssert; -import io.github.ascopes.jct.assertions.TraceDiagnosticListAssert; import io.github.ascopes.jct.compilers.JctCompilation; import io.github.ascopes.jct.containers.ModuleContainerGroup; import io.github.ascopes.jct.containers.OutputContainerGroup; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/JctCompilationAssertTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/JctCompilationAssertTest.java similarity index 98% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/JctCompilationAssertTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/JctCompilationAssertTest.java index a9e0ae2bb..84f3ef3e6 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/JctCompilationAssertTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/JctCompilationAssertTest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.assertions; +package io.github.ascopes.jct.assertions; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someFlags; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someLocation; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someTraceDiagnostic; +import static io.github.ascopes.jct.fixtures.Fixtures.someFlags; +import static io.github.ascopes.jct.fixtures.Fixtures.someLocation; +import static io.github.ascopes.jct.fixtures.Fixtures.someTraceDiagnostic; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -27,10 +27,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import io.github.ascopes.jct.assertions.JctCompilationAssert; -import io.github.ascopes.jct.assertions.ModuleContainerGroupAssert; -import io.github.ascopes.jct.assertions.OutputContainerGroupAssert; -import io.github.ascopes.jct.assertions.PackageContainerGroupAssert; import io.github.ascopes.jct.compilers.JctCompilation; import io.github.ascopes.jct.containers.ModuleContainerGroup; import io.github.ascopes.jct.containers.OutputContainerGroup; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/LocationAssertTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/LocationAssertTest.java similarity index 97% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/LocationAssertTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/LocationAssertTest.java index 66a2b0868..26feb475d 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/LocationAssertTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/LocationAssertTest.java @@ -13,15 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.assertions; +package io.github.ascopes.jct.assertions; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someBoolean; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someText; +import static io.github.ascopes.jct.fixtures.Fixtures.someBoolean; +import static io.github.ascopes.jct.fixtures.Fixtures.someText; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import io.github.ascopes.jct.assertions.LocationAssert; import javax.tools.JavaFileManager; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/ModuleContainerGroupAssertTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/ModuleContainerGroupAssertTest.java similarity index 98% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/ModuleContainerGroupAssertTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/ModuleContainerGroupAssertTest.java index cf9dad41c..d73afc8a7 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/ModuleContainerGroupAssertTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/ModuleContainerGroupAssertTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.assertions; +package io.github.ascopes.jct.assertions; import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -23,7 +23,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import io.github.ascopes.jct.assertions.ModuleContainerGroupAssert; import io.github.ascopes.jct.containers.ModuleContainerGroup; import io.github.ascopes.jct.containers.PackageContainerGroup; import io.github.ascopes.jct.filemanagers.ModuleLocation; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/OutputContainerGroupAssertTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/OutputContainerGroupAssertTest.java similarity index 95% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/OutputContainerGroupAssertTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/OutputContainerGroupAssertTest.java index 5461afa4e..541c573fe 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/OutputContainerGroupAssertTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/OutputContainerGroupAssertTest.java @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.assertions; +package io.github.ascopes.jct.assertions; import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.mock; -import io.github.ascopes.jct.assertions.OutputContainerGroupAssert; import io.github.ascopes.jct.containers.OutputContainerGroup; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/PackageContainerGroupAssertTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/PackageContainerGroupAssertTest.java similarity index 98% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/PackageContainerGroupAssertTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/PackageContainerGroupAssertTest.java index ee569d63b..3383621ed 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/PackageContainerGroupAssertTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/PackageContainerGroupAssertTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.assertions; +package io.github.ascopes.jct.assertions; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someLocation; -import static io.github.ascopes.jct.tests.helpers.Fixtures.somePathRoot; +import static io.github.ascopes.jct.fixtures.Fixtures.someLocation; +import static io.github.ascopes.jct.fixtures.Fixtures.somePathRoot; import static io.github.ascopes.jct.utils.IoExceptionUtils.uncheckedIo; import static io.github.ascopes.jct.utils.StringUtils.quoted; import static org.assertj.core.api.Assertions.assertThat; @@ -31,7 +31,6 @@ import static org.mockito.Mockito.when; import static org.mockito.Mockito.withSettings; -import io.github.ascopes.jct.assertions.PackageContainerGroupAssert; import io.github.ascopes.jct.containers.Container; import io.github.ascopes.jct.containers.PackageContainerGroup; import io.github.ascopes.jct.repr.LocationRepresentation; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/PathFileObjectAssertTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/PathFileObjectAssertTest.java similarity index 91% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/PathFileObjectAssertTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/PathFileObjectAssertTest.java index ad8e0edec..d06c8c42c 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/PathFileObjectAssertTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/PathFileObjectAssertTest.java @@ -13,16 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.assertions; +package io.github.ascopes.jct.assertions; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someAbsolutePath; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someRelativePath; +import static io.github.ascopes.jct.fixtures.Fixtures.someAbsolutePath; +import static io.github.ascopes.jct.fixtures.Fixtures.someRelativePath; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import io.github.ascopes.jct.assertions.PathFileObjectAssert; import io.github.ascopes.jct.filemanagers.PathFileObject; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/StackTraceAssertTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/StackTraceAssertTest.java similarity index 95% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/StackTraceAssertTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/StackTraceAssertTest.java index b39c9a38c..1539ca829 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/StackTraceAssertTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/StackTraceAssertTest.java @@ -13,9 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.assertions; +package io.github.ascopes.jct.assertions; -import io.github.ascopes.jct.assertions.StackTraceAssert; import java.util.Arrays; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/StackTraceElementAssertTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/StackTraceElementAssertTest.java similarity index 98% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/StackTraceElementAssertTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/StackTraceElementAssertTest.java index 6b8f5f9f9..8fdd26a1d 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/StackTraceElementAssertTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/StackTraceElementAssertTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.assertions; +package io.github.ascopes.jct.assertions; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; @@ -21,7 +21,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import io.github.ascopes.jct.assertions.StackTraceElementAssert; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/TraceDiagnosticAssertTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/TraceDiagnosticAssertTest.java similarity index 97% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/TraceDiagnosticAssertTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/TraceDiagnosticAssertTest.java index 703678bf3..ffbeae2cf 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/TraceDiagnosticAssertTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/TraceDiagnosticAssertTest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.assertions; +package io.github.ascopes.jct.assertions; -import static io.github.ascopes.jct.tests.helpers.Fixtures.oneOf; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someStackTraceList; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someText; +import static io.github.ascopes.jct.fixtures.Fixtures.oneOf; +import static io.github.ascopes.jct.fixtures.Fixtures.someStackTraceList; +import static io.github.ascopes.jct.fixtures.Fixtures.someText; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -27,7 +27,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import io.github.ascopes.jct.assertions.TraceDiagnosticAssert; import io.github.ascopes.jct.diagnostics.TraceDiagnostic; import java.time.Instant; import java.util.Locale; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/TraceDiagnosticListAssertTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/TraceDiagnosticListAssertTest.java similarity index 99% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/TraceDiagnosticListAssertTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/TraceDiagnosticListAssertTest.java index e9ca15c6b..cc3dd2d05 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/TraceDiagnosticListAssertTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/assertions/TraceDiagnosticListAssertTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.assertions; +package io.github.ascopes.jct.assertions; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someText; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someTraceDiagnostic; +import static io.github.ascopes.jct.fixtures.Fixtures.someText; +import static io.github.ascopes.jct.fixtures.Fixtures.someTraceDiagnostic; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; @@ -27,10 +27,9 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import io.github.ascopes.jct.assertions.TraceDiagnosticListAssert; import io.github.ascopes.jct.diagnostics.TraceDiagnostic; +import io.github.ascopes.jct.fixtures.ExtraArgumentMatchers; import io.github.ascopes.jct.repr.TraceDiagnosticListRepresentation; -import io.github.ascopes.jct.tests.helpers.ExtraArgumentMatchers; import java.util.Arrays; import java.util.List; import java.util.Objects; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/AbstractJctCompilerTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/AbstractJctCompilerTest.java similarity index 98% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/AbstractJctCompilerTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/AbstractJctCompilerTest.java index 61e0a32ac..ddea07cd4 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/AbstractJctCompilerTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/AbstractJctCompilerTest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.compilers; - -import static io.github.ascopes.jct.tests.helpers.Fixtures.someBoolean; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someFlags; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someInt; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someOf; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someRelease; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someText; +package io.github.ascopes.jct.compilers; + +import static io.github.ascopes.jct.fixtures.Fixtures.someBoolean; +import static io.github.ascopes.jct.fixtures.Fixtures.someFlags; +import static io.github.ascopes.jct.fixtures.Fixtures.someInt; +import static io.github.ascopes.jct.fixtures.Fixtures.someOf; +import static io.github.ascopes.jct.fixtures.Fixtures.someRelease; +import static io.github.ascopes.jct.fixtures.Fixtures.someText; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.fail; @@ -36,15 +36,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import io.github.ascopes.jct.compilers.AbstractJctCompiler; -import io.github.ascopes.jct.compilers.CompilationMode; -import io.github.ascopes.jct.compilers.DebuggingInfo; -import io.github.ascopes.jct.compilers.JctCompilation; -import io.github.ascopes.jct.compilers.JctCompiler; -import io.github.ascopes.jct.compilers.JctCompilerConfigurer; -import io.github.ascopes.jct.compilers.JctFlagBuilder; -import io.github.ascopes.jct.compilers.JctFlagBuilderFactory; -import io.github.ascopes.jct.compilers.Jsr199CompilerFactory; import io.github.ascopes.jct.compilers.impl.JctCompilationFactoryImpl; import io.github.ascopes.jct.ex.JctCompilerException; import io.github.ascopes.jct.filemanagers.AnnotationProcessorDiscovery; @@ -1378,7 +1369,7 @@ void getLocaleReturnsExpectedValue(Locale expected) { class LocaleTests { @DisplayName(".locale(...) sets the expected values") - @MethodSource("io.github.ascopes.jct.tests.unit.compilers.AbstractJctCompilerTest#locales") + @MethodSource("io.github.ascopes.jct.compilers.AbstractJctCompilerTest#locales") @ParameterizedTest(name = "for locale = {0}") void localeSetsExpectedValue(Locale expected) { // When @@ -1424,7 +1415,7 @@ void getLogCharsetReturnsExpectedValue(Charset expected) { class LogCharsetTests { @DisplayName(".logCharset(...) sets the expected values") - @MethodSource("io.github.ascopes.jct.tests.unit.compilers.AbstractJctCompilerTest#charsets") + @MethodSource("io.github.ascopes.jct.compilers.AbstractJctCompilerTest#charsets") @ParameterizedTest(name = "for logCharset = {0}") void logCharsetSetsExpectedValue(Charset expected) { // When diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/DebuggingInfoTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/DebuggingInfoTest.java similarity index 93% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/DebuggingInfoTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/DebuggingInfoTest.java index 8409a4c01..0d97770c5 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/DebuggingInfoTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/DebuggingInfoTest.java @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.compilers; +package io.github.ascopes.jct.compilers; import static org.assertj.core.api.Assertions.assertThat; -import io.github.ascopes.jct.compilers.DebuggingInfo; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -28,6 +27,7 @@ * @author Ashley Scopes */ class DebuggingInfoTest { + @DisplayName(".none() returns an empty set") @Test void noneReturnsEmptySet() { diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/JctCompilationTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/JctCompilationTest.java similarity index 99% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/JctCompilationTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/JctCompilationTest.java index 8286c0220..8d587fada 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/JctCompilationTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/JctCompilationTest.java @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.compilers; +package io.github.ascopes.jct.compilers; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import io.github.ascopes.jct.compilers.JctCompilation; import io.github.ascopes.jct.containers.ModuleContainerGroup; import io.github.ascopes.jct.containers.OutputContainerGroup; import io.github.ascopes.jct.containers.PackageContainerGroup; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/JctCompilerTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/JctCompilerTest.java similarity index 98% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/JctCompilerTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/JctCompilerTest.java index 6264aa675..df86a4749 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/JctCompilerTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/JctCompilerTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.compilers; +package io.github.ascopes.jct.compilers; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someText; +import static io.github.ascopes.jct.fixtures.Fixtures.someText; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.any; @@ -25,7 +25,6 @@ import static org.mockito.BDDMockito.then; import static org.mockito.Mockito.mock; -import io.github.ascopes.jct.compilers.JctCompiler; import io.github.ascopes.jct.workspaces.Workspace; import java.util.Arrays; import java.util.List; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/JctCompilersTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/JctCompilersTest.java similarity index 90% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/JctCompilersTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/JctCompilersTest.java index 44f1ec702..213232c47 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/JctCompilersTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/JctCompilersTest.java @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.compilers; +package io.github.ascopes.jct.compilers; import static org.assertj.core.api.Assertions.assertThat; -import io.github.ascopes.jct.compilers.JctCompilers; import io.github.ascopes.jct.compilers.impl.JavacJctCompilerImpl; -import io.github.ascopes.jct.tests.helpers.UtilityClassTestTemplate; +import io.github.ascopes.jct.fixtures.UtilityClassTestTemplate; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/impl/JavacJctCompilerImplTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/impl/JavacJctCompilerImplTest.java similarity index 96% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/impl/JavacJctCompilerImplTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/impl/JavacJctCompilerImplTest.java index 4fc0f449b..c05e60140 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/impl/JavacJctCompilerImplTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/impl/JavacJctCompilerImplTest.java @@ -13,17 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.compilers.impl; +package io.github.ascopes.jct.compilers.impl; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someInt; +import static io.github.ascopes.jct.fixtures.Fixtures.someInt; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mockConstruction; import static org.mockito.Mockito.mockStatic; import static org.mockito.Mockito.when; -import io.github.ascopes.jct.compilers.impl.JavacJctCompilerImpl; -import io.github.ascopes.jct.compilers.impl.JavacJctFlagBuilderImpl; import javax.lang.model.SourceVersion; import javax.tools.JavaCompiler; import javax.tools.ToolProvider; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/impl/JavacJctFlagBuilderImplTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/impl/JavacJctFlagBuilderImplTest.java similarity index 98% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/impl/JavacJctFlagBuilderImplTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/impl/JavacJctFlagBuilderImplTest.java index 9c2511a4e..e8af46622 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/impl/JavacJctFlagBuilderImplTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/impl/JavacJctFlagBuilderImplTest.java @@ -13,18 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.compilers.impl; +package io.github.ascopes.jct.compilers.impl; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someBoolean; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someRelease; +import static io.github.ascopes.jct.fixtures.Fixtures.someBoolean; +import static io.github.ascopes.jct.fixtures.Fixtures.someRelease; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assumptions.assumeThat; import io.github.ascopes.jct.compilers.CompilationMode; import io.github.ascopes.jct.compilers.DebuggingInfo; -import io.github.ascopes.jct.compilers.impl.JavacJctFlagBuilderImpl; -import io.github.ascopes.jct.tests.helpers.Fixtures; +import io.github.ascopes.jct.fixtures.Fixtures; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/impl/JctCompilationFactoryImplTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/impl/JctCompilationFactoryImplTest.java similarity index 97% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/impl/JctCompilationFactoryImplTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/impl/JctCompilationFactoryImplTest.java index 6c19a5973..25a3fb248 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/impl/JctCompilationFactoryImplTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/impl/JctCompilationFactoryImplTest.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.compilers.impl; - -import static io.github.ascopes.jct.tests.helpers.ExtraArgumentMatchers.containsExactlyElements; -import static io.github.ascopes.jct.tests.helpers.Fixtures.oneOf; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someBinaryName; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someFlags; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someLinesOfText; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someText; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someTraceDiagnostic; +package io.github.ascopes.jct.compilers.impl; + +import static io.github.ascopes.jct.fixtures.ExtraArgumentMatchers.containsExactlyElements; +import static io.github.ascopes.jct.fixtures.Fixtures.oneOf; +import static io.github.ascopes.jct.fixtures.Fixtures.someBinaryName; +import static io.github.ascopes.jct.fixtures.Fixtures.someFlags; +import static io.github.ascopes.jct.fixtures.Fixtures.someLinesOfText; +import static io.github.ascopes.jct.fixtures.Fixtures.someText; +import static io.github.ascopes.jct.fixtures.Fixtures.someTraceDiagnostic; import static io.github.ascopes.jct.utils.IterableUtils.flatten; import static java.util.stream.Collectors.toList; import static org.assertj.core.api.Assertions.assertThat; @@ -44,7 +44,6 @@ import io.github.ascopes.jct.compilers.JctCompilation; import io.github.ascopes.jct.compilers.JctCompiler; -import io.github.ascopes.jct.compilers.impl.JctCompilationFactoryImpl; import io.github.ascopes.jct.diagnostics.TeeWriter; import io.github.ascopes.jct.diagnostics.TracingDiagnosticListener; import io.github.ascopes.jct.ex.JctCompilerException; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/impl/JctCompilationImplTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/impl/JctCompilationImplTest.java similarity index 98% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/impl/JctCompilationImplTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/impl/JctCompilationImplTest.java index 5642d1432..b52c6b906 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/impl/JctCompilationImplTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/impl/JctCompilationImplTest.java @@ -13,17 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.compilers.impl; +package io.github.ascopes.jct.compilers.impl; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.InstanceOfAssertFactories.iterable; import static org.mockito.Mockito.mock; -import io.github.ascopes.jct.compilers.impl.JctCompilationImpl; import io.github.ascopes.jct.diagnostics.TraceDiagnostic; import io.github.ascopes.jct.filemanagers.JctFileManager; -import io.github.ascopes.jct.tests.helpers.Fixtures; +import io.github.ascopes.jct.fixtures.Fixtures; import io.github.ascopes.jct.utils.StringUtils; import java.util.Arrays; import java.util.LinkedHashSet; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/containers/impl/AbstractPackageContainerGroupTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/containers/impl/AbstractPackageContainerGroupTest.java similarity index 96% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/containers/impl/AbstractPackageContainerGroupTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/containers/impl/AbstractPackageContainerGroupTest.java index 0d72cdc7d..d5cbf7bcf 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/containers/impl/AbstractPackageContainerGroupTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/containers/impl/AbstractPackageContainerGroupTest.java @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.containers.impl; +package io.github.ascopes.jct.containers.impl; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import io.github.ascopes.jct.containers.Container; -import io.github.ascopes.jct.containers.impl.AbstractPackageContainerGroup; import java.io.IOException; import java.nio.file.Path; import java.util.List; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/containers/impl/ContainerGroupRepositoryImplTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/containers/impl/ContainerGroupRepositoryImplTest.java similarity index 95% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/containers/impl/ContainerGroupRepositoryImplTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/containers/impl/ContainerGroupRepositoryImplTest.java index ac5de9bd2..b06fc8fec 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/containers/impl/ContainerGroupRepositoryImplTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/containers/impl/ContainerGroupRepositoryImplTest.java @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.containers.impl; +package io.github.ascopes.jct.containers.impl; -import static io.github.ascopes.jct.tests.helpers.Fixtures.somePathRoot; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someRelease; -import static java.util.stream.Collectors.toMap; +import static io.github.ascopes.jct.fixtures.Fixtures.somePathRoot; +import static io.github.ascopes.jct.fixtures.Fixtures.someRelease; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.InstanceOfAssertFactories.list; import static org.mockito.ArgumentMatchers.any; @@ -26,14 +25,11 @@ import io.github.ascopes.jct.containers.Container; import io.github.ascopes.jct.containers.PackageContainerGroup; -import io.github.ascopes.jct.containers.impl.ContainerGroupRepositoryImpl; import io.github.ascopes.jct.filemanagers.ModuleLocation; import io.github.ascopes.jct.utils.ModuleDiscoverer; import io.github.ascopes.jct.utils.ModuleDiscoverer.ModuleCandidate; import io.github.ascopes.jct.workspaces.PathRoot; -import java.util.Map; import java.util.Set; -import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; import javax.tools.StandardLocation; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/containers/impl/PackageContainerGroupUrlClassLoaderTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/containers/impl/PackageContainerGroupUrlClassLoaderTest.java similarity index 96% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/containers/impl/PackageContainerGroupUrlClassLoaderTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/containers/impl/PackageContainerGroupUrlClassLoaderTest.java index 6204ca6c7..f321f5866 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/containers/impl/PackageContainerGroupUrlClassLoaderTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/containers/impl/PackageContainerGroupUrlClassLoaderTest.java @@ -13,18 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.containers.impl; +package io.github.ascopes.jct.containers.impl; -import static io.github.ascopes.jct.tests.helpers.Fixtures.oneOf; +import static io.github.ascopes.jct.fixtures.Fixtures.oneOf; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import io.github.ascopes.jct.containers.Container; import io.github.ascopes.jct.containers.PackageContainerGroup; -import io.github.ascopes.jct.containers.impl.PackageContainerGroupUrlClassLoader; -import io.github.ascopes.jct.tests.helpers.Fixtures; -import io.github.ascopes.jct.tests.helpers.Fixtures.TempFileSystem; +import io.github.ascopes.jct.fixtures.Fixtures; +import io.github.ascopes.jct.fixtures.Fixtures.TempFileSystem; import io.github.ascopes.jct.workspaces.PathRoot; import java.io.IOException; import java.net.URLClassLoader; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/diagnostics/TeeWriterTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/diagnostics/TeeWriterTest.java similarity index 97% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/diagnostics/TeeWriterTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/diagnostics/TeeWriterTest.java index 7b73e463c..a64d89fd1 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/diagnostics/TeeWriterTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/diagnostics/TeeWriterTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.diagnostics; +package io.github.ascopes.jct.diagnostics; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someText; +import static io.github.ascopes.jct.fixtures.Fixtures.someText; import static java.nio.charset.Charset.defaultCharset; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; @@ -25,7 +25,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; -import io.github.ascopes.jct.diagnostics.TeeWriter; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.StringWriter; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/diagnostics/TraceDiagnosticTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/diagnostics/TraceDiagnosticTest.java similarity index 95% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/diagnostics/TraceDiagnosticTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/diagnostics/TraceDiagnosticTest.java index 0ddb50814..a7626d578 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/diagnostics/TraceDiagnosticTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/diagnostics/TraceDiagnosticTest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.diagnostics; - -import static io.github.ascopes.jct.tests.helpers.Fixtures.oneOf; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someDiagnostic; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someInt; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someLong; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someStackTraceList; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someText; +package io.github.ascopes.jct.diagnostics; + +import static io.github.ascopes.jct.fixtures.Fixtures.oneOf; +import static io.github.ascopes.jct.fixtures.Fixtures.someDiagnostic; +import static io.github.ascopes.jct.fixtures.Fixtures.someInt; +import static io.github.ascopes.jct.fixtures.Fixtures.someLong; +import static io.github.ascopes.jct.fixtures.Fixtures.someStackTraceList; +import static io.github.ascopes.jct.fixtures.Fixtures.someText; import static java.time.Instant.now; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -29,7 +29,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import io.github.ascopes.jct.diagnostics.TraceDiagnostic; import io.github.ascopes.jct.utils.LoomPolyfill; import io.github.ascopes.jct.utils.StringUtils; import java.util.Locale; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/diagnostics/TracingDiagnosticListenerTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/diagnostics/TracingDiagnosticListenerTest.java similarity index 96% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/diagnostics/TracingDiagnosticListenerTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/diagnostics/TracingDiagnosticListenerTest.java index 3c19bc586..819ee3bad 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/diagnostics/TracingDiagnosticListenerTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/diagnostics/TracingDiagnosticListenerTest.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.diagnostics; +package io.github.ascopes.jct.diagnostics; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someBoolean; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someDiagnostic; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someLong; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someRealStackTrace; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someText; +import static io.github.ascopes.jct.fixtures.Fixtures.someBoolean; +import static io.github.ascopes.jct.fixtures.Fixtures.someDiagnostic; +import static io.github.ascopes.jct.fixtures.Fixtures.someLong; +import static io.github.ascopes.jct.fixtures.Fixtures.someRealStackTrace; +import static io.github.ascopes.jct.fixtures.Fixtures.someText; import static java.util.Locale.ROOT; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.InstanceOfAssertFactories.list; @@ -28,9 +28,7 @@ import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; -import io.github.ascopes.jct.diagnostics.TraceDiagnostic; -import io.github.ascopes.jct.diagnostics.TracingDiagnosticListener; -import io.github.ascopes.jct.tests.helpers.Slf4jLoggerFake; +import io.github.ascopes.jct.fixtures.Slf4jLoggerFake; import io.github.ascopes.jct.utils.LoomPolyfill; import java.time.Instant; import java.util.List; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/ex/JctCompilerExceptionTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/ex/JctCompilerExceptionTest.java similarity index 95% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/ex/JctCompilerExceptionTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/ex/JctCompilerExceptionTest.java index 1d02ee768..28508359e 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/ex/JctCompilerExceptionTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/ex/JctCompilerExceptionTest.java @@ -13,12 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.ex; +package io.github.ascopes.jct.ex; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; -import io.github.ascopes.jct.ex.JctCompilerException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/ex/JctIllegalInputExceptionTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/ex/JctIllegalInputExceptionTest.java similarity index 94% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/ex/JctIllegalInputExceptionTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/ex/JctIllegalInputExceptionTest.java index 4771ec363..c418e97ec 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/ex/JctIllegalInputExceptionTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/ex/JctIllegalInputExceptionTest.java @@ -13,12 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.ex; +package io.github.ascopes.jct.ex; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; -import io.github.ascopes.jct.ex.JctIllegalInputException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/ex/JctJunitConfigurerExceptionTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/ex/JctJunitConfigurerExceptionTest.java similarity index 94% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/ex/JctJunitConfigurerExceptionTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/ex/JctJunitConfigurerExceptionTest.java index a85cf6e0a..9145e741e 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/ex/JctJunitConfigurerExceptionTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/ex/JctJunitConfigurerExceptionTest.java @@ -13,12 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.ex; +package io.github.ascopes.jct.ex; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; -import io.github.ascopes.jct.ex.JctJunitConfigurerException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/ex/JctNotFoundExceptionTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/ex/JctNotFoundExceptionTest.java similarity index 92% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/ex/JctNotFoundExceptionTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/ex/JctNotFoundExceptionTest.java index 79767942a..2e1feb0be 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/ex/JctNotFoundExceptionTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/ex/JctNotFoundExceptionTest.java @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.ex; +package io.github.ascopes.jct.ex; import static org.assertj.core.api.Assertions.assertThat; -import io.github.ascopes.jct.ex.JctNotFoundException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/ex/JctNotImplementedTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/ex/JctNotImplementedTest.java similarity index 92% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/ex/JctNotImplementedTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/ex/JctNotImplementedTest.java index 399edcf0e..9c574f403 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/ex/JctNotImplementedTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/ex/JctNotImplementedTest.java @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.ex; +package io.github.ascopes.jct.ex; import static org.assertj.core.api.Assertions.assertThat; -import io.github.ascopes.jct.ex.JctNotImplementedException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/JctFileManagerTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/JctFileManagerTest.java similarity index 98% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/JctFileManagerTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/JctFileManagerTest.java index d268ad677..8a43d6ee4 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/JctFileManagerTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/JctFileManagerTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.filemanagers; +package io.github.ascopes.jct.filemanagers; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -25,7 +25,6 @@ import io.github.ascopes.jct.containers.ModuleContainerGroup; import io.github.ascopes.jct.containers.OutputContainerGroup; import io.github.ascopes.jct.containers.PackageContainerGroup; -import io.github.ascopes.jct.filemanagers.JctFileManager; import java.util.stream.Stream; import javax.tools.StandardLocation; import org.junit.jupiter.api.DisplayName; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/JctFileManagersTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/JctFileManagersTest.java similarity index 84% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/JctFileManagersTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/JctFileManagersTest.java index 65c0cba65..94d5ead67 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/JctFileManagersTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/JctFileManagersTest.java @@ -13,17 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.filemanagers; +package io.github.ascopes.jct.filemanagers; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someRelease; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import io.github.ascopes.jct.compilers.JctCompiler; -import io.github.ascopes.jct.filemanagers.JctFileManagers; import io.github.ascopes.jct.filemanagers.impl.JctFileManagerFactoryImpl; -import io.github.ascopes.jct.filemanagers.impl.JctFileManagerImpl; -import io.github.ascopes.jct.tests.helpers.UtilityClassTestTemplate; +import io.github.ascopes.jct.fixtures.UtilityClassTestTemplate; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/ModuleLocationTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/ModuleLocationTest.java similarity index 97% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/ModuleLocationTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/ModuleLocationTest.java index 0aff84aa3..9de19a6c1 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/ModuleLocationTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/ModuleLocationTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.filemanagers; +package io.github.ascopes.jct.filemanagers; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someModuleName; +import static io.github.ascopes.jct.fixtures.Fixtures.someModuleName; import static java.util.function.Predicate.not; import static java.util.stream.Collectors.collectingAndThen; import static java.util.stream.Collectors.toList; @@ -24,10 +24,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.github.ascopes.jct.ex.JctIllegalInputException; -import io.github.ascopes.jct.filemanagers.ModuleLocation; -import io.github.ascopes.jct.tests.helpers.Fixtures; +import io.github.ascopes.jct.fixtures.Fixtures; import java.util.Objects; -import java.util.Optional; import java.util.stream.Stream; import javax.tools.JavaFileManager.Location; import javax.tools.StandardLocation; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerAnnotationProcessorClassPathConfigurerTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerAnnotationProcessorClassPathConfigurerTest.java similarity index 96% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerAnnotationProcessorClassPathConfigurerTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerAnnotationProcessorClassPathConfigurerTest.java index a70872e38..27e859a51 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerAnnotationProcessorClassPathConfigurerTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerAnnotationProcessorClassPathConfigurerTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.filemanagers.config; +package io.github.ascopes.jct.filemanagers.config; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -26,7 +26,6 @@ import io.github.ascopes.jct.ex.JctIllegalInputException; import io.github.ascopes.jct.filemanagers.AnnotationProcessorDiscovery; import io.github.ascopes.jct.filemanagers.JctFileManager; -import io.github.ascopes.jct.filemanagers.config.JctFileManagerAnnotationProcessorClassPathConfigurer; import javax.tools.StandardLocation; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerConfigurerChainTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerConfigurerChainTest.java similarity index 96% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerConfigurerChainTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerConfigurerChainTest.java index ba2279a2c..fb7386871 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerConfigurerChainTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerConfigurerChainTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.filemanagers.config; +package io.github.ascopes.jct.filemanagers.config; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -24,8 +24,6 @@ import static org.mockito.Mockito.when; import io.github.ascopes.jct.filemanagers.JctFileManager; -import io.github.ascopes.jct.filemanagers.config.JctFileManagerConfigurer; -import io.github.ascopes.jct.filemanagers.config.JctFileManagerConfigurerChain; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerConfigurerTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerConfigurerTest.java similarity index 90% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerConfigurerTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerConfigurerTest.java index 2a09565c9..f2315339c 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerConfigurerTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerConfigurerTest.java @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.filemanagers.config; +package io.github.ascopes.jct.filemanagers.config; import static org.assertj.core.api.Assertions.assertThat; -import io.github.ascopes.jct.filemanagers.config.JctFileManagerConfigurer; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerJvmClassPathConfigurerTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerJvmClassPathConfigurerTest.java similarity index 94% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerJvmClassPathConfigurerTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerJvmClassPathConfigurerTest.java index 9047152f5..93e2a075a 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerJvmClassPathConfigurerTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerJvmClassPathConfigurerTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.filemanagers.config; +package io.github.ascopes.jct.filemanagers.config; -import static io.github.ascopes.jct.tests.helpers.Fixtures.somePath; +import static io.github.ascopes.jct.fixtures.Fixtures.somePath; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mockStatic; @@ -24,7 +24,6 @@ import static org.mockito.Mockito.when; import io.github.ascopes.jct.compilers.JctCompiler; -import io.github.ascopes.jct.filemanagers.config.JctFileManagerJvmClassPathConfigurer; import io.github.ascopes.jct.filemanagers.impl.JctFileManagerImpl; import io.github.ascopes.jct.utils.SpecialLocationUtils; import io.github.ascopes.jct.workspaces.impl.WrappingDirectoryImpl; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerJvmClassPathModuleConfigurerTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerJvmClassPathModuleConfigurerTest.java similarity index 95% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerJvmClassPathModuleConfigurerTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerJvmClassPathModuleConfigurerTest.java index 369d87995..f945effab 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerJvmClassPathModuleConfigurerTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerJvmClassPathModuleConfigurerTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.filemanagers.config; +package io.github.ascopes.jct.filemanagers.config; -import static io.github.ascopes.jct.tests.helpers.Fixtures.somePath; +import static io.github.ascopes.jct.fixtures.Fixtures.somePath; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; @@ -25,7 +25,6 @@ import static org.mockito.Mockito.when; import io.github.ascopes.jct.compilers.JctCompiler; -import io.github.ascopes.jct.filemanagers.config.JctFileManagerJvmClassPathModuleConfigurer; import io.github.ascopes.jct.filemanagers.impl.JctFileManagerImpl; import io.github.ascopes.jct.utils.ModuleDiscoverer; import io.github.ascopes.jct.utils.ModuleDiscoverer.ModuleCandidate; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerJvmModulePathConfigurerTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerJvmModulePathConfigurerTest.java similarity index 94% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerJvmModulePathConfigurerTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerJvmModulePathConfigurerTest.java index 9c8c739d4..54f25bac9 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerJvmModulePathConfigurerTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerJvmModulePathConfigurerTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.filemanagers.config; +package io.github.ascopes.jct.filemanagers.config; -import static io.github.ascopes.jct.tests.helpers.Fixtures.somePath; +import static io.github.ascopes.jct.fixtures.Fixtures.somePath; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.SoftAssertions.assertSoftly; import static org.mockito.ArgumentMatchers.eq; @@ -25,7 +25,6 @@ import static org.mockito.Mockito.when; import io.github.ascopes.jct.compilers.JctCompiler; -import io.github.ascopes.jct.filemanagers.config.JctFileManagerJvmModulePathConfigurer; import io.github.ascopes.jct.filemanagers.impl.JctFileManagerImpl; import io.github.ascopes.jct.utils.SpecialLocationUtils; import io.github.ascopes.jct.workspaces.impl.WrappingDirectoryImpl; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerJvmSystemModulesConfigurerTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerJvmSystemModulesConfigurerTest.java similarity index 94% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerJvmSystemModulesConfigurerTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerJvmSystemModulesConfigurerTest.java index 6f5a88c58..9e47540bc 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerJvmSystemModulesConfigurerTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerJvmSystemModulesConfigurerTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.filemanagers.config; +package io.github.ascopes.jct.filemanagers.config; -import static io.github.ascopes.jct.tests.helpers.Fixtures.somePath; +import static io.github.ascopes.jct.fixtures.Fixtures.somePath; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mockStatic; @@ -24,7 +24,6 @@ import static org.mockito.Mockito.when; import io.github.ascopes.jct.compilers.JctCompiler; -import io.github.ascopes.jct.filemanagers.config.JctFileManagerJvmSystemModulesConfigurer; import io.github.ascopes.jct.filemanagers.impl.JctFileManagerImpl; import io.github.ascopes.jct.utils.SpecialLocationUtils; import io.github.ascopes.jct.workspaces.impl.WrappingDirectoryImpl; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerLoggingProxyConfigurerTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerLoggingProxyConfigurerTest.java similarity index 96% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerLoggingProxyConfigurerTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerLoggingProxyConfigurerTest.java index d72685665..406ca433a 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerLoggingProxyConfigurerTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerLoggingProxyConfigurerTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.filemanagers.config; +package io.github.ascopes.jct.filemanagers.config; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -25,7 +25,6 @@ import io.github.ascopes.jct.compilers.JctCompiler; import io.github.ascopes.jct.filemanagers.JctFileManager; import io.github.ascopes.jct.filemanagers.LoggingMode; -import io.github.ascopes.jct.filemanagers.config.JctFileManagerLoggingProxyConfigurer; import io.github.ascopes.jct.filemanagers.impl.JctFileManagerImpl; import io.github.ascopes.jct.filemanagers.impl.LoggingFileManagerProxy; import org.junit.jupiter.api.DisplayName; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerRequiredLocationsConfigurerTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerRequiredLocationsConfigurerTest.java similarity index 96% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerRequiredLocationsConfigurerTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerRequiredLocationsConfigurerTest.java index 857309325..7e58d051d 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerRequiredLocationsConfigurerTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerRequiredLocationsConfigurerTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.filemanagers.config; +package io.github.ascopes.jct.filemanagers.config; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -23,7 +23,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import io.github.ascopes.jct.filemanagers.config.JctFileManagerRequiredLocationsConfigurer; import io.github.ascopes.jct.filemanagers.impl.JctFileManagerImpl; import io.github.ascopes.jct.workspaces.ManagedDirectory; import io.github.ascopes.jct.workspaces.Workspace; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerWorkspaceConfigurerTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerWorkspaceConfigurerTest.java similarity index 90% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerWorkspaceConfigurerTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerWorkspaceConfigurerTest.java index 64a389ffe..8e288d6b9 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/config/JctFileManagerWorkspaceConfigurerTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerWorkspaceConfigurerTest.java @@ -13,15 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.filemanagers.config; +package io.github.ascopes.jct.filemanagers.config; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someLocation; -import static io.github.ascopes.jct.tests.helpers.Fixtures.somePathRoot; +import static io.github.ascopes.jct.fixtures.Fixtures.someLocation; +import static io.github.ascopes.jct.fixtures.Fixtures.somePathRoot; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import io.github.ascopes.jct.filemanagers.config.JctFileManagerWorkspaceConfigurer; import io.github.ascopes.jct.filemanagers.impl.JctFileManagerImpl; import io.github.ascopes.jct.workspaces.PathRoot; import io.github.ascopes.jct.workspaces.Workspace; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/impl/JctFileManagerFactoryImplTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/impl/JctFileManagerFactoryImplTest.java similarity index 95% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/impl/JctFileManagerFactoryImplTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/impl/JctFileManagerFactoryImplTest.java index 2bd8a08bd..7816b6c37 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/impl/JctFileManagerFactoryImplTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/impl/JctFileManagerFactoryImplTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.filemanagers.impl; +package io.github.ascopes.jct.filemanagers.impl; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -36,9 +36,7 @@ import io.github.ascopes.jct.filemanagers.config.JctFileManagerLoggingProxyConfigurer; import io.github.ascopes.jct.filemanagers.config.JctFileManagerRequiredLocationsConfigurer; import io.github.ascopes.jct.filemanagers.config.JctFileManagerWorkspaceConfigurer; -import io.github.ascopes.jct.filemanagers.impl.JctFileManagerFactoryImpl; -import io.github.ascopes.jct.filemanagers.impl.JctFileManagerImpl; -import io.github.ascopes.jct.tests.helpers.Fixtures; +import io.github.ascopes.jct.fixtures.Fixtures; import io.github.ascopes.jct.workspaces.Workspace; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/impl/JctFileManagerImplTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/impl/JctFileManagerImplTest.java similarity index 97% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/impl/JctFileManagerImplTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/impl/JctFileManagerImplTest.java index 13af32907..0359551d2 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/impl/JctFileManagerImplTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/impl/JctFileManagerImplTest.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.filemanagers.impl; - -import static io.github.ascopes.jct.tests.helpers.Fixtures.oneOf; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someAbsolutePath; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someBinaryName; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someBoolean; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someClassName; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someFlags; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someInt; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someJavaFileObject; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someLocation; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someModuleName; -import static io.github.ascopes.jct.tests.helpers.Fixtures.somePackageName; -import static io.github.ascopes.jct.tests.helpers.Fixtures.somePathRoot; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someRelativePath; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someText; +package io.github.ascopes.jct.filemanagers.impl; + +import static io.github.ascopes.jct.fixtures.Fixtures.oneOf; +import static io.github.ascopes.jct.fixtures.Fixtures.someAbsolutePath; +import static io.github.ascopes.jct.fixtures.Fixtures.someBinaryName; +import static io.github.ascopes.jct.fixtures.Fixtures.someBoolean; +import static io.github.ascopes.jct.fixtures.Fixtures.someClassName; +import static io.github.ascopes.jct.fixtures.Fixtures.someFlags; +import static io.github.ascopes.jct.fixtures.Fixtures.someInt; +import static io.github.ascopes.jct.fixtures.Fixtures.someJavaFileObject; +import static io.github.ascopes.jct.fixtures.Fixtures.someLocation; +import static io.github.ascopes.jct.fixtures.Fixtures.someModuleName; +import static io.github.ascopes.jct.fixtures.Fixtures.somePackageName; +import static io.github.ascopes.jct.fixtures.Fixtures.somePathRoot; +import static io.github.ascopes.jct.fixtures.Fixtures.someRelativePath; +import static io.github.ascopes.jct.fixtures.Fixtures.someText; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.InstanceOfAssertFactories.collection; @@ -52,8 +52,7 @@ import io.github.ascopes.jct.ex.JctNotFoundException; import io.github.ascopes.jct.filemanagers.ModuleLocation; import io.github.ascopes.jct.filemanagers.PathFileObject; -import io.github.ascopes.jct.filemanagers.impl.JctFileManagerImpl; -import io.github.ascopes.jct.tests.helpers.Fixtures; +import io.github.ascopes.jct.fixtures.Fixtures; import java.io.IOException; import java.net.URI; import java.util.Collection; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/impl/LoggingFileManagerProxyTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/impl/LoggingFileManagerProxyTest.java similarity index 96% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/impl/LoggingFileManagerProxyTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/impl/LoggingFileManagerProxyTest.java index 460b3a814..05b0e7b58 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/impl/LoggingFileManagerProxyTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/impl/LoggingFileManagerProxyTest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.filemanagers.impl; - -import static io.github.ascopes.jct.tests.helpers.Fixtures.oneOf; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someBoolean; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someInt; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someLong; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someRealStackTrace; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someText; +package io.github.ascopes.jct.filemanagers.impl; + +import static io.github.ascopes.jct.fixtures.Fixtures.oneOf; +import static io.github.ascopes.jct.fixtures.Fixtures.someBoolean; +import static io.github.ascopes.jct.fixtures.Fixtures.someInt; +import static io.github.ascopes.jct.fixtures.Fixtures.someLong; +import static io.github.ascopes.jct.fixtures.Fixtures.someRealStackTrace; +import static io.github.ascopes.jct.fixtures.Fixtures.someText; import static java.util.function.Predicate.not; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; @@ -34,8 +34,7 @@ import static org.mockito.Mockito.withSettings; import io.github.ascopes.jct.filemanagers.JctFileManager; -import io.github.ascopes.jct.filemanagers.impl.LoggingFileManagerProxy; -import io.github.ascopes.jct.tests.helpers.Slf4jLoggerFake; +import io.github.ascopes.jct.fixtures.Slf4jLoggerFake; import io.github.ascopes.jct.utils.LoomPolyfill; import java.lang.reflect.Array; import java.lang.reflect.InvocationTargetException; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/impl/PathFileObjectImplTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/impl/PathFileObjectImplTest.java similarity index 97% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/impl/PathFileObjectImplTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/impl/PathFileObjectImplTest.java index e977f1ce2..9b8f907f3 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/impl/PathFileObjectImplTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/filemanagers/impl/PathFileObjectImplTest.java @@ -13,21 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.filemanagers.impl; - -import static io.github.ascopes.jct.tests.helpers.Fixtures.someAbsolutePath; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someBinaryData; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someLinesOfText; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someLocation; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someRelativePath; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someTemporaryFileSystem; +package io.github.ascopes.jct.filemanagers.impl; + +import static io.github.ascopes.jct.fixtures.Fixtures.someAbsolutePath; +import static io.github.ascopes.jct.fixtures.Fixtures.someBinaryData; +import static io.github.ascopes.jct.fixtures.Fixtures.someLinesOfText; +import static io.github.ascopes.jct.fixtures.Fixtures.someLocation; +import static io.github.ascopes.jct.fixtures.Fixtures.someRelativePath; +import static io.github.ascopes.jct.fixtures.Fixtures.someTemporaryFileSystem; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.mock; import io.github.ascopes.jct.ex.JctIllegalInputException; -import io.github.ascopes.jct.filemanagers.impl.PathFileObjectImpl; import io.github.ascopes.jct.utils.FileUtils; import java.io.BufferedReader; import java.io.IOException; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/helpers/ExtraArgumentMatchers.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/fixtures/ExtraArgumentMatchers.java similarity index 94% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/helpers/ExtraArgumentMatchers.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/fixtures/ExtraArgumentMatchers.java index 895034f35..403baf95f 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/helpers/ExtraArgumentMatchers.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/fixtures/ExtraArgumentMatchers.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.helpers; +package io.github.ascopes.jct.fixtures; import static org.mockito.ArgumentMatchers.argThat; @@ -55,8 +55,8 @@ public static T hasGenericType(T... varargs) { * Create an argument matcher that matches any iterable containing the given elements exactly. * * @param expected the elements to match. - * @param the element type. - * @param the iterable type. + * @param the element type. + * @param the iterable type. * @return the argument matcher. */ @SafeVarargs @@ -68,8 +68,8 @@ public static > T containsExactlyElements(E... expected * Create an argument matcher that matches any iterable containing the given elements exactly. * * @param expected the elements to match. - * @param the element type. - * @param the iterable type. + * @param the element type. + * @param the iterable type. * @return the argument matcher. */ public static > T containsExactlyElements(Collection expected) { diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/helpers/Fixtures.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/fixtures/Fixtures.java similarity index 99% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/helpers/Fixtures.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/fixtures/Fixtures.java index 8df2b2735..776f4b7af 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/helpers/Fixtures.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/fixtures/Fixtures.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.helpers; +package io.github.ascopes.jct.fixtures; import static java.util.stream.Collectors.joining; import static org.mockito.ArgumentMatchers.any; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/helpers/Slf4jLoggerFake.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/fixtures/Slf4jLoggerFake.java similarity index 99% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/helpers/Slf4jLoggerFake.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/fixtures/Slf4jLoggerFake.java index 021be10cd..62df8acd4 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/helpers/Slf4jLoggerFake.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/fixtures/Slf4jLoggerFake.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.helpers; +package io.github.ascopes.jct.fixtures; import static org.assertj.core.api.Assertions.assertThat; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/helpers/UtilityClassTestTemplate.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/fixtures/UtilityClassTestTemplate.java similarity index 99% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/helpers/UtilityClassTestTemplate.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/fixtures/UtilityClassTestTemplate.java index aeafd0606..1546160e5 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/helpers/UtilityClassTestTemplate.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/fixtures/UtilityClassTestTemplate.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.helpers; +package io.github.ascopes.jct.fixtures; import static java.util.function.Predicate.not; import static org.assertj.core.api.Assertions.assertThat; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/AbstractIntegrationTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/integration/AbstractIntegrationTest.java similarity index 83% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/AbstractIntegrationTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/integration/AbstractIntegrationTest.java index f9be61a61..38a0eaa95 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/AbstractIntegrationTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/integration/AbstractIntegrationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.integration; +package io.github.ascopes.jct.integration; import java.nio.file.Files; import java.nio.file.Path; @@ -33,7 +33,12 @@ public abstract class AbstractIntegrationTest { */ protected Path resourcesDirectory() { var path = Path.of("src", "test", "resources"); - for (var part : getClass().getCanonicalName().split("[./]")) { + + // Add a suffix, as older Java versions complain if packages exist with the same name as + // classes. + var dirName = getClass().getCanonicalName() + "_resources"; + + for (var part : dirName.split("[./]")) { path = path.resolve(part); } diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/compilation/BasicLegacyCompilationIntegrationTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/integration/compilation/BasicLegacyCompilationIntegrationTest.java similarity index 95% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/compilation/BasicLegacyCompilationIntegrationTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/integration/compilation/BasicLegacyCompilationIntegrationTest.java index 4143dc341..e1968e4f5 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/compilation/BasicLegacyCompilationIntegrationTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/integration/compilation/BasicLegacyCompilationIntegrationTest.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.integration.compilation; +package io.github.ascopes.jct.integration.compilation; import static io.github.ascopes.jct.assertions.JctAssertions.assertThatCompilation; import io.github.ascopes.jct.compilers.JctCompiler; +import io.github.ascopes.jct.integration.AbstractIntegrationTest; import io.github.ascopes.jct.junit.JavacCompilerTest; -import io.github.ascopes.jct.tests.integration.AbstractIntegrationTest; import io.github.ascopes.jct.workspaces.PathStrategy; import io.github.ascopes.jct.workspaces.Workspaces; import javax.tools.StandardLocation; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/compilation/BasicModuleCompilationIntegrationTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/integration/compilation/BasicModuleCompilationIntegrationTest.java similarity index 95% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/compilation/BasicModuleCompilationIntegrationTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/integration/compilation/BasicModuleCompilationIntegrationTest.java index de6a06293..ef391d90f 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/compilation/BasicModuleCompilationIntegrationTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/integration/compilation/BasicModuleCompilationIntegrationTest.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.integration.compilation; +package io.github.ascopes.jct.integration.compilation; import static io.github.ascopes.jct.assertions.JctAssertions.assertThatCompilation; import io.github.ascopes.jct.compilers.JctCompiler; +import io.github.ascopes.jct.integration.AbstractIntegrationTest; import io.github.ascopes.jct.junit.JavacCompilerTest; -import io.github.ascopes.jct.tests.integration.AbstractIntegrationTest; import io.github.ascopes.jct.workspaces.PathStrategy; import io.github.ascopes.jct.workspaces.Workspaces; import org.junit.jupiter.api.DisplayName; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/compilation/BasicMultiModuleCompilationIntegrationTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/integration/compilation/BasicMultiModuleCompilationIntegrationTest.java similarity index 98% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/compilation/BasicMultiModuleCompilationIntegrationTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/integration/compilation/BasicMultiModuleCompilationIntegrationTest.java index 71717a48b..dc3570279 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/compilation/BasicMultiModuleCompilationIntegrationTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/integration/compilation/BasicMultiModuleCompilationIntegrationTest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.integration.compilation; +package io.github.ascopes.jct.integration.compilation; import static io.github.ascopes.jct.assertions.JctAssertions.assertThatCompilation; import static io.github.ascopes.jct.assertions.JctAssertions.assertThatContainerGroup; import io.github.ascopes.jct.compilers.JctCompiler; +import io.github.ascopes.jct.integration.AbstractIntegrationTest; import io.github.ascopes.jct.junit.JavacCompilerTest; -import io.github.ascopes.jct.tests.integration.AbstractIntegrationTest; import io.github.ascopes.jct.workspaces.PathStrategy; import io.github.ascopes.jct.workspaces.Workspaces; import org.junit.jupiter.api.DisplayName; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/compilation/CompilingSpecificClassesIntegrationTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/integration/compilation/CompilingSpecificClassesIntegrationTest.java similarity index 92% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/compilation/CompilingSpecificClassesIntegrationTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/integration/compilation/CompilingSpecificClassesIntegrationTest.java index b84e9db8a..d69554619 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/compilation/CompilingSpecificClassesIntegrationTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/integration/compilation/CompilingSpecificClassesIntegrationTest.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.integration.compilation; +package io.github.ascopes.jct.integration.compilation; import static io.github.ascopes.jct.assertions.JctAssertions.assertThat; import io.github.ascopes.jct.compilers.JctCompiler; +import io.github.ascopes.jct.integration.AbstractIntegrationTest; import io.github.ascopes.jct.junit.JavacCompilerTest; -import io.github.ascopes.jct.tests.integration.AbstractIntegrationTest; import io.github.ascopes.jct.workspaces.Workspaces; import org.junit.jupiter.api.DisplayName; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/compilation/MultiTieredCompilationIntegrationTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/integration/compilation/MultiTieredCompilationIntegrationTest.java similarity index 96% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/compilation/MultiTieredCompilationIntegrationTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/integration/compilation/MultiTieredCompilationIntegrationTest.java index 010962cc5..e51bf8e97 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/compilation/MultiTieredCompilationIntegrationTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/integration/compilation/MultiTieredCompilationIntegrationTest.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.integration.compilation; +package io.github.ascopes.jct.integration.compilation; import static io.github.ascopes.jct.assertions.JctAssertions.assertThatCompilation; import io.github.ascopes.jct.compilers.JctCompiler; +import io.github.ascopes.jct.integration.AbstractIntegrationTest; import io.github.ascopes.jct.junit.JavacCompilerTest; -import io.github.ascopes.jct.tests.integration.AbstractIntegrationTest; import io.github.ascopes.jct.workspaces.Workspaces; import org.junit.jupiter.api.DisplayName; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/junit/JctExtensionIntegrationTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/integration/junit/JctExtensionIntegrationTest.java similarity index 99% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/junit/JctExtensionIntegrationTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/integration/junit/JctExtensionIntegrationTest.java index e46d50c20..1dbcd1fd2 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/junit/JctExtensionIntegrationTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/integration/junit/JctExtensionIntegrationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.integration.junit; +package io.github.ascopes.jct.integration.junit; import static org.assertj.core.api.Assertions.assertThat; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/junit/AbstractCompilersProviderTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/junit/AbstractCompilersProviderTest.java similarity index 80% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/junit/AbstractCompilersProviderTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/junit/AbstractCompilersProviderTest.java index 43b7fc275..62db940bc 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/junit/AbstractCompilersProviderTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/junit/AbstractCompilersProviderTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.junit; +package io.github.ascopes.jct.junit; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; @@ -28,24 +28,13 @@ import io.github.ascopes.jct.compilers.JctCompiler; import io.github.ascopes.jct.compilers.JctCompilerConfigurer; -import io.github.ascopes.jct.compilers.JctCompilers; -import io.github.ascopes.jct.containers.Container; import io.github.ascopes.jct.ex.JctIllegalInputException; import io.github.ascopes.jct.ex.JctJunitConfigurerException; -import io.github.ascopes.jct.junit.AbstractCompilersProvider; -import io.github.ascopes.jct.junit.VersionStrategy; -import io.github.ascopes.jct.workspaces.Workspaces; -import java.lang.module.Configuration; -import java.lang.module.ModuleFinder; import java.lang.reflect.InvocationTargetException; -import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.tools.StandardLocation; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledOnOs; -import org.junit.jupiter.api.condition.OS; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -363,93 +352,6 @@ void configurersWithNonDefaultConstructorsWillProduceExceptions() { .hasCauseInstanceOf(NoSuchMethodException.class); } - // TODO(ascopes): fix this so it works on Windows. Not sure right now what is causing it, and I - // lack a development environment on Windows to investigate this with. - @DisplayName("Configurers that do not open packages to the JCT module will produce exceptions") - @Test - @DisabledOnOs(value = OS.WINDOWS, disabledReason = "Seems to fail on a path issue") - void configurersThatDoNotOpenPackagesToJctModuleWillProduceExceptions() - throws ClassNotFoundException { - // Simulating this case is difficult as we have to make a new module that isn't yet opened - // to JCT. We can't use this module because everything else will not work properly if we don't - // open it reflectively. - // - // Quickest way to make a module is, in fact, to just use JCT's testing compiler facilities - // to do this for us. So this kind of acts as an integration test to some extent as well. - - // Given - var provider = new CompilersProviderImpl(8, 17); - - try (var workspace = Workspaces.newWorkspace()) { - workspace.createSourcePathPackage() - .createFile("module-info.java").withContents( - "module org.example {", - " requires " + JctCompilerConfigurer.class.getModule().getName() + ";", - "}" - ) - .and() - .createFile("org", "example", "SomeConfigurer.java").withContents( - "package org.example;", - "public class SomeConfigurer implements " + JctCompilerConfigurer.class.getName() - + "<" + RuntimeException.class.getName() + "> {", - " @Override", - " public void configure(" + JctCompiler.class.getName() + " compiler) {", - " return;", - " }", - "}" - ); - - var compilation = JctCompilers - .newPlatformCompiler() - .release(11) - .compile(workspace); - - var bootLayer = ModuleLayer.boot(); - - var compiledCodeModuleConfig = Configuration.resolveAndBind( - ModuleFinder.compose( - compilation.getFileManager() - .getOutputContainerGroup(StandardLocation.CLASS_OUTPUT) - .getPackages() - .stream() - .map(Container::getModuleFinder) - .toArray(ModuleFinder[]::new)), - List.of(bootLayer.configuration()), - ModuleFinder.of(), - List.of("org.example") - ); - - var compiledCodeController = ModuleLayer.defineModulesWithOneLoader( - compiledCodeModuleConfig, - List.of(bootLayer), - getClass().getClassLoader() - ); - - @SuppressWarnings("unchecked") - var someConfigurerCls = (Class>) compiledCodeController - .layer() - .findLoader("org.example") - .loadClass("org.example.SomeConfigurer"); - - // When - provider.configureInternals(10, 15, VersionStrategy.RELEASE, someConfigurerCls); - - // Then - ExtensionContext ctx = mock(); - assertThatThrownBy(() -> provider.provideArguments(ctx).toArray()) - .isInstanceOf(JctJunitConfigurerException.class) - .hasMessage(String.join( - "", - "The constructor in SomeConfigurer cannot be called from JCT.\n", - "This is likely because JPMS modules are in use and you have not granted ", - "permission for JCT to access your classes reflectively.\n", - "To fix this, add the following line into your module-info.java within the ", - "'module' block:\n\n", - " opens org.example to io.github.ascopes.jct.testing;" - )); - } - } - /// /// Test data and classes to operate upon. /// diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/junit/JavacCompilersProviderTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/junit/JavacCompilersProviderTest.java similarity index 96% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/junit/JavacCompilersProviderTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/junit/JavacCompilersProviderTest.java index 5ec7dc6fb..05887f6b2 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/junit/JavacCompilersProviderTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/junit/JavacCompilersProviderTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.junit; +package io.github.ascopes.jct.junit; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.SoftAssertions.assertSoftly; @@ -24,9 +24,6 @@ import io.github.ascopes.jct.compilers.JctCompilerConfigurer; import io.github.ascopes.jct.compilers.impl.JavacJctCompilerImpl; -import io.github.ascopes.jct.junit.JavacCompilerTest; -import io.github.ascopes.jct.junit.JavacCompilersProvider; -import io.github.ascopes.jct.junit.VersionStrategy; import java.lang.reflect.AnnotatedElement; import java.util.stream.Collectors; import org.junit.jupiter.api.DisplayName; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/junit/JctExtensionTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/junit/JctExtensionTest.java similarity index 99% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/junit/JctExtensionTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/junit/JctExtensionTest.java index 4fbbe4298..ce405b373 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/junit/JctExtensionTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/junit/JctExtensionTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.junit; +package io.github.ascopes.jct.junit; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; @@ -26,8 +26,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import io.github.ascopes.jct.junit.JctExtension; -import io.github.ascopes.jct.junit.Managed; import io.github.ascopes.jct.workspaces.PathStrategy; import io.github.ascopes.jct.workspaces.Workspace; import io.github.ascopes.jct.workspaces.Workspaces; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/junit/VersionStrategyTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/junit/VersionStrategyTest.java similarity index 95% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/junit/VersionStrategyTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/junit/VersionStrategyTest.java index 1c37381f3..1cd0f3d5a 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/junit/VersionStrategyTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/junit/VersionStrategyTest.java @@ -13,15 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.junit; +package io.github.ascopes.jct.junit; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someText; +import static io.github.ascopes.jct.fixtures.Fixtures.someText; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import io.github.ascopes.jct.compilers.JctCompiler; -import io.github.ascopes.jct.junit.VersionStrategy; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/repr/LocationRepresentationTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/repr/LocationRepresentationTest.java similarity index 90% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/repr/LocationRepresentationTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/repr/LocationRepresentationTest.java index f30f9cf99..b910e8ef3 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/repr/LocationRepresentationTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/repr/LocationRepresentationTest.java @@ -13,12 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.repr; +package io.github.ascopes.jct.repr; -import static io.github.ascopes.jct.tests.helpers.Fixtures.oneOf; +import static io.github.ascopes.jct.fixtures.Fixtures.oneOf; import static org.assertj.core.api.Assertions.assertThat; -import io.github.ascopes.jct.repr.LocationRepresentation; import javax.tools.StandardLocation; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/repr/StackTraceRepresentationTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/repr/StackTraceRepresentationTest.java similarity index 95% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/repr/StackTraceRepresentationTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/repr/StackTraceRepresentationTest.java index 3c14b638e..5bef7f937 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/repr/StackTraceRepresentationTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/repr/StackTraceRepresentationTest.java @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.repr; +package io.github.ascopes.jct.repr; import static org.assertj.core.api.Assertions.assertThat; -import io.github.ascopes.jct.repr.StackTraceRepresentation; import java.util.List; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/repr/TraceDiagnosticListRepresentationTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/repr/TraceDiagnosticListRepresentationTest.java similarity index 92% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/repr/TraceDiagnosticListRepresentationTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/repr/TraceDiagnosticListRepresentationTest.java index 42a6594e8..f9aefffbd 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/repr/TraceDiagnosticListRepresentationTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/repr/TraceDiagnosticListRepresentationTest.java @@ -13,15 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.repr; +package io.github.ascopes.jct.repr; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import io.github.ascopes.jct.repr.TraceDiagnosticListRepresentation; -import io.github.ascopes.jct.repr.TraceDiagnosticRepresentation; -import io.github.ascopes.jct.tests.helpers.Fixtures; +import io.github.ascopes.jct.fixtures.Fixtures; import java.util.List; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/repr/TraceDiagnosticRepresentationTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/repr/TraceDiagnosticRepresentationTest.java similarity index 97% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/repr/TraceDiagnosticRepresentationTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/repr/TraceDiagnosticRepresentationTest.java index d77022460..c53b5a5a2 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/repr/TraceDiagnosticRepresentationTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/repr/TraceDiagnosticRepresentationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.repr; +package io.github.ascopes.jct.repr; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -21,7 +21,6 @@ import io.github.ascopes.jct.diagnostics.TraceDiagnostic; import io.github.ascopes.jct.filemanagers.PathFileObject; -import io.github.ascopes.jct.repr.TraceDiagnosticRepresentation; import java.util.Locale; import javax.tools.Diagnostic.Kind; import org.junit.jupiter.api.DisplayName; @@ -111,7 +110,7 @@ void toStringOfTraceDiagnosticReturnsTheExpectedMessageWhenNoCodeIsProvidedWithS } @DisplayName("toStringOf(TraceDiagnostic) returns the expected message when a code is provided " - + "with no source") + + "with no source") @EnumSource(value = Kind.class) @ParameterizedTest(name = "for kind {0}") void toStringOfTraceDiagnosticReturnsTheExpectedMessageWhenCodeIsProvidedWithNoSource(Kind kind) { diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/compilation/package-info.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/compilation/package-info.java deleted file mode 100644 index bc248a7b9..000000000 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/compilation/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2022 - 2024, the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package io.github.ascopes.jct.tests.integration.compilation; - diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/junit/package-info.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/junit/package-info.java deleted file mode 100644 index 9eb09fa74..000000000 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/junit/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2022 - 2024, the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package io.github.ascopes.jct.tests.integration.junit; - diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/package-info.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/package-info.java deleted file mode 100644 index ec28f0822..000000000 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/integration/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2022 - 2024, the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package io.github.ascopes.jct.tests.integration; - diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/package-info.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/package-info.java deleted file mode 100644 index bdf05a2af..000000000 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2022 - 2024, the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package io.github.ascopes.jct.tests.unit.assertions; - diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/impl/package-info.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/impl/package-info.java deleted file mode 100644 index 87d9b2ec9..000000000 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/impl/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2022 - 2024, the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package io.github.ascopes.jct.tests.unit.compilers.impl; - diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/package-info.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/package-info.java deleted file mode 100644 index 72b4c8d8e..000000000 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/compilers/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2022 - 2024, the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package io.github.ascopes.jct.tests.unit.compilers; - diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/containers/impl/package-info.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/containers/impl/package-info.java deleted file mode 100644 index f7523deb1..000000000 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/containers/impl/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2022 - 2024, the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package io.github.ascopes.jct.tests.unit.containers.impl; - diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/containers/package-info.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/containers/package-info.java deleted file mode 100644 index 652b3403e..000000000 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/containers/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2022 - 2024, the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package io.github.ascopes.jct.tests.unit.containers; - diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/diagnostics/package-info.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/diagnostics/package-info.java deleted file mode 100644 index 658d7758b..000000000 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/diagnostics/package-info.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2022 - 2024, the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -@NullMarked -package io.github.ascopes.jct.tests.unit.diagnostics; - -import org.jspecify.annotations.NullMarked; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/ex/package-info.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/ex/package-info.java deleted file mode 100644 index 1089132bc..000000000 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/ex/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2022 - 2024, the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package io.github.ascopes.jct.tests.unit.ex; - diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/package-info.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/package-info.java deleted file mode 100644 index d97dd19cf..000000000 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/filemanagers/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2022 - 2024, the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package io.github.ascopes.jct.tests.unit.filemanagers; - diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/junit/package-info.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/junit/package-info.java deleted file mode 100644 index a21dd02dd..000000000 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/junit/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2022 - 2024, the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package io.github.ascopes.jct.tests.unit.junit; - diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/package-info.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/package-info.java deleted file mode 100644 index 1e9177e76..000000000 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2022 - 2024, the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package io.github.ascopes.jct.tests.unit; - diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/repr/package-info.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/repr/package-info.java deleted file mode 100644 index f20e073a0..000000000 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/repr/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2022 - 2024, the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package io.github.ascopes.jct.tests.unit.repr; - diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/package-info.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/package-info.java deleted file mode 100644 index 21584bdba..000000000 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2022 - 2024, the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package io.github.ascopes.jct.tests.unit.utils; - diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/impl/package-info.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/impl/package-info.java deleted file mode 100644 index d3b08c6a7..000000000 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/impl/package-info.java +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (C) 2022 - 2024, the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package io.github.ascopes.jct.tests.unit.workspaces.impl; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/package-info.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/package-info.java deleted file mode 100644 index e6aeaa972..000000000 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2022 - 2024, the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package io.github.ascopes.jct.tests.unit.workspaces; - diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/FileUtilsTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/FileUtilsTest.java similarity index 98% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/FileUtilsTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/FileUtilsTest.java index 9e69d86ff..3be88f847 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/FileUtilsTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/FileUtilsTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.utils; +package io.github.ascopes.jct.utils; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someTemporaryFileSystem; +import static io.github.ascopes.jct.fixtures.Fixtures.someTemporaryFileSystem; import static io.github.ascopes.jct.utils.FileUtils.assertValidRootName; import static io.github.ascopes.jct.utils.FileUtils.binaryNameToPackageName; import static io.github.ascopes.jct.utils.FileUtils.binaryNameToPath; @@ -39,9 +39,7 @@ import static org.mockito.Mockito.when; import io.github.ascopes.jct.ex.JctIllegalInputException; -import io.github.ascopes.jct.tests.helpers.UtilityClassTestTemplate; -import io.github.ascopes.jct.utils.FileUtils; -import io.github.ascopes.jct.utils.StringUtils; +import io.github.ascopes.jct.fixtures.UtilityClassTestTemplate; import java.io.IOException; import java.net.MalformedURLException; import java.net.URI; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/IoExceptionUtilsTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/IoExceptionUtilsTest.java similarity index 97% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/IoExceptionUtilsTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/IoExceptionUtilsTest.java index a135ad56f..c9541651e 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/IoExceptionUtilsTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/IoExceptionUtilsTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.utils; +package io.github.ascopes.jct.utils; import static io.github.ascopes.jct.utils.IoExceptionUtils.uncheckedIo; import static org.assertj.core.api.Assertions.assertThat; @@ -21,8 +21,7 @@ import static org.assertj.core.api.BDDAssertions.thenCode; import static org.assertj.core.api.InstanceOfAssertFactories.array; -import io.github.ascopes.jct.tests.helpers.UtilityClassTestTemplate; -import io.github.ascopes.jct.utils.IoExceptionUtils; +import io.github.ascopes.jct.fixtures.UtilityClassTestTemplate; import io.github.ascopes.jct.utils.IoExceptionUtils.IoRunnable; import io.github.ascopes.jct.utils.IoExceptionUtils.IoSupplier; import java.io.IOException; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/IterableUtilsTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/IterableUtilsTest.java similarity index 97% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/IterableUtilsTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/IterableUtilsTest.java index 7ea19679e..54aecd4c8 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/IterableUtilsTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/IterableUtilsTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.utils; +package io.github.ascopes.jct.utils; import static io.github.ascopes.jct.utils.IterableUtils.flatten; import static io.github.ascopes.jct.utils.IterableUtils.requireAtLeastOne; @@ -22,8 +22,7 @@ import static org.assertj.core.api.Assertions.assertThatException; import static org.assertj.core.api.Assertions.assertThatNoException; -import io.github.ascopes.jct.tests.helpers.UtilityClassTestTemplate; -import io.github.ascopes.jct.utils.IterableUtils; +import io.github.ascopes.jct.fixtures.UtilityClassTestTemplate; import java.util.Arrays; import java.util.Collection; import java.util.List; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/LazyTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/LazyTest.java similarity index 99% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/LazyTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/LazyTest.java index 1e979417c..1e83a302a 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/LazyTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/LazyTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.utils; +package io.github.ascopes.jct.utils; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -28,7 +28,6 @@ import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; -import io.github.ascopes.jct.utils.Lazy; import io.github.ascopes.jct.utils.Lazy.ThrowingConsumer; import java.util.concurrent.Callable; import java.util.concurrent.CompletableFuture; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/LoomPolyfillTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/LoomPolyfillTest.java similarity index 92% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/LoomPolyfillTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/LoomPolyfillTest.java index 323ae9d22..2e5b4af4d 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/LoomPolyfillTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/LoomPolyfillTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.utils; +package io.github.ascopes.jct.utils; import static io.github.ascopes.jct.utils.LoomPolyfill.getCurrentThread; import static org.assertj.core.api.Assertions.assertThat; @@ -22,9 +22,8 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import io.github.ascopes.jct.tests.helpers.Fixtures; -import io.github.ascopes.jct.tests.helpers.UtilityClassTestTemplate; -import io.github.ascopes.jct.utils.LoomPolyfill; +import io.github.ascopes.jct.fixtures.Fixtures; +import io.github.ascopes.jct.fixtures.UtilityClassTestTemplate; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledForJreRange; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/ModuleDiscovererTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/ModuleDiscovererTest.java similarity index 97% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/ModuleDiscovererTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/ModuleDiscovererTest.java index 6ff7f8dde..3c046b431 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/ModuleDiscovererTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/ModuleDiscovererTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.utils; +package io.github.ascopes.jct.utils; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someModuleName; -import static io.github.ascopes.jct.tests.helpers.Fixtures.somePath; +import static io.github.ascopes.jct.fixtures.Fixtures.someModuleName; +import static io.github.ascopes.jct.fixtures.Fixtures.somePath; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.SoftAssertions.assertSoftly; import static org.mockito.ArgumentMatchers.any; @@ -26,7 +26,6 @@ import static org.mockito.Mockito.when; import static org.mockito.Mockito.withSettings; -import io.github.ascopes.jct.utils.ModuleDiscoverer; import io.github.ascopes.jct.utils.ModuleDiscoverer.ModuleCandidate; import io.github.ascopes.jct.workspaces.PathRoot; import io.github.ascopes.jct.workspaces.impl.WrappingDirectoryImpl; @@ -136,6 +135,7 @@ static Consumer assertCandidateEquals(ModuleReference reference @DisplayName("ModuleCandidate tests") @Nested class ModuleCandidateTest { + @DisplayName("The name is set") @Test void theNameIsSet() { diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/SpecialLocationsUtilsTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/SpecialLocationsUtilsTest.java similarity index 96% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/SpecialLocationsUtilsTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/SpecialLocationsUtilsTest.java index 5668c0505..b5066ed0f 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/SpecialLocationsUtilsTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/SpecialLocationsUtilsTest.java @@ -13,16 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.utils; +package io.github.ascopes.jct.utils; -import static io.github.ascopes.jct.tests.helpers.Fixtures.oneOf; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someText; +import static io.github.ascopes.jct.fixtures.Fixtures.oneOf; +import static io.github.ascopes.jct.fixtures.Fixtures.someText; import static java.util.function.Predicate.not; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; -import io.github.ascopes.jct.tests.helpers.UtilityClassTestTemplate; -import io.github.ascopes.jct.utils.SpecialLocationUtils; +import io.github.ascopes.jct.fixtures.UtilityClassTestTemplate; import java.io.Closeable; import java.io.File; import java.io.IOException; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/StringSlicerTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/StringSlicerTest.java similarity index 97% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/StringSlicerTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/StringSlicerTest.java index 664a970df..a3d27c5a1 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/StringSlicerTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/StringSlicerTest.java @@ -13,12 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.utils; +package io.github.ascopes.jct.utils; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.api.BDDAssertions.thenCode; -import io.github.ascopes.jct.utils.StringSlicer; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/StringUtilsTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/StringUtilsTest.java similarity index 98% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/StringUtilsTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/StringUtilsTest.java index 937728fb1..7d33267ed 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/StringUtilsTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/StringUtilsTest.java @@ -13,15 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.utils; +package io.github.ascopes.jct.utils; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.BDDAssertions.then; import static org.junit.jupiter.params.provider.Arguments.of; -import io.github.ascopes.jct.tests.helpers.Fixtures; -import io.github.ascopes.jct.tests.helpers.UtilityClassTestTemplate; -import io.github.ascopes.jct.utils.StringUtils; +import io.github.ascopes.jct.fixtures.Fixtures; +import io.github.ascopes.jct.fixtures.UtilityClassTestTemplate; import java.lang.reflect.Type; import java.nio.file.Path; import java.util.Arrays; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/ToStringBuilderTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/ToStringBuilderTest.java similarity index 99% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/ToStringBuilderTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/ToStringBuilderTest.java index dc44fe3ef..89a90403a 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/ToStringBuilderTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/utils/ToStringBuilderTest.java @@ -13,12 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.utils; +package io.github.ascopes.jct.utils; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import io.github.ascopes.jct.utils.ToStringBuilder; import java.nio.CharBuffer; import java.util.LinkedHashMap; import java.util.List; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/ManagedDirectoryTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/workspaces/ManagedDirectoryTest.java similarity index 93% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/ManagedDirectoryTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/workspaces/ManagedDirectoryTest.java index c3908896c..32b06086f 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/ManagedDirectoryTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/workspaces/ManagedDirectoryTest.java @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.workspaces; +package io.github.ascopes.jct.workspaces; import static org.assertj.core.api.Assertions.assertThat; -import io.github.ascopes.jct.workspaces.ManagedDirectory; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/PathStrategyTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/workspaces/PathStrategyTest.java similarity index 92% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/PathStrategyTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/workspaces/PathStrategyTest.java index 262d21eeb..8cc7ef5e5 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/PathStrategyTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/workspaces/PathStrategyTest.java @@ -13,14 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.workspaces; +package io.github.ascopes.jct.workspaces; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someText; +import static io.github.ascopes.jct.fixtures.Fixtures.someText; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.params.provider.Arguments.arguments; -import io.github.ascopes.jct.workspaces.ManagedDirectory; -import io.github.ascopes.jct.workspaces.PathStrategy; import io.github.ascopes.jct.workspaces.impl.RamDirectoryImpl; import io.github.ascopes.jct.workspaces.impl.TempDirectoryImpl; import java.io.IOException; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/WorkspaceTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/workspaces/WorkspaceTest.java similarity index 98% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/WorkspaceTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/workspaces/WorkspaceTest.java index 57f54385a..8be77e540 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/WorkspaceTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/workspaces/WorkspaceTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.workspaces; +package io.github.ascopes.jct.workspaces; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someModuleName; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someText; +import static io.github.ascopes.jct.fixtures.Fixtures.someModuleName; +import static io.github.ascopes.jct.fixtures.Fixtures.someText; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doCallRealMethod; @@ -25,8 +25,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import io.github.ascopes.jct.workspaces.PathRoot; -import io.github.ascopes.jct.workspaces.Workspace; import java.nio.file.Path; import java.util.List; import java.util.Map; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/WorkspacesTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/workspaces/WorkspacesTest.java similarity index 92% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/WorkspacesTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/workspaces/WorkspacesTest.java index 73843a7c9..0e80b602e 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/WorkspacesTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/workspaces/WorkspacesTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.workspaces; +package io.github.ascopes.jct.workspaces; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -21,9 +21,6 @@ import static org.mockito.Mockito.mockConstruction; import static org.mockito.Mockito.mockStatic; -import io.github.ascopes.jct.workspaces.PathStrategy; -import io.github.ascopes.jct.workspaces.Workspace; -import io.github.ascopes.jct.workspaces.Workspaces; import io.github.ascopes.jct.workspaces.impl.WorkspaceImpl; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/impl/JarFactoryImplTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/workspaces/impl/JarFactoryImplTest.java similarity index 97% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/impl/JarFactoryImplTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/workspaces/impl/JarFactoryImplTest.java index e583afe5b..fa38fd72f 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/impl/JarFactoryImplTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/workspaces/impl/JarFactoryImplTest.java @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.workspaces.impl; +package io.github.ascopes.jct.workspaces.impl; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.SoftAssertions.assertSoftly; -import io.github.ascopes.jct.tests.helpers.Fixtures; -import io.github.ascopes.jct.workspaces.impl.JarFactoryImpl; +import io.github.ascopes.jct.fixtures.Fixtures; import java.io.IOException; import java.nio.file.FileSystem; import java.nio.file.Files; diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/impl/MemoryFileSystemProviderImplTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/workspaces/impl/MemoryFileSystemProviderImplTest.java similarity index 90% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/impl/MemoryFileSystemProviderImplTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/workspaces/impl/MemoryFileSystemProviderImplTest.java index 643a36a2d..c3daa9229 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/impl/MemoryFileSystemProviderImplTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/workspaces/impl/MemoryFileSystemProviderImplTest.java @@ -13,19 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.workspaces.impl; +package io.github.ascopes.jct.workspaces.impl; -import static io.github.ascopes.jct.tests.helpers.Fixtures.someText; +import static io.github.ascopes.jct.fixtures.Fixtures.someText; import static org.assertj.core.api.Assertions.assertThat; import com.github.marschall.memoryfilesystem.memory.Handler; -import io.github.ascopes.jct.workspaces.impl.MemoryFileSystemProvider; import io.github.ascopes.jct.workspaces.impl.MemoryFileSystemProvider.MemoryFileSystemUrlHandlerProvider; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; -import java.net.spi.URLStreamHandlerProvider; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.nio.file.Files; @@ -207,22 +205,6 @@ void theCreatedFileSystemSupportsUrls() throws IOException { @Nested class MemoryFileSystemUrlHandlerProviderTest { - @DisplayName("The provider is registered as SPI in the module descriptor") - @Test - void providerIsRegisteredAsSpiInModuleDescriptor() { - // Given - var module = MemoryFileSystemUrlHandlerProvider.class.getModule(); - var providers = module.getDescriptor() - .provides() - .stream() - .filter(provide -> provide.service().equals(URLStreamHandlerProvider.class.getName())) - .flatMap(provide -> provide.providers().stream()); - - // Then - assertThat(providers) - .contains(MemoryFileSystemUrlHandlerProvider.class.getName()); - } - @DisplayName("The provider returns a handler for the 'memory' protocol") @ValueSource(strings = { "memory://foo/bar/baz", diff --git a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/impl/WrappingDirectoryImplTest.java b/java-compiler-testing/src/test/java/io/github/ascopes/jct/workspaces/impl/WrappingDirectoryImplTest.java similarity index 97% rename from java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/impl/WrappingDirectoryImplTest.java rename to java-compiler-testing/src/test/java/io/github/ascopes/jct/workspaces/impl/WrappingDirectoryImplTest.java index 0c86f1533..ace1c9845 100644 --- a/java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/workspaces/impl/WrappingDirectoryImplTest.java +++ b/java-compiler-testing/src/test/java/io/github/ascopes/jct/workspaces/impl/WrappingDirectoryImplTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.ascopes.jct.tests.unit.workspaces.impl; +package io.github.ascopes.jct.workspaces.impl; -import static io.github.ascopes.jct.tests.helpers.Fixtures.somePath; +import static io.github.ascopes.jct.fixtures.Fixtures.somePath; import static io.github.ascopes.jct.utils.FileUtils.retrieveRequiredUrl; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -26,7 +26,6 @@ import io.github.ascopes.jct.utils.FileUtils; import io.github.ascopes.jct.workspaces.PathRoot; -import io.github.ascopes.jct.workspaces.impl.WrappingDirectoryImpl; import java.util.ArrayList; import java.util.List; import java.util.stream.Stream; diff --git a/java-compiler-testing/src/test/java/module-info.java b/java-compiler-testing/src/test/java/module-info.java deleted file mode 100644 index d639c839b..000000000 --- a/java-compiler-testing/src/test/java/module-info.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2022 - 2024, the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.jspecify.annotations.NullMarked; - -@NullMarked -open module io.github.ascopes.jct.testing { - requires awaitility; - requires transitive io.github.ascopes.jct; - requires java.compiler; - requires java.management; - requires com.github.marschall.memoryfilesystem; - requires me.xdrop.fuzzywuzzy; - requires net.bytebuddy; // required for mockito to work with JPMS. - requires net.bytebuddy.agent; // required for mockito to work with JPMS. - requires org.assertj.core; - requires org.hamcrest; - requires static org.jspecify; - requires transitive org.junit.jupiter.api; - requires transitive org.junit.jupiter.engine; - requires transitive org.junit.jupiter.params; - requires transitive org.junit.platform.commons; - requires transitive org.junit.platform.engine; - requires transitive org.junit.platform.testkit; - requires org.mockito; - requires org.mockito.junit.jupiter; - requires org.slf4j; - - // Used for MemoryFileSystemProviderImplTest$MemoryFileSystemUrlHandlerProviderTest - uses java.net.spi.URLStreamHandlerProvider; -} diff --git a/java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/BasicLegacyCompilationIntegrationTest/HelloWorld.java b/java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/BasicLegacyCompilationIntegrationTest_resources/HelloWorld.java similarity index 100% rename from java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/BasicLegacyCompilationIntegrationTest/HelloWorld.java rename to java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/BasicLegacyCompilationIntegrationTest_resources/HelloWorld.java diff --git a/java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/BasicModuleCompilationIntegrationTest/com/example/HelloWorld.java b/java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/BasicModuleCompilationIntegrationTest_resources/com/example/HelloWorld.java similarity index 100% rename from java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/BasicModuleCompilationIntegrationTest/com/example/HelloWorld.java rename to java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/BasicModuleCompilationIntegrationTest_resources/com/example/HelloWorld.java diff --git a/java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/BasicModuleCompilationIntegrationTest/module-info.java b/java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/BasicModuleCompilationIntegrationTest_resources/module-info.java similarity index 100% rename from java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/BasicModuleCompilationIntegrationTest/module-info.java rename to java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/BasicModuleCompilationIntegrationTest_resources/module-info.java diff --git a/java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/BasicMultiModuleCompilationIntegrationTest/greeter/com/example/greeter/Greeter.java b/java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/BasicMultiModuleCompilationIntegrationTest_resources/greeter/com/example/greeter/Greeter.java similarity index 100% rename from java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/BasicMultiModuleCompilationIntegrationTest/greeter/com/example/greeter/Greeter.java rename to java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/BasicMultiModuleCompilationIntegrationTest_resources/greeter/com/example/greeter/Greeter.java diff --git a/java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/BasicMultiModuleCompilationIntegrationTest/greeter/module-info.java b/java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/BasicMultiModuleCompilationIntegrationTest_resources/greeter/module-info.java similarity index 100% rename from java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/BasicMultiModuleCompilationIntegrationTest/greeter/module-info.java rename to java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/BasicMultiModuleCompilationIntegrationTest_resources/greeter/module-info.java diff --git a/java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/BasicMultiModuleCompilationIntegrationTest/hello.world.crossmodule/com/example/HelloWorld.java b/java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/BasicMultiModuleCompilationIntegrationTest_resources/hello.world.crossmodule/com/example/HelloWorld.java similarity index 100% rename from java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/BasicMultiModuleCompilationIntegrationTest/hello.world.crossmodule/com/example/HelloWorld.java rename to java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/BasicMultiModuleCompilationIntegrationTest_resources/hello.world.crossmodule/com/example/HelloWorld.java diff --git a/java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/BasicMultiModuleCompilationIntegrationTest/hello.world.crossmodule/module-info.java b/java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/BasicMultiModuleCompilationIntegrationTest_resources/hello.world.crossmodule/module-info.java similarity index 100% rename from java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/BasicMultiModuleCompilationIntegrationTest/hello.world.crossmodule/module-info.java rename to java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/BasicMultiModuleCompilationIntegrationTest_resources/hello.world.crossmodule/module-info.java diff --git a/java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/BasicMultiModuleCompilationIntegrationTest/hello.world.singlemodule/com/example/HelloWorld.java b/java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/BasicMultiModuleCompilationIntegrationTest_resources/hello.world.singlemodule/com/example/HelloWorld.java similarity index 100% rename from java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/BasicMultiModuleCompilationIntegrationTest/hello.world.singlemodule/com/example/HelloWorld.java rename to java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/BasicMultiModuleCompilationIntegrationTest_resources/hello.world.singlemodule/com/example/HelloWorld.java diff --git a/java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/BasicMultiModuleCompilationIntegrationTest/hello.world.singlemodule/module-info.java b/java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/BasicMultiModuleCompilationIntegrationTest_resources/hello.world.singlemodule/module-info.java similarity index 100% rename from java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/BasicMultiModuleCompilationIntegrationTest/hello.world.singlemodule/module-info.java rename to java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/BasicMultiModuleCompilationIntegrationTest_resources/hello.world.singlemodule/module-info.java diff --git a/java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/CompilingSpecificClassesIntegrationTest/Fibonacci.java b/java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/CompilingSpecificClassesIntegrationTest_resources/Fibonacci.java similarity index 100% rename from java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/CompilingSpecificClassesIntegrationTest/Fibonacci.java rename to java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/CompilingSpecificClassesIntegrationTest_resources/Fibonacci.java diff --git a/java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/CompilingSpecificClassesIntegrationTest/HelloWorld.java b/java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/CompilingSpecificClassesIntegrationTest_resources/HelloWorld.java similarity index 100% rename from java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/CompilingSpecificClassesIntegrationTest/HelloWorld.java rename to java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/CompilingSpecificClassesIntegrationTest_resources/HelloWorld.java diff --git a/java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/CompilingSpecificClassesIntegrationTest/Sum.java b/java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/CompilingSpecificClassesIntegrationTest_resources/Sum.java similarity index 100% rename from java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/CompilingSpecificClassesIntegrationTest/Sum.java rename to java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/CompilingSpecificClassesIntegrationTest_resources/Sum.java diff --git a/java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/MultiTieredCompilationIntegrationTest/first/Adder.java b/java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/MultiTieredCompilationIntegrationTest_resources/first/Adder.java similarity index 100% rename from java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/MultiTieredCompilationIntegrationTest/first/Adder.java rename to java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/MultiTieredCompilationIntegrationTest_resources/first/Adder.java diff --git a/java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/MultiTieredCompilationIntegrationTest/second/Main.java b/java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/MultiTieredCompilationIntegrationTest_resources/second/Main.java similarity index 100% rename from java-compiler-testing/src/test/resources/io/github/ascopes/jct/tests/integration/compilation/MultiTieredCompilationIntegrationTest/second/Main.java rename to java-compiler-testing/src/test/resources/io/github/ascopes/jct/integration/compilation/MultiTieredCompilationIntegrationTest_resources/second/Main.java diff --git a/pom.xml b/pom.xml index 21d14b88c..e9d8e0649 100644 --- a/pom.xml +++ b/pom.xml @@ -282,7 +282,7 @@ random - true + false + false