Removed superfluous public for tests

This commit is contained in:
Karl Heinz Marbaise
2023-08-25 15:36:58 +02:00
parent 15d622e185
commit c096ac8f57
47 changed files with 48 additions and 48 deletions

View File

@@ -76,6 +76,6 @@ public class TestClientOutput implements ClientOutput {
} }
public List<String> messagesToString() { public List<String> messagesToString() {
return messages.stream().map(m -> m.toString()).collect(Collectors.toList()); return messages.stream().map(Object::toString).collect(Collectors.toList());
} }
} }

View File

@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@TestInstance(TestInstance.Lifecycle.PER_CLASS) @TestInstance(TestInstance.Lifecycle.PER_CLASS)
@Testcontainers(disabledWithoutDocker = true) @Testcontainers(disabledWithoutDocker = true)
public class AlpineLinuxNativeIT { class AlpineLinuxNativeIT {
private ImageFromDockerfile image; private ImageFromDockerfile image;
private String mvndHome; private String mvndHome;

View File

@@ -23,7 +23,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
@TestInstance(TestInstance.Lifecycle.PER_CLASS) @TestInstance(TestInstance.Lifecycle.PER_CLASS)
@Testcontainers(disabledWithoutDocker = true) @Testcontainers(disabledWithoutDocker = true)
public class AlpineLinuxTest extends AlpineLinuxNativeIT { class AlpineLinuxTest extends AlpineLinuxNativeIT {
@Override @Override
protected boolean isNative() { protected boolean isNative() {

View File

@@ -26,7 +26,7 @@ import org.mvndaemon.mvnd.client.Client;
import org.mvndaemon.mvnd.junit.MvndTest; import org.mvndaemon.mvnd.junit.MvndTest;
@MvndTest(projectDir = "src/test/projects/attached-artifact-resolution") @MvndTest(projectDir = "src/test/projects/attached-artifact-resolution")
public class AttachedArtifactResolutionTest { class AttachedArtifactResolutionTest {
@Inject @Inject
Client client; Client client;

View File

@@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.fail;
@MvndTest(projectDir = "src/test/projects/bootstrap-plugin") @MvndTest(projectDir = "src/test/projects/bootstrap-plugin")
@DisabledOnOs(OS.WINDOWS) @DisabledOnOs(OS.WINDOWS)
public class BootstrapPluginTest { class BootstrapPluginTest {
@Inject @Inject
Client client; Client client;

View File

@@ -29,7 +29,7 @@ import org.mvndaemon.mvnd.junit.MvndNativeTest;
import org.mvndaemon.mvnd.junit.MvndTestExtension; import org.mvndaemon.mvnd.junit.MvndTestExtension;
@MvndNativeTest(projectDir = MvndTestExtension.TEMP_EXTERNAL) @MvndNativeTest(projectDir = MvndTestExtension.TEMP_EXTERNAL)
public class CompletionNativeIT { class CompletionNativeIT {
@Inject @Inject
Client client; Client client;

View File

@@ -22,4 +22,4 @@ import org.mvndaemon.mvnd.junit.MvndTest;
import org.mvndaemon.mvnd.junit.MvndTestExtension; import org.mvndaemon.mvnd.junit.MvndTestExtension;
@MvndTest(projectDir = MvndTestExtension.TEMP_EXTERNAL) @MvndTest(projectDir = MvndTestExtension.TEMP_EXTERNAL)
public class CompletionTest extends CompletionNativeIT {} class CompletionTest extends CompletionNativeIT {}

View File

@@ -33,7 +33,7 @@ import org.mvndaemon.mvnd.junit.TestParameters;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
@MvndTest(projectDir = "src/test/projects/concurrent-downloads") @MvndTest(projectDir = "src/test/projects/concurrent-downloads")
public class ConcurrentDownloadsTest { class ConcurrentDownloadsTest {
@Inject @Inject
ClientFactory clientFactory; ClientFactory clientFactory;

View File

@@ -38,7 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
@MvndTest(projectDir = "src/test/projects/daemon-crash", keepAlive = "100ms", maxLostKeepAlive = "30") @MvndTest(projectDir = "src/test/projects/daemon-crash", keepAlive = "100ms", maxLostKeepAlive = "30")
@Timeout(60) @Timeout(60)
public class DaemonCrashTest { class DaemonCrashTest {
@Inject @Inject
Client client; Client client;

View File

@@ -33,7 +33,7 @@ import org.mvndaemon.mvnd.junit.MvndNativeTest;
import org.mvndaemon.mvnd.junit.TestUtils; import org.mvndaemon.mvnd.junit.TestUtils;
@MvndNativeTest(projectDir = "src/test/projects/delete-repo") @MvndNativeTest(projectDir = "src/test/projects/delete-repo")
public class DeleteRepoNativeIT { class DeleteRepoNativeIT {
@Inject @Inject
Client client; Client client;

View File

@@ -21,4 +21,4 @@ package org.mvndaemon.mvnd.it;
import org.mvndaemon.mvnd.junit.MvndTest; import org.mvndaemon.mvnd.junit.MvndTest;
@MvndTest(projectDir = "src/test/projects/delete-repo") @MvndTest(projectDir = "src/test/projects/delete-repo")
public class DeleteRepoTest extends DeleteRepoNativeIT {} class DeleteRepoTest extends DeleteRepoNativeIT {}

View File

@@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotNull;
public class DistroIT { class DistroIT {
/** /**
* Asserts that we do not have the same libs in lib/ext and in lib or boot directories. * Asserts that we do not have the same libs in lib/ext and in lib or boot directories.

View File

@@ -29,7 +29,7 @@ import org.mvndaemon.mvnd.client.DaemonParameters;
import org.mvndaemon.mvnd.junit.MvndTest; import org.mvndaemon.mvnd.junit.MvndTest;
@MvndTest(projectDir = "src/test/projects/dup-ga") @MvndTest(projectDir = "src/test/projects/dup-ga")
public class DupGATest { class DupGATest {
@Inject @Inject
Client client; Client client;

View File

@@ -36,7 +36,7 @@ import org.mvndaemon.mvnd.junit.TestRegistry;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
@MvndTest(projectDir = "src/test/projects/environment") @MvndTest(projectDir = "src/test/projects/environment")
public class EnvironmentTest { class EnvironmentTest {
@Inject @Inject
TestRegistry registry; TestRegistry registry;

View File

@@ -31,7 +31,7 @@ import org.mvndaemon.mvnd.junit.MvndTest;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
@MvndTest(projectDir = "src/test/projects/exec-output") @MvndTest(projectDir = "src/test/projects/exec-output")
public class ExecOutputTest { class ExecOutputTest {
@Inject @Inject
Client client; Client client;

View File

@@ -27,7 +27,7 @@ import org.mvndaemon.mvnd.client.DaemonParameters;
import org.mvndaemon.mvnd.junit.MvndNativeTest; import org.mvndaemon.mvnd.junit.MvndNativeTest;
@MvndNativeTest(projectDir = "src/test/projects/extension-with-api") @MvndNativeTest(projectDir = "src/test/projects/extension-with-api")
public class ExtensionWithApiNativeIT { class ExtensionWithApiNativeIT {
@Inject @Inject
Client client; Client client;

View File

@@ -34,7 +34,7 @@ import org.mvndaemon.mvnd.junit.TestRegistry;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
@MvndNativeTest(projectDir = "src/test/projects/extensions") @MvndNativeTest(projectDir = "src/test/projects/extensions")
public class ExtensionsNativeIT { class ExtensionsNativeIT {
@Inject @Inject
Client client; Client client;

View File

@@ -21,4 +21,4 @@ package org.mvndaemon.mvnd.it;
import org.mvndaemon.mvnd.junit.MvndTest; import org.mvndaemon.mvnd.junit.MvndTest;
@MvndTest(projectDir = "src/test/projects/extensions") @MvndTest(projectDir = "src/test/projects/extensions")
public class ExtensionsTest extends ExtensionsNativeIT {} class ExtensionsTest extends ExtensionsNativeIT {}

View File

@@ -31,7 +31,7 @@ import org.mvndaemon.mvnd.junit.MvndTest;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
@MvndTest(projectDir = "src/test/projects/forked") @MvndTest(projectDir = "src/test/projects/forked")
public class ForkedTest { class ForkedTest {
@Inject @Inject
Client client; Client client;

View File

@@ -34,7 +34,7 @@ import org.mvndaemon.mvnd.junit.MvndTest;
@MvndTest(projectDir = "src/test/projects/single-module") @MvndTest(projectDir = "src/test/projects/single-module")
@Timeout(300) @Timeout(300)
public class InteractiveTest { class InteractiveTest {
@Inject @Inject
Client client; Client client;

View File

@@ -35,7 +35,7 @@ import org.mvndaemon.mvnd.client.DaemonParameters;
import org.mvndaemon.mvnd.junit.MvndNativeTest; import org.mvndaemon.mvnd.junit.MvndNativeTest;
@MvndNativeTest(projectDir = "src/test/projects/invoker") @MvndNativeTest(projectDir = "src/test/projects/invoker")
public class InvokerNativeIT { class InvokerNativeIT {
@Inject @Inject
Client client; Client client;

View File

@@ -21,4 +21,4 @@ package org.mvndaemon.mvnd.it;
import org.mvndaemon.mvnd.junit.MvndTest; import org.mvndaemon.mvnd.junit.MvndTest;
@MvndTest(projectDir = "src/test/projects/invoker") @MvndTest(projectDir = "src/test/projects/invoker")
public class InvokerTest extends InvokerNativeIT {} class InvokerTest extends InvokerNativeIT {}

View File

@@ -30,7 +30,7 @@ import org.mvndaemon.mvnd.junit.MvndTest;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
@MvndTest(projectDir = "src/test/projects/junit-platform") @MvndTest(projectDir = "src/test/projects/junit-platform")
public class JUnitPlatformTest { class JUnitPlatformTest {
@Inject @Inject
Client client; Client client;

View File

@@ -31,7 +31,7 @@ import org.mvndaemon.mvnd.junit.MvndNativeTest;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
@MvndNativeTest(projectDir = "src/test/projects/maven-conf") @MvndNativeTest(projectDir = "src/test/projects/maven-conf")
public class MavenConfNativeIT { class MavenConfNativeIT {
@Inject @Inject
Client client; Client client;

View File

@@ -21,4 +21,4 @@ package org.mvndaemon.mvnd.it;
import org.mvndaemon.mvnd.junit.MvndTest; import org.mvndaemon.mvnd.junit.MvndTest;
@MvndTest(projectDir = "src/test/projects/maven-conf") @MvndTest(projectDir = "src/test/projects/maven-conf")
public class MavenConfTest extends MavenConfNativeIT {} class MavenConfTest extends MavenConfNativeIT {}

View File

@@ -36,7 +36,7 @@ import org.slf4j.spi.LocationAwareLogger;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
public class MaxHeapNativeIT { class MaxHeapNativeIT {
static class BaseTest { static class BaseTest {

View File

@@ -20,7 +20,7 @@ package org.mvndaemon.mvnd.it;
import org.mvndaemon.mvnd.junit.MvndTest; import org.mvndaemon.mvnd.junit.MvndTest;
public class MaxHeapTest extends MaxHeapNativeIT { class MaxHeapTest extends MaxHeapNativeIT {
@MvndTest(projectDir = "src/test/projects/max-heap/default-heap") @MvndTest(projectDir = "src/test/projects/max-heap/default-heap")
static class DefaultConfig extends MaxHeapNativeIT.DefaultConfig {} static class DefaultConfig extends MaxHeapNativeIT.DefaultConfig {}

View File

@@ -35,7 +35,7 @@ import org.mvndaemon.mvnd.junit.MvndNativeTest;
import org.mvndaemon.mvnd.junit.TestUtils; import org.mvndaemon.mvnd.junit.TestUtils;
@MvndNativeTest(projectDir = "src/test/projects/module-and-plugin") @MvndNativeTest(projectDir = "src/test/projects/module-and-plugin")
public class ModuleAndPluginNativeIT { class ModuleAndPluginNativeIT {
@Inject @Inject
Client client; Client client;

View File

@@ -21,4 +21,4 @@ package org.mvndaemon.mvnd.it;
import org.mvndaemon.mvnd.junit.MvndTest; import org.mvndaemon.mvnd.junit.MvndTest;
@MvndTest(projectDir = "src/test/projects/module-and-plugin") @MvndTest(projectDir = "src/test/projects/module-and-plugin")
public class ModuleAndPluginTest extends ModuleAndPluginNativeIT {} class ModuleAndPluginTest extends ModuleAndPluginNativeIT {}

View File

@@ -29,7 +29,7 @@ import org.mvndaemon.mvnd.junit.MvndTest;
import org.mvndaemon.mvnd.junit.TestParameters; import org.mvndaemon.mvnd.junit.TestParameters;
@MvndTest(projectDir = "src/test/projects/multi-lookup") @MvndTest(projectDir = "src/test/projects/multi-lookup")
public class MultiLookupTest { class MultiLookupTest {
@Inject @Inject
ClientFactory clientFactory; ClientFactory clientFactory;

View File

@@ -40,7 +40,7 @@ import org.mvndaemon.mvnd.common.Message.StringMessage;
import org.mvndaemon.mvnd.junit.MvndTest; import org.mvndaemon.mvnd.junit.MvndTest;
@MvndTest(projectDir = "src/test/projects/multi-module") @MvndTest(projectDir = "src/test/projects/multi-module")
public class MultiModuleTest { class MultiModuleTest {
@Inject @Inject
Client client; Client client;

View File

@@ -37,7 +37,7 @@ import org.mvndaemon.mvnd.junit.TestParameters;
import org.mvndaemon.mvnd.junit.TestRegistry; import org.mvndaemon.mvnd.junit.TestRegistry;
@MvndNativeTest(projectDir = "src/test/projects/new-managed-module") @MvndNativeTest(projectDir = "src/test/projects/new-managed-module")
public class NewManagedModuleNativeIT { class NewManagedModuleNativeIT {
@Inject @Inject
TestParameters parameters; TestParameters parameters;

View File

@@ -21,4 +21,4 @@ package org.mvndaemon.mvnd.it;
import org.mvndaemon.mvnd.junit.MvndTest; import org.mvndaemon.mvnd.junit.MvndTest;
@MvndTest(projectDir = "src/test/projects/new-managed-module") @MvndTest(projectDir = "src/test/projects/new-managed-module")
public class NewManagedModuleTest extends NewManagedModuleNativeIT {} class NewManagedModuleTest extends NewManagedModuleNativeIT {}

View File

@@ -32,7 +32,7 @@ import org.mvndaemon.mvnd.junit.TestRegistry;
import org.mvndaemon.mvnd.junit.TestUtils; import org.mvndaemon.mvnd.junit.TestUtils;
@MvndTest(projectDir = "src/test/projects/parent-with-property") @MvndTest(projectDir = "src/test/projects/parent-with-property")
public class ParentWithPropertyTest { class ParentWithPropertyTest {
@Inject @Inject
Client client; Client client;

View File

@@ -33,7 +33,7 @@ import org.mvndaemon.mvnd.junit.TestRegistry;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
@MvndTest(projectDir = "src/test/projects/raw-streams") @MvndTest(projectDir = "src/test/projects/raw-streams")
public class RawStreamsTest { class RawStreamsTest {
@Inject @Inject
Client client; Client client;

View File

@@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
@MvndTest(projectDir = "src/test/projects/resident-extensions") @MvndTest(projectDir = "src/test/projects/resident-extensions")
public class ResidentExtensionsTest { class ResidentExtensionsTest {
@Inject @Inject
ClientFactory clientFactory; ClientFactory clientFactory;

View File

@@ -37,7 +37,7 @@ import org.mvndaemon.mvnd.common.Message;
import org.mvndaemon.mvnd.junit.MvndNativeTest; import org.mvndaemon.mvnd.junit.MvndNativeTest;
@MvndNativeTest(projectDir = "src/test/projects/single-module") @MvndNativeTest(projectDir = "src/test/projects/single-module")
public class SingleModuleNativeIT { class SingleModuleNativeIT {
@Inject @Inject
Client client; Client client;

View File

@@ -29,12 +29,12 @@ import org.mvndaemon.mvnd.common.Message;
import org.mvndaemon.mvnd.junit.MvndTest; import org.mvndaemon.mvnd.junit.MvndTest;
@MvndTest(projectDir = "src/test/projects/single-module") @MvndTest(projectDir = "src/test/projects/single-module")
public class SingleModuleTest extends SingleModuleNativeIT { class SingleModuleTest extends SingleModuleNativeIT {
protected void assertJVM(TestClientOutput o, Properties props) { protected void assertJVM(TestClientOutput o, Properties props) {
final List<String> filteredMessages = o.getMessages().stream() final List<String> filteredMessages = o.getMessages().stream()
.filter(m -> m.getType() == Message.MOJO_STARTED) .filter(m -> m.getType() == Message.MOJO_STARTED)
.map(m -> m.toString()) .map(Object::toString)
.collect(Collectors.toList()); .collect(Collectors.toList());
Assertions.assertThat(filteredMessages) Assertions.assertThat(filteredMessages)

View File

@@ -40,7 +40,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* in the test iself. * in the test iself.
*/ */
@MvndNativeTest(projectDir = "src/test/projects/specific-file") @MvndNativeTest(projectDir = "src/test/projects/specific-file")
public class SpecificFileNativeIT { class SpecificFileNativeIT {
@Inject @Inject
ClientFactory clientFactory; ClientFactory clientFactory;

View File

@@ -32,7 +32,7 @@ import org.mvndaemon.mvnd.junit.MvndTest;
import org.mvndaemon.mvnd.junit.TestRegistry; import org.mvndaemon.mvnd.junit.TestRegistry;
@MvndTest(projectDir = "src/test/projects/single-module") @MvndTest(projectDir = "src/test/projects/single-module")
public class StopStatusTest { class StopStatusTest {
@Inject @Inject
Client client; Client client;

View File

@@ -29,7 +29,7 @@ import org.mvndaemon.mvnd.client.DaemonParameters;
import org.mvndaemon.mvnd.junit.MvndNativeTest; import org.mvndaemon.mvnd.junit.MvndNativeTest;
@MvndNativeTest(projectDir = "src/test/projects/multi-module") @MvndNativeTest(projectDir = "src/test/projects/multi-module")
public class ThreadOptionNativeIT { class ThreadOptionNativeIT {
@Inject @Inject
Client client; Client client;

View File

@@ -21,4 +21,4 @@ package org.mvndaemon.mvnd.it;
import org.mvndaemon.mvnd.junit.MvndTest; import org.mvndaemon.mvnd.junit.MvndTest;
@MvndTest(projectDir = "src/test/projects/multi-module") @MvndTest(projectDir = "src/test/projects/multi-module")
public class ThreadOptionTest extends ThreadOptionNativeIT {} class ThreadOptionTest extends ThreadOptionNativeIT {}

View File

@@ -29,7 +29,7 @@ import org.mvndaemon.mvnd.client.DaemonParameters;
import org.mvndaemon.mvnd.junit.MvndTest; import org.mvndaemon.mvnd.junit.MvndTest;
@MvndTest(projectDir = "src/test/projects/type-description") @MvndTest(projectDir = "src/test/projects/type-description")
public class TypeDescriptionTest { class TypeDescriptionTest {
@Inject @Inject
Client client; Client client;

View File

@@ -36,7 +36,7 @@ import org.mvndaemon.mvnd.junit.TestRegistry;
import org.mvndaemon.mvnd.junit.TestUtils; import org.mvndaemon.mvnd.junit.TestUtils;
@MvndNativeTest(projectDir = "src/test/projects/upgrades-in-bom") @MvndNativeTest(projectDir = "src/test/projects/upgrades-in-bom")
public class UpgradesInBomNativeIT { class UpgradesInBomNativeIT {
@Inject @Inject
TestParameters parameters; TestParameters parameters;

View File

@@ -21,4 +21,4 @@ package org.mvndaemon.mvnd.it;
import org.mvndaemon.mvnd.junit.MvndTest; import org.mvndaemon.mvnd.junit.MvndTest;
@MvndTest(projectDir = "src/test/projects/upgrades-in-bom") @MvndTest(projectDir = "src/test/projects/upgrades-in-bom")
public class UpgradesInBomTest extends UpgradesInBomNativeIT {} class UpgradesInBomTest extends UpgradesInBomNativeIT {}

View File

@@ -30,7 +30,7 @@ import org.mvndaemon.mvnd.junit.MvndNativeTest;
import org.mvndaemon.mvnd.junit.MvndTestExtension; import org.mvndaemon.mvnd.junit.MvndTestExtension;
@MvndNativeTest(projectDir = MvndTestExtension.TEMP_EXTERNAL) @MvndNativeTest(projectDir = MvndTestExtension.TEMP_EXTERNAL)
public class VersionNativeIT { class VersionNativeIT {
@Inject @Inject
Client client; Client client;

View File

@@ -22,7 +22,7 @@ import org.mvndaemon.mvnd.junit.MvndTest;
import org.mvndaemon.mvnd.junit.MvndTestExtension; import org.mvndaemon.mvnd.junit.MvndTestExtension;
@MvndTest(projectDir = MvndTestExtension.TEMP_EXTERNAL) @MvndTest(projectDir = MvndTestExtension.TEMP_EXTERNAL)
public class VersionTest extends VersionNativeIT { class VersionTest extends VersionNativeIT {
protected boolean isNative() { protected boolean isNative() {
return false; return false;
} }