diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java index 4b6689b3b..ad3b2bf3c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java @@ -103,65 +103,59 @@ public void handle( int port = ((NetworkConnector) server.getConnectors()[0]).getLocalPort(); - { - // phase 1: run build in online mode to fill local repo - Verifier verifier = newVerifier(testDir.getAbsolutePath()); - verifier.setAutoclean(false); - verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng0768"); - verifier.setLogFileName("log1.txt"); - Properties props = new Properties(); - props.put("@port@", Integer.toString(port)); - verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8", props); - verifier.addCliArgument("--settings"); - verifier.addCliArgument("settings.xml"); - verifier.addCliArgument( - "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile"); - verifier.execute(); - verifier.verifyFilePresent("target/compile.txt"); - verifier.verifyErrorFreeLog(); - } + // phase 1: run build in online mode to fill local repo + Verifier verifier = newVerifier(testDir.getAbsolutePath()); + verifier.setAutoclean(false); + verifier.deleteDirectory("target"); + verifier.deleteArtifacts("org.apache.maven.its.mng0768"); + verifier.setLogFileName("log1.txt"); + Properties props = new Properties(); + props.put("@port@", Integer.toString(port)); + verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8", props); + verifier.addCliArgument("--settings"); + verifier.addCliArgument("settings.xml"); + verifier.addCliArgument( + "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile"); + verifier.execute(); + verifier.verifyFilePresent("target/compile.txt"); + verifier.verifyErrorFreeLog(); requestedUris.clear(); - { - // phase 2: run build in offline mode to check it still passes, without network accesses - Verifier verifier = newVerifier(testDir.getAbsolutePath()); - verifier.setAutoclean(false); - verifier.deleteDirectory("target"); - verifier.addCliArgument("-o"); - verifier.addCliArgument("--settings"); - verifier.addCliArgument("settings.xml"); - verifier.setLogFileName("log2.txt"); + // phase 2: run build in offline mode to check it still passes, without network accesses + verifier = newVerifier(testDir.getAbsolutePath()); + verifier.setAutoclean(false); + verifier.deleteDirectory("target"); + verifier.addCliArgument("-o"); + verifier.addCliArgument("--settings"); + verifier.addCliArgument("settings.xml"); + verifier.setLogFileName("log2.txt"); + verifier.addCliArgument( + "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile"); + verifier.execute(); + verifier.verifyFilePresent("target/compile.txt"); + verifier.verifyErrorFreeLog(); + + assertTrue(requestedUris.toString(), requestedUris.isEmpty()); + + // phase 3: delete test artifact and run build in offline mode to check it fails now + // NOTE: Adding the settings again to offer Maven the bad choice of using the remote repo + verifier = newVerifier(testDir.getAbsolutePath()); + verifier.setAutoclean(false); + verifier.deleteDirectory("target"); + verifier.deleteArtifacts("org.apache.maven.its.mng0768"); + verifier.addCliArgument("-o"); + verifier.addCliArgument("--settings"); + verifier.addCliArgument("settings.xml"); + verifier.setLogFileName("log3.txt"); + try { verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile"); verifier.execute(); - verifier.verifyFilePresent("target/compile.txt"); verifier.verifyErrorFreeLog(); - } - - assertTrue(requestedUris.toString(), requestedUris.isEmpty()); - - { - // phase 3: delete test artifact and run build in offline mode to check it fails now - // NOTE: Adding the settings again to offer Maven the bad choice of using the remote repo - Verifier verifier = newVerifier(testDir.getAbsolutePath()); - verifier.setAutoclean(false); - verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng0768"); - verifier.addCliArgument("-o"); - verifier.addCliArgument("--settings"); - verifier.addCliArgument("settings.xml"); - verifier.setLogFileName("log3.txt"); - try { - verifier.addCliArgument( - "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile"); - verifier.execute(); - verifier.verifyErrorFreeLog(); - fail("Build did not fail to resolve missing dependency although Maven ought to work offline!"); - } catch (VerificationException e) { - // expected, should fail - } + fail("Build did not fail to resolve missing dependency although Maven ought to work offline!"); + } catch (VerificationException e) { + // expected, should fail } System.out.println("Bound server socket to the port " + port); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java index cf863cf73..9516fdb1a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java @@ -47,37 +47,33 @@ public MavenITmng2695OfflinePluginSnapshotsTest() { public void testitMNG2695() throws Exception { File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-2695"); - { - // phase 1: run build in online mode to fill local repo - Verifier verifier = newVerifier(testDir.getAbsolutePath()); - verifier.deleteDirectory("target"); - verifier.deleteArtifacts("org.apache.maven.its.mng2695"); - verifier.setAutoclean(false); - verifier.setLogFileName("log1.txt"); - verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8"); - verifier.addCliArgument("--settings"); - verifier.addCliArgument("settings.xml"); - verifier.addCliArgument("validate"); - verifier.execute(); - verifier.verifyFilePresent("target/a.txt"); - verifier.verifyFilePresent("target/b.txt"); - verifier.verifyErrorFreeLog(); - } + // phase 1: run build in online mode to fill local repo + Verifier verifier = newVerifier(testDir.getAbsolutePath()); + verifier.deleteDirectory("target"); + verifier.deleteArtifacts("org.apache.maven.its.mng2695"); + verifier.setAutoclean(false); + verifier.setLogFileName("log1.txt"); + verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8"); + verifier.addCliArgument("--settings"); + verifier.addCliArgument("settings.xml"); + verifier.addCliArgument("validate"); + verifier.execute(); + verifier.verifyFilePresent("target/a.txt"); + verifier.verifyFilePresent("target/b.txt"); + verifier.verifyErrorFreeLog(); - { - // phase 2: run build in offline mode to check it still passes - Verifier verifier = newVerifier(testDir.getAbsolutePath()); - verifier.deleteDirectory("target"); - verifier.setAutoclean(false); - verifier.setLogFileName("log2.txt"); - verifier.addCliArgument("--settings"); - verifier.addCliArgument("settings.xml"); - verifier.addCliArgument("--offline"); - verifier.addCliArgument("validate"); - verifier.execute(); - verifier.verifyFilePresent("target/a.txt"); - verifier.verifyFilePresent("target/b.txt"); - verifier.verifyErrorFreeLog(); - } + // phase 2: run build in offline mode to check it still passes + verifier = newVerifier(testDir.getAbsolutePath()); + verifier.deleteDirectory("target"); + verifier.setAutoclean(false); + verifier.setLogFileName("log2.txt"); + verifier.addCliArgument("--settings"); + verifier.addCliArgument("settings.xml"); + verifier.addCliArgument("--offline"); + verifier.addCliArgument("validate"); + verifier.execute(); + verifier.verifyFilePresent("target/a.txt"); + verifier.verifyFilePresent("target/b.txt"); + verifier.verifyErrorFreeLog(); } } diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java index efc037949..b2fc8526c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java @@ -39,7 +39,7 @@ public MavenITmng2739RequiredRepositoryElementsTest() { } @Test - public void testitMNG2739_RepositoryId() throws Exception { + public void testitMNG2739RepositoryId() throws Exception { File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-2739/repo-id"); Verifier verifier; @@ -69,7 +69,7 @@ public void testitMNG2739_RepositoryId() throws Exception { } @Test - public void testitMNG2739_RepositoryUrl() throws Exception { + public void testitMNG2739RepositoryUrl() throws Exception { // The testdir is computed from the location of this // file. File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-2739/repo-url"); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java index 753b736a3..1126af7b0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java @@ -47,31 +47,27 @@ public MavenITmng3314OfflineSnapshotsTest() { public void testitMNG3314() throws Exception { File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-3314"); - { - // phase 1: run build in online mode to fill local repo - Verifier verifier = newVerifier(testDir.getAbsolutePath()); - verifier.deleteArtifacts("org.apache.maven.its.mng3314"); - verifier.setLogFileName("log1.txt"); - verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8"); - verifier.addCliArgument("--settings"); - verifier.addCliArgument("settings.xml"); - verifier.addCliArgument("validate"); - verifier.execute(); - verifier.verifyFilePresent("target/compile.txt"); - verifier.verifyErrorFreeLog(); - } + // phase 1: run build in online mode to fill local repo + Verifier verifier = newVerifier(testDir.getAbsolutePath()); + verifier.deleteArtifacts("org.apache.maven.its.mng3314"); + verifier.setLogFileName("log1.txt"); + verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8"); + verifier.addCliArgument("--settings"); + verifier.addCliArgument("settings.xml"); + verifier.addCliArgument("validate"); + verifier.execute(); + verifier.verifyFilePresent("target/compile.txt"); + verifier.verifyErrorFreeLog(); - { - // phase 2: run build in offline mode to check it still passes - Verifier verifier = newVerifier(testDir.getAbsolutePath()); - verifier.setLogFileName("log2.txt"); - verifier.addCliArgument("-o"); - verifier.addCliArgument("--settings"); - verifier.addCliArgument("settings.xml"); - verifier.addCliArgument("validate"); - verifier.execute(); - verifier.verifyFilePresent("target/compile.txt"); - verifier.verifyErrorFreeLog(); - } + // phase 2: run build in offline mode to check it still passes + verifier = newVerifier(testDir.getAbsolutePath()); + verifier.setLogFileName("log2.txt"); + verifier.addCliArgument("-o"); + verifier.addCliArgument("--settings"); + verifier.addCliArgument("settings.xml"); + verifier.addCliArgument("validate"); + verifier.execute(); + verifier.verifyFilePresent("target/compile.txt"); + verifier.verifyErrorFreeLog(); } } diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java index 746e3311e..76597819f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java @@ -36,7 +36,7 @@ */ class MavenITmng3477DependencyResolutionErrorMessageTest extends AbstractMavenIntegrationTestCase { - public MavenITmng3477DependencyResolutionErrorMessageTest() { + MavenITmng3477DependencyResolutionErrorMessageTest() { super("[3.9.8,)"); } diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java index c9109879d..3fbf651f1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java @@ -36,7 +36,7 @@ public MavenITmng3535SelfReferentialPropertiesTest() { } @Test - public void testitMNG3535_ShouldSucceed() throws Exception { + public void testitMNG3535ShouldSucceed() throws Exception { File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-3535/success"); Verifier verifier = newVerifier(testDir.getAbsolutePath()); @@ -51,7 +51,7 @@ public void testitMNG3535_ShouldSucceed() throws Exception { } @Test - public void testitMNG3535_ShouldFail() throws Exception { + public void testitMNG3535ShouldFail() throws Exception { File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-3535/failure"); Verifier verifier = newVerifier(testDir.getAbsolutePath()); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java index d25b6fc9a..62519b55b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java @@ -100,7 +100,7 @@ protected void tearDown() throws Exception { * @throws Exception in case of failure */ @Test - public void testmng3652_UnConfiguredHttp() throws Exception { + public void testmng3652UnConfiguredHttp() throws Exception { File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-3652"); File pluginDir = new File(testDir, "test-plugin"); File projectDir = new File(testDir, "test-project"); @@ -134,7 +134,6 @@ public void testmng3652_UnConfiguredHttp() throws Exception { String mavenVersion = lines.get(0); String javaVersion = lines.get(1); String os = lines.get(2) + " " + lines.get(3); - String artifactVersion = lines.get(4); assertEquals( "Comparing User-Agent '" + userAgent + "'", @@ -143,7 +142,7 @@ public void testmng3652_UnConfiguredHttp() throws Exception { } @Test - public void testmng3652_UnConfiguredDAV() throws Exception { + public void testmng3652UnConfiguredDAV() throws Exception { File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-3652"); File pluginDir = new File(testDir, "test-plugin"); File projectDir = new File(testDir, "test-project"); @@ -176,7 +175,6 @@ public void testmng3652_UnConfiguredDAV() throws Exception { String mavenVersion = lines.get(0); String javaVersion = lines.get(1); String os = lines.get(2) + " " + lines.get(3); - String artifactVersion = lines.get(4); String userAgent = this.userAgent; assertNotNull(userAgent); @@ -188,7 +186,7 @@ public void testmng3652_UnConfiguredDAV() throws Exception { } @Test - public void testmng3652_ConfigurationInSettingsWithoutUserAgent() throws Exception { + public void testmng3652ConfigurationInSettingsWithoutUserAgent() throws Exception { File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-3652"); File pluginDir = new File(testDir, "test-plugin"); File projectDir = new File(testDir, "test-project"); @@ -223,7 +221,6 @@ public void testmng3652_ConfigurationInSettingsWithoutUserAgent() throws Excepti String mavenVersion = lines.get(0); String javaVersion = lines.get(1); String os = lines.get(2) + " " + lines.get(3); - String artifactVersion = lines.get(4); String userAgent = this.userAgent; assertNotNull(userAgent); @@ -235,7 +232,7 @@ public void testmng3652_ConfigurationInSettingsWithoutUserAgent() throws Excepti } @Test - public void testmng3652_UserAgentConfiguredInSettings() throws Exception { + public void testmng3652UserAgentConfiguredInSettings() throws Exception { File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-3652"); File pluginDir = new File(testDir, "test-plugin"); File projectDir = new File(testDir, "test-project"); @@ -267,7 +264,7 @@ public void testmng3652_UserAgentConfiguredInSettings() throws Exception { } @Test - public void testmng3652_AdditionnalHttpHeaderConfiguredInSettings() throws Exception { + public void testmng3652AdditionnalHttpHeaderConfiguredInSettings() throws Exception { File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-3652"); File pluginDir = new File(testDir, "test-plugin"); File projectDir = new File(testDir, "test-project"); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java index 490bd9384..42ddb090e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java @@ -39,7 +39,7 @@ public MavenITmng3710PollutedClonedPluginsTest() { } @Test - public void testitMNG3710_POMInheritance() throws Exception { + public void testitMNG3710POMInheritance() throws Exception { File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-3710/pom-inheritance"); File pluginDir = new File(testDir, "maven-mng3710-pomInheritance-plugin"); File projectsDir = new File(testDir, "projects"); @@ -69,7 +69,7 @@ public void testitMNG3710_POMInheritance() throws Exception { } @Test - public void testitMNG3710_OriginalModel() throws Exception { + public void testitMNG3710OriginalModel() throws Exception { File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-3710/original-model"); File pluginsDir = new File(testDir, "plugins"); File projectDir = new File(testDir, "project"); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java index eae8ae400..e1c8fcdf9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java @@ -38,7 +38,7 @@ public MavenITmng3746POMPropertyOverrideTest() { } @Test - public void testitMNG3746_UsingDefaultSystemProperty() throws Exception { + public void testitMNG3746UsingDefaultSystemProperty() throws Exception { // The testdir is computed from the location of this // file. File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-3746"); @@ -61,7 +61,7 @@ public void testitMNG3746_UsingDefaultSystemProperty() throws Exception { } @Test - public void testitMNG3746_UsingCLIProperty() throws Exception { + public void testitMNG3746UsingCLIProperty() throws Exception { // The testdir is computed from the location of this // file. File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-3746"); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java index cc581117b..248277b43 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java @@ -45,6 +45,7 @@ public MavenITmng3843PomInheritanceTest() { * @throws Exception in case of failure */ @Test + @SuppressWarnings("checkstyle:MethodLength") public void testitMNG3843() throws Exception { File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-3843"); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java index 4a1c21bf9..fe60d66b0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java @@ -38,7 +38,7 @@ public MavenITmng4091BadPluginDescriptorTest() { } @Test - public void testitMNG4091_InvalidDescriptor() throws Exception { + public void testitMNG4091InvalidDescriptor() throws Exception { File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-4091/invalid"); Verifier verifier = newVerifier(testDir.getAbsolutePath()); @@ -69,7 +69,7 @@ public void testitMNG4091_InvalidDescriptor() throws Exception { } @Test - public void testitMNG4091_PluginDependency() throws Exception { + public void testitMNG4091PluginDependency() throws Exception { File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-4091/plugin-dependency"); Verifier verifier = newVerifier(testDir.getAbsolutePath()); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java index 2cc2e4f31..974d95a94 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java @@ -155,7 +155,7 @@ public void testit() throws Exception { assertHash(verifier, "repo/org/apache/maven/its/mng4235/test/maven-metadata.xml", ".md5", "MD5"); for (DeployedResource deployedResource : repoHandler.deployedResources) { - if (StringUtils.equalsIgnoreCase("chunked", deployedResource.transferEncoding)) { + if (StringUtils.equalsIgnoreCase("chunked", deployedResource.getTransferEncoding())) { fail("deployedResource " + deployedResource + " use chunked transfert encoding some http server doesn't support that"); } @@ -190,12 +190,11 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques Files.copy(request.getInputStream(), resource.getFile().toPath(), REPLACE_EXISTING); - DeployedResource deployedResource = new DeployedResource(); - - deployedResource.httpMethod = request.getMethod(); - deployedResource.requestUri = request.getRequestURI(); - deployedResource.transferEncoding = request.getHeader("Transfer-Encoding"); - deployedResource.contentLength = request.getHeader("Content-Length"); + DeployedResource deployedResource = new DeployedResource( + request.getMethod(), + request.getRequestURI(), + request.getHeader("Content-Length"), + request.getHeader("Transfer-Encoding")); deployedResources.add(deployedResource); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java index c56d06536..b3db40bf3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java @@ -91,12 +91,11 @@ public void handle( ((Request) request).setHandled(true); } - DeployedResource deployedResource = new DeployedResource(); - - deployedResource.httpMethod = request.getMethod(); - deployedResource.requestUri = request.getRequestURI(); - deployedResource.transferEncoding = request.getHeader("Transfer-Encoding"); - deployedResource.contentLength = request.getHeader("Content-Length"); + DeployedResource deployedResource = new DeployedResource( + request.getMethod(), + request.getRequestURI(), + request.getHeader("Content-Length"), + request.getHeader("Transfer-Encoding")); deployedResources.add(deployedResource); System.out.println(tn + " Done (proxy) " + request.getMethod() + " " + request.getRequestURL()); @@ -119,12 +118,11 @@ public void handle( ((Request) request).setHandled(true); - DeployedResource deployedResource = new DeployedResource(); - - deployedResource.httpMethod = request.getMethod(); - deployedResource.requestUri = request.getRequestURI(); - deployedResource.transferEncoding = request.getHeader("Transfer-Encoding"); - deployedResource.contentLength = request.getHeader("Content-Length"); + DeployedResource deployedResource = new DeployedResource( + request.getMethod(), + request.getRequestURI(), + request.getHeader("Content-Length"), + request.getHeader("Transfer-Encoding")); deployedResources.add(deployedResource); System.out.println(tn + " Done (repos) " + request.getMethod() + " " + request.getRequestURL()); @@ -211,7 +209,7 @@ private void testit(String project) throws Exception { verifier.verifyErrorFreeLog(); for (DeployedResource deployedResource : deployedResources) { - if (StringUtils.equalsIgnoreCase("chunked", deployedResource.transferEncoding)) { + if (StringUtils.equalsIgnoreCase("chunked", deployedResource.getTransferEncoding())) { fail("deployedResource " + deployedResource + " use chunked transfert encoding some http server doesn't support that"); } diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java index 60a93dd8d..c65d69ce0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java @@ -100,7 +100,7 @@ protected void tearDown() throws Exception { * @throws Exception in case of failure */ @Test - public void testmng5175_ReadTimeOutFromSettings() throws Exception { + public void testmng5175ReadTimeOutFromSettings() throws Exception { File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-5175"); Verifier verifier = newVerifier(testDir.getAbsolutePath()); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java index 26c1b171f..bcd054332 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java @@ -46,7 +46,7 @@ public MavenITmng5224InjectedSettings() { * @throws Exception in case of failure */ @Test - public void testmng5224_ReadSettings() throws Exception { + public void testmng5224ReadSettings() throws Exception { File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-5224"); Verifier verifier = newVerifier(testDir.getAbsolutePath()); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java index a800fbea9..f1bcf24a6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java @@ -30,7 +30,7 @@ public MavenITmng5530MojoExecutionScopeTest() { } @Test - public void test_copyfiles() throws Exception { + public void testCopyfiles() throws Exception { File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-5530-mojo-execution-scope"); File pluginDir = new File(testDir, "plugin"); File projectDir = new File(testDir, "basic"); @@ -55,7 +55,7 @@ public void test_copyfiles() throws Exception { } @Test - public void test_copyfiles_multithreaded() throws Exception { + public void testCopyfilesMultithreaded() throws Exception { File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-5530-mojo-execution-scope"); File pluginDir = new File(testDir, "plugin"); File projectDir = new File(testDir, "basic"); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java index eaa2521c8..adc1650a0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java @@ -52,7 +52,7 @@ public void testBasic() throws Exception { } @Test - public void testBasic_multithreaded() throws Exception { + public void testBasicMultithreaded() throws Exception { File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-5578-session-scope"); File pluginDir = new File(testDir, "plugin"); File projectDir = new File(testDir, "basic"); @@ -78,7 +78,7 @@ public void testBasic_multithreaded() throws Exception { } @Test - public void testBasic_buildExtension() throws Exception { + public void testBasicBuildExtension() throws Exception { File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-5578-session-scope"); File pluginDir = new File(testDir, "plugin"); File projectDir = new File(testDir, "basic"); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6609ProfileActivationForPackagingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6609ProfileActivationForPackagingTest.java index 111f4a011..7abfa3bf9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6609ProfileActivationForPackagingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6609ProfileActivationForPackagingTest.java @@ -31,7 +31,7 @@ */ class MavenITmng6609ProfileActivationForPackagingTest extends AbstractMavenIntegrationTestCase { - public MavenITmng6609ProfileActivationForPackagingTest() { + MavenITmng6609ProfileActivationForPackagingTest() { super("[3.9.0,4.0.0-alpha-1),[4.0.0-alpha-3,)"); } diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java index 78776e7e9..d649c0ed5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java @@ -35,7 +35,7 @@ */ class MavenITmng6720FailFastTest extends AbstractMavenIntegrationTestCase { - public MavenITmng6720FailFastTest() { + MavenITmng6720FailFastTest() { super("[3.6.2,)"); } diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java index 4d0f4e804..5a8c341ef 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java @@ -42,6 +42,7 @@ public MavenITmng6754TimestampInMultimoduleProject() { } @Test + @SuppressWarnings("checkstyle:MethodLength") public void testArtifactsHaveSameTimestamp() throws Exception { final File testDir = ResourceExtractor.simpleExtractResources(getClass(), RESOURCE_PATH); final Verifier verifier = newVerifier(testDir.getAbsolutePath()); @@ -364,6 +365,8 @@ private void assertEquals(String moduleName, String location, String field, Stri case "remote": phase = "Deployed"; break; + default: + throw new IllegalArgumentException("Unknown location: " + location); } assertEquals( String.format( @@ -382,6 +385,8 @@ private void assertPathExists(Path repoDir, String moduleName, String location, case "remote": phase = "Deployed"; break; + default: + throw new IllegalArgumentException("Unknown location: " + location); } Path file = getRepoFile(repoDir, moduleName, version, fileName); assertTrue( diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java index 4971f6ce4..68dc74205 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java @@ -45,7 +45,6 @@ public void testDeadlock() throws IOException, VerificationException { final File consumerDir = new File(rootDir, "consumer"); final Verifier consumerVerifier = newVerifier(consumerDir.getAbsolutePath()); consumerVerifier.setForkJvm(true); - ; consumerVerifier.addCliArgument("-T2"); consumerVerifier.addCliArgument("package"); consumerVerifier.execute(); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7566JavaPrerequisiteTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7566JavaPrerequisiteTest.java index 1fcb8674a..f8598acdb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7566JavaPrerequisiteTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7566JavaPrerequisiteTest.java @@ -31,7 +31,7 @@ */ class MavenITmng7566JavaPrerequisiteTest extends AbstractMavenIntegrationTestCase { - public MavenITmng7566JavaPrerequisiteTest() { + MavenITmng7566JavaPrerequisiteTest() { super("[3.9.12,)"); } diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7587Jsr330.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7587Jsr330.java index 779982730..eaddead42 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7587Jsr330.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7587Jsr330.java @@ -31,7 +31,7 @@ */ class MavenITmng7587Jsr330 extends AbstractMavenIntegrationTestCase { - public MavenITmng7587Jsr330() { + MavenITmng7587Jsr330() { super("(3.9.10,)"); } diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7606DependencyImportScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7606DependencyImportScopeTest.java index 930697cb7..d3d55ad14 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7606DependencyImportScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7606DependencyImportScopeTest.java @@ -31,7 +31,7 @@ */ class MavenITmng7606DependencyImportScopeTest extends AbstractMavenIntegrationTestCase { - public MavenITmng7606DependencyImportScopeTest() { + MavenITmng7606DependencyImportScopeTest() { super(ALL_MAVEN_VERSIONS); } diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7679SingleMojoNoPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7679SingleMojoNoPomTest.java index 6f6d30c34..10d9e3968 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7679SingleMojoNoPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7679SingleMojoNoPomTest.java @@ -31,7 +31,7 @@ */ class MavenITmng7679SingleMojoNoPomTest extends AbstractMavenIntegrationTestCase { - public MavenITmng7679SingleMojoNoPomTest() { + MavenITmng7679SingleMojoNoPomTest() { // affected Maven versions: 3.8.7, 3.9.0, 4.0.0-alpha-4 super("(,3.8.7)(3.8.7,3.9.0),(3.9.0,4.0.0-alpha-4),(4.0.0-alpha-4,)"); } diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7697PomWithEmojiTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7697PomWithEmojiTest.java index 8d3c12667..60ebeaf2b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7697PomWithEmojiTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7697PomWithEmojiTest.java @@ -30,7 +30,7 @@ */ class MavenITmng7697PomWithEmojiTest extends AbstractMavenIntegrationTestCase { - public MavenITmng7697PomWithEmojiTest() { + MavenITmng7697PomWithEmojiTest() { // affected Maven versions: 3.9.0, 4.0.0-alpha-4 super("(,3.9.0),(3.9.0,4.0.0-alpha-4),(4.0.0-alpha-4,)"); } diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7716BuildDeadlock.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7716BuildDeadlock.java index 2483df65f..8950d3bae 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7716BuildDeadlock.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7716BuildDeadlock.java @@ -34,7 +34,7 @@ */ class MavenITmng7716BuildDeadlock extends AbstractMavenIntegrationTestCase { - public MavenITmng7716BuildDeadlock() { + MavenITmng7716BuildDeadlock() { super("[3.8.8,3.9.0),[3.9.1,4.0.0-alpha-1),[4.0.0-alpha-5,)"); } diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7737ProfileActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7737ProfileActivationTest.java index ac4c0f3bb..63f62c281 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7737ProfileActivationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7737ProfileActivationTest.java @@ -32,7 +32,7 @@ */ class MavenITmng7737ProfileActivationTest extends AbstractMavenIntegrationTestCase { - public MavenITmng7737ProfileActivationTest() { + MavenITmng7737ProfileActivationTest() { // affected Maven versions: 3.9.0 super("(,3.9.0),(3.9.0,)"); } diff --git a/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java b/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java index 14da52359..8cef8438b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java @@ -106,6 +106,7 @@ private static void infoProperty(PrintStream info, String property) { } } + @SuppressWarnings("checkstyle:MethodLength") public TestSuiteOrdering() { TestSuiteOrdering suite = this; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/TunnelingProxyServer.java b/core-it-suite/src/test/java/org/apache/maven/it/TunnelingProxyServer.java index d431665da..33c394a65 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/TunnelingProxyServer.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/TunnelingProxyServer.java @@ -81,7 +81,7 @@ class ClientHandler extends Thread { private Socket client; - public ClientHandler(Socket client) { + ClientHandler(Socket client) { this.client = client; } @@ -162,7 +162,7 @@ static class StreamPumper extends Thread { private final OutputStream os; - public StreamPumper(InputStream is, OutputStream os) { + StreamPumper(InputStream is, OutputStream os) { this.is = is; this.os = os; } diff --git a/core-it-suite/src/test/java/org/apache/maven/it/utils/DeployedResource.java b/core-it-suite/src/test/java/org/apache/maven/it/utils/DeployedResource.java index 29bd07006..48f8a6878 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/utils/DeployedResource.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/utils/DeployedResource.java @@ -40,16 +40,23 @@ * @author Olivier Lamy */ public class DeployedResource { - public String httpMethod; + private final String httpMethod; - public String requestUri; + private final String requestUri; - public String contentLength; + private final String contentLength; - public String transferEncoding; + private final String transferEncoding; - public DeployedResource() { - // no op + public DeployedResource(String httpMethod, String requestUri, String contentLength, String transferEncoding) { + this.httpMethod = httpMethod; + this.requestUri = requestUri; + this.contentLength = contentLength; + this.transferEncoding = transferEncoding; + } + + public String getTransferEncoding() { + return transferEncoding; } @Override