Java7 here too...
Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/3987b9fd Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/3987b9fd Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/3987b9fd Branch: refs/heads/master Commit: 3987b9fd608eee83a43133ad6b1e332da3d9f236 Parents: 4b71726 Author: Kristian Rosenvold <krosenv...@apache.org> Authored: Sat Jun 20 15:26:59 2015 +0200 Committer: Kristian Rosenvold <krosenv...@apache.org> Committed: Sat Jun 20 15:27:14 2015 +0200 ---------------------------------------------------------------------- .../java/org/apache/maven/it/HttpServer.java | 52 +++++------ .../test/java/org/apache/maven/it/ItUtils.java | 13 +-- .../it/MavenIT0090EnvVarInterpolationTest.java | 3 +- .../MavenIT0144LifecycleExecutionOrderTest.java | 6 +- .../it/MavenITmng0187CollectedProjectsTest.java | 18 ++-- ...ITmng1021EqualAttachmentBuildNumberTest.java | 7 +- ...omValidationErrorIncludesLineNumberTest.java | 5 +- .../MavenITmng2362DeployedPomEncodingTest.java | 10 +-- ...ITmng2739RequiredRepositoryElementsTest.java | 18 ++-- .../maven/it/MavenITmng2820PomCommentsTest.java | 8 +- .../it/MavenITmng2883LegacyRepoOfflineTest.java | 33 ++++--- .../maven/it/MavenITmng3220ImportScopeTest.java | 14 +-- ...avenITmng3415JunkRepositoryMetadataTest.java | 94 ++++++++++---------- ...dataUpdatedFromDeploymentRepositoryTest.java | 23 ++--- ...MavenITmng3710PollutedClonedPluginsTest.java | 21 ++--- .../MavenITmng3719PomExecutionOrderingTest.java | 10 +-- .../it/MavenITmng3732ActiveProfilesTest.java | 11 ++- ...807PluginConfigExpressionEvaluationTest.java | 5 +- .../it/MavenITmng3843PomInheritanceTest.java | 31 ++++--- .../MavenITmng3940EnvVarInterpolationTest.java | 12 +-- .../MavenITmng4091BadPluginDescriptorTest.java | 7 +- ...venITmng4180PerDependencyExclusionsTest.java | 5 +- .../it/MavenITmng4190MirrorRepoMergingTest.java | 5 +- ...ng4203TransitiveDependencyExclusionTest.java | 5 +- ...Tmng4235HttpAuthDeploymentChecksumsTest.java | 10 +-- .../it/MavenITmng4275RelocationWarningTest.java | 13 +-- ...6LocalSnapshotSuppressesRemoteCheckTest.java | 25 +++--- ...uginDependencyResolutionFromPomRepoTest.java | 11 +-- ...4368TimestampAwareArtifactInstallerTest.java | 22 ++--- ...Tmng4403LenientDependencyPomParsingTest.java | 5 +- .../MavenITmng4415InheritedPluginOrderTest.java | 7 +- ...416PluginOrderAfterProfileInjectionTest.java | 7 +- ...precatedPomInterpolationExpressionsTest.java | 11 ++- ...g4470AuthenticatedDeploymentToProxyTest.java | 34 ++++--- ...mng4555MetaversionResolutionOfflineTest.java | 19 ++-- .../it/MavenITmng4666CoreRealmImportTest.java | 10 +-- ...4696MavenProjectDependencyArtifactsTest.java | 5 +- .../MavenITmng4745PluginVersionUpdateTest.java | 10 +-- ...solutionOfDependenciesDuringReactorTest.java | 5 +- .../it/MavenITmng5214DontMapWsdlToJar.java | 25 +++--- .../it/MavenITmng5224InjectedSettings.java | 4 +- ...avenITmng5452MavenBuildTimestampUTCTest.java | 5 +- ...enITmng5608ProfileActivationWarningTest.java | 10 +-- ...enITmng5639ImportScopePomResolutionTest.java | 4 - .../apache/maven/it/TunnelingProxyServer.java | 6 +- .../component/DefaultStatefulSingleton.java | 9 +- .../plugin/coreit/CheckThreadSafetyMojo.java | 30 +++---- .../plugin/coreit/DumpRepoLayoutsMojo.java | 20 ++--- .../apache/maven/plugin/coreit/CollectMojo.java | 23 +++-- .../plugin/coreit/CustomRepositoryLayout.java | 2 +- .../apache/maven/plugin/coreit/DeployMojo.java | 19 ++-- .../plugin/coreit/InstallArtifactsMojo.java | 11 ++- .../apache/maven/plugin/coreit/InstallMojo.java | 17 ++-- .../apache/maven/plugin/coreit/ResolveMojo.java | 30 +++---- .../plugin/coreit/ResolveTransitiveMojo.java | 46 ++++------ .../maven/plugin/coreit/AbstractLoadMojo.java | 29 +++--- .../plugin/coreit/AssignmentCompatibleMojo.java | 14 ++- .../maven/plugin/coreit/ExpressionUtil.java | 21 ++--- .../maven/plugin/coreit/InstanceofMojo.java | 26 +++--- .../maven/plugin/coreit/ExpressionUtilTest.java | 18 ++-- .../apache/maven/plugin/coreit/ConfigMojo.java | 85 +++++++++--------- .../maven/plugin/coreit/PropertiesUtil.java | 19 ++-- .../maven/plugin/coreit/ResourcesMojo.java | 25 +++--- .../plugin/coreit/AbstractDependencyMojo.java | 15 ++-- .../maven/plugin/coreit/AggregateTestMojo.java | 22 +++-- .../plugin/coreit/AbstractDependencyMojo.java | 49 +++++----- .../maven/plugin/coreit/AggregateTestMojo.java | 26 +++--- .../apache/maven/plugin/coreit/InjectMojo.java | 33 ++++--- .../plugin/coreit/ResolveOneDependencyMojo.java | 55 ++++++------ .../apache/maven/plugin/coreit/EvalMojo.java | 41 ++++----- .../maven/plugin/coreit/ExpressionUtil.java | 32 +++---- .../maven/plugin/coreit/PropertyUtil.java | 39 ++++---- .../maven/plugin/coreit/ExpressionUtilTest.java | 18 ++-- .../maven/plugin/coreit/PropertyUtilTest.java | 10 +-- .../plugin/coreit/ForkGoalAggregatorMojo.java | 21 +++-- .../coreit/ForkLifecycleAggregatorMojo.java | 21 +++-- .../maven/plugin/coreit/LogSeparatorMojo.java | 13 ++- .../org/apache/maven/plugin/coreit/ItMojo.java | 26 +++--- .../apache/maven/plugin/coreit/AppendMojo.java | 10 +-- .../coreit/ParameterImplementationMojo.java | 17 ++-- .../PropertyInterpolationVerifierMojo.java | 8 +- .../maven/plugin/coreit/AbstractPomMojo.java | 9 +- .../maven/plugin/coreit/BuildLocalPomMojo.java | 16 ++-- .../maven/plugin/coreit/BuildRemotePomMojo.java | 21 ++--- .../org/apache/maven/plugin/coreit/ItMojo.java | 32 +++---- .../maven/plugin/coreit/GenerateMojo.java | 23 +++-- .../apache/maven/plugin/coreit/CoreItMojo.java | 44 ++++----- .../maven/plugin/coreit/DumpAuthMojo.java | 20 ++--- .../maven/plugin/coreit/LoadResourceMojo.java | 26 +++--- .../wagon/providers/coreit/CoreItHttpWagon.java | 35 ++++---- .../wagon/providers/coreit/CoreItWagon.java | 35 ++++---- .../ssh/external/ScpExternalWagon.java | 35 ++++---- .../it/AbstractMavenIntegrationTestCase.java | 27 +++--- 93 files changed, 852 insertions(+), 1035 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/HttpServer.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/HttpServer.java b/core-it-suite/src/test/java/org/apache/maven/it/HttpServer.java index 7d2bf2f..2f10b84 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/HttpServer.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/HttpServer.java @@ -1,17 +1,6 @@ package org.apache.maven.it; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.URL; -import java.util.Collections; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.google.common.io.ByteStreams; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; @@ -25,13 +14,22 @@ import org.eclipse.jetty.util.security.Password; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler; -import com.google.common.io.ByteStreams; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.URL; +import java.util.Collections; /** * An HTTP server that handles all requests on a given port from a specified source, optionally secured using BASIC auth * by providing a username and password. The source can either be a URL or a directory. When a request is made the * request is satisfied from the provided source. - * + * * @author Jason van Zyl */ public class HttpServer @@ -89,7 +87,7 @@ public class HttpServer if ( username != null && password != null ) { HashLoginService loginService = new HashLoginService( "Test Server" ); - loginService.putUser( username, new Password( password ), new String[] { "user" } ); + loginService.putUser( username, new Password( password ), new String[]{ "user" } ); server.addBean( loginService ); ConstraintSecurityHandler security = new ConstraintSecurityHandler(); @@ -98,7 +96,7 @@ public class HttpServer Constraint constraint = new Constraint(); constraint.setName( "auth" ); constraint.setAuthenticate( true ); - constraint.setRoles( new String[] { "user", "admin" } ); + constraint.setRoles( new String[]{ "user", "admin" } ); ConstraintMapping mapping = new ConstraintMapping(); mapping.setPathSpec( "/*" ); @@ -184,7 +182,7 @@ public class HttpServer } } - public static interface StreamSource + public interface StreamSource { InputStream stream( String path ) throws IOException; @@ -204,13 +202,15 @@ public class HttpServer @Override public void handle( String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response ) - throws IOException, ServletException + throws IOException, ServletException { response.setContentType( "application/octet-stream" ); response.setStatus( HttpServletResponse.SC_OK ); - try(InputStream in = source.stream( target.substring( 1 ) ); OutputStream out = response.getOutputStream() ) { - ByteStreams.copy( in, out ); - } + try ( InputStream in = source.stream( + target.substring( 1 ) ); OutputStream out = response.getOutputStream() ) + { + ByteStreams.copy( in, out ); + } baseRequest.setHandled( true ); } } @@ -219,11 +219,11 @@ public class HttpServer throws Exception { HttpServer server = HttpServer.builder() // - .port( 0 ) // - .username( "maven" ) // - .password( "secret" ) // - .source( new File( "/tmp/repo" ) ) // - .build(); + .port( 0 ) // + .username( "maven" ) // + .password( "secret" ) // + .source( new File( "/tmp/repo" ) ) // + .build(); server.start(); } } http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/ItUtils.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/ItUtils.java b/core-it-suite/src/test/java/org/apache/maven/it/ItUtils.java index 4c58dcd..845c63d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/ItUtils.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/ItUtils.java @@ -35,9 +35,8 @@ class ItUtils { MessageDigest digester = MessageDigest.getInstance( algo ); - FileInputStream is = new FileInputStream( file ); DigestInputStream dis; - try + try ( FileInputStream is = new FileInputStream( file ) ) { dis = new DigestInputStream( is, digester ); @@ -46,18 +45,14 @@ class ItUtils // just read it } } - finally - { - is.close(); - } byte[] digest = digester.digest(); - StringBuffer hash = new StringBuffer( digest.length * 2 ); + StringBuilder hash = new StringBuilder( digest.length * 2 ); - for ( int i = 0; i < digest.length; i++ ) + for ( byte aDigest : digest ) { - int b = digest[i] & 0xFF; + int b = aDigest & 0xFF; if ( b < 0x10 ) { http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java index 99d5c3a..2b59ee7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java @@ -19,7 +19,6 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; import java.io.File; @@ -45,7 +44,7 @@ public class MavenIT0090EnvVarInterpolationTest File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0090" ); Verifier verifier = newVerifier( testDir.getAbsolutePath() ); - Map<String, String> envVars = new HashMap<String, String>(); + Map<String, String> envVars = new HashMap<>(); envVars.put( "MAVEN_TEST_ENVAR", "MAVEN_TEST_ENVAR_VALUE" ); verifier.setAutoclean( false ); verifier.deleteDirectory( "target" ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java index 510579b..cedd8d5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java @@ -19,7 +19,6 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; import java.io.File; @@ -28,7 +27,6 @@ import java.util.Arrays; import java.util.List; /** - * * @author Benjamin Bentmann * @version $Id$ */ @@ -52,11 +50,11 @@ public class MavenIT0144LifecycleExecutionOrderTest Verifier verifier = newVerifier( testDir.getAbsolutePath() ); verifier.deleteDirectory( "target" ); verifier.setAutoclean( false ); - verifier.executeGoals( Arrays.asList( new String[] { "post-clean", "deploy", "site-deploy" } ) ); + verifier.executeGoals( Arrays.asList( new String[]{ "post-clean", "deploy", "site-deploy" } ) ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - List<String> expected = new ArrayList<String>(); + List<String> expected = new ArrayList<>(); expected.add( "pre-clean" ); expected.add( "clean" ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java index 48e061c..2f8a1b4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java @@ -19,20 +19,18 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; import java.io.File; -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; -import java.util.Iterator; import java.util.List; import java.util.Properties; /** * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-187";>MNG-187</a>. - * + * * @author Benjamin Bentmann */ public class MavenITmng0187CollectedProjectsTest @@ -66,24 +64,24 @@ public class MavenITmng0187CollectedProjectsTest props = verifier.loadProperties( "target/project.properties" ); assertEquals( "2", props.getProperty( "project.collectedProjects.size" ) ); - assertEquals( Arrays.asList( new String[] { "sub-1", "sub-2" } ), getProjects( props ) ); + assertEquals( Arrays.asList( new String[]{ "sub-1", "sub-2" } ), getProjects( props ) ); props = verifier.loadProperties( "sub-1/target/project.properties" ); assertEquals( "1", props.getProperty( "project.collectedProjects.size" ) ); - assertEquals( Arrays.asList( new String[] { "sub-2" } ), getProjects( props ) ); + assertEquals( Arrays.asList( new String[]{ "sub-2" } ), getProjects( props ) ); props = verifier.loadProperties( "sub-1/sub-2/target/project.properties" ); assertEquals( "0", props.getProperty( "project.collectedProjects.size" ) ); - assertEquals( Arrays.asList( new String[] {} ), getProjects( props ) ); + assertEquals( Arrays.asList( new String[]{} ), getProjects( props ) ); } private List<String> getProjects( Properties props ) { - List<String> projects = new ArrayList<String>(); + List<String> projects = new ArrayList<>(); - for ( Iterator<?> it = props.keySet().iterator(); it.hasNext(); ) + for ( Object o : props.keySet() ) { - String key = it.next().toString(); + String key = o.toString(); if ( key.startsWith( "project.collectedProjects." ) && !key.endsWith( ".size" ) ) { projects.add( props.getProperty( key ) ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java index 5c5e84a..262fa48 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java @@ -19,14 +19,13 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; import java.io.File; /** * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-1021";>MNG-1021</a>. - * + * * @author John Casey * @version $Id$ */ @@ -81,9 +80,9 @@ public class MavenITmng1021EqualAttachmentBuildNumberTest private String getSnapshotVersion( File artifactDir ) { File[] files = artifactDir.listFiles(); - for ( int i = 0; i < files.length; i++ ) + for ( File file : files ) { - String name = files[i].getName(); + String name = file.getName(); if ( name.endsWith( ".pom" ) ) { return name.substring( "test-".length(), name.length() - ".pom".length() ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java index 0b6f5c1..0b865ac 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java @@ -19,7 +19,6 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; import java.io.File; @@ -27,7 +26,7 @@ import java.util.List; /** * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-1803";>MNG-1803</a>. - * + * * @author Benjamin Bentmann */ public class MavenITmng1803PomValidationErrorIncludesLineNumberTest @@ -67,7 +66,7 @@ public class MavenITmng1803PomValidationErrorIncludesLineNumberTest List<String> lines = verifier.loadLines( verifier.getLogFileName(), null ); for ( String line : lines ) { - if ( line.indexOf( ":bad/id:" ) >= 0 ) + if ( line.contains( ":bad/id:" ) ) { assertTrue( "Line number not found in: " + line, line.indexOf( "38" ) > 0 ); assertTrue( "Column number not found in: " + line, line.indexOf( "19" ) > 0 ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java index de53af4..257c801 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java @@ -19,14 +19,14 @@ package org.apache.maven.it; * under the License. */ -import java.io.File; - import org.apache.maven.it.util.ResourceExtractor; import org.apache.maven.shared.utils.io.FileUtils; +import java.io.File; + /** * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-2362";>MNG-2362</a>. - * + * * @author Benjamin Bentmann */ public class MavenITmng2362DeployedPomEncodingTest @@ -92,8 +92,8 @@ public class MavenITmng2362DeployedPomEncodingTest { String prefix = "TEST-CHARS: "; int pos = pom.indexOf( prefix ); - assertTrue( "Corrupt data " + pom.substring( pos, pos + prefix.length() + chars.length() ) + " in " + pomFile, - pom.indexOf( prefix + chars ) >= 0 ); + assertTrue( "Corrupt data " + pom.substring( pos, pos + prefix.length() + chars.length() ) + " in " + pomFile, + pom.contains( prefix + chars ) ); } } http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java ---------------------------------------------------------------------- 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 36c1faf..dd26091 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 @@ -19,8 +19,6 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; import java.io.File; @@ -29,11 +27,9 @@ import java.util.List; /** * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-2739";>MNG-2739</a>. * - * @todo Fill in a better description of what this test verifies! - * * @author <a href="mailto:bri...@apache.org";>Brian Fox</a> * @author jdcasey - * + * @todo Fill in a better description of what this test verifies! */ public class MavenITmng2739RequiredRepositoryElementsTest extends AbstractMavenIntegrationTestCase @@ -57,8 +53,8 @@ public class MavenITmng2739RequiredRepositoryElementsTest { verifier.executeGoal( "validate" ); - fail( "POM should NOT validate: repository <id/> element is missing in: " - + new File( testDir, "pom.xml" ) ); + fail( + "POM should NOT validate: repository <id/> element is missing in: " + new File( testDir, "pom.xml" ) ); } catch ( VerificationException e ) { @@ -71,7 +67,7 @@ public class MavenITmng2739RequiredRepositoryElementsTest boolean foundNpe = false; for ( String line : listing ) { - if ( line.indexOf( "NullPointerException" ) > -1 ) + if ( line.contains( "NullPointerException" ) ) { foundNpe = true; break; @@ -97,8 +93,8 @@ public class MavenITmng2739RequiredRepositoryElementsTest { verifier.executeGoal( "validate" ); - fail( "POM should NOT validate: repository <url/> element is missing in: " - + new File( testDir, "pom.xml" ) ); + fail( + "POM should NOT validate: repository <url/> element is missing in: " + new File( testDir, "pom.xml" ) ); } catch ( VerificationException e ) { @@ -111,7 +107,7 @@ public class MavenITmng2739RequiredRepositoryElementsTest boolean foundNpe = false; for ( String line : listing ) { - if ( line.indexOf( "NullPointerException" ) > -1 ) + if ( line.contains( "NullPointerException" ) ) { foundNpe = true; break; http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java index 7896847..ffa5376 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java @@ -19,14 +19,14 @@ package org.apache.maven.it; * under the License. */ -import java.io.File; - import org.apache.maven.it.util.ResourceExtractor; import org.apache.maven.shared.utils.io.FileUtils; +import java.io.File; + /** * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-2820";>MNG-2820</a>. - * + * * @author Benjamin Bentmann */ public class MavenITmng2820PomCommentsTest @@ -78,7 +78,7 @@ public class MavenITmng2820PomCommentsTest private void assertPomComment( String pom, String comment ) throws Exception { - assertTrue( "Missing comment: " + comment, pom.indexOf( comment ) >= 0 ); + assertTrue( "Missing comment: " + comment, pom.contains( comment ) ); } } http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java index e24ddcd..f2231b7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java @@ -19,8 +19,6 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; import java.io.File; @@ -32,7 +30,6 @@ import java.util.List; * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-2883";>MNG-2883</a>. * * @author <a href="mailto:bri...@apache.org";>Brian Fox</a> - * */ public class MavenITmng2883LegacyRepoOfflineTest extends AbstractMavenIntegrationTestCase @@ -56,7 +53,7 @@ public class MavenITmng2883LegacyRepoOfflineTest verifier.deleteDirectory( "target" ); verifier.deleteArtifacts( "org.apache.maven.its.mng2883" ); - File settings = verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", + File settings = verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); // used to inject the remote repository @@ -72,7 +69,8 @@ public class MavenITmng2883LegacyRepoOfflineTest } catch ( VerificationException e ) { - throw new VerificationException( "Build should succeed the first time through when NOT in offline mode!", e ); + throw new VerificationException( "Build should succeed the first time through when NOT in offline mode!", + e ); } // the centerpiece of these tests! @@ -97,7 +95,7 @@ public class MavenITmng2883LegacyRepoOfflineTest // expected } - List<String> missingMessages = new ArrayList<String>(); + List<String> missingMessages = new ArrayList<>(); missingMessages.add( " is offline" ); missingMessages.add( "org.apache.maven.its.mng2883:parent:pom:1.0-SNAPSHOT" ); @@ -109,7 +107,7 @@ public class MavenITmng2883LegacyRepoOfflineTest { String message = messageIt.next(); - if ( line.indexOf( message ) > -1 ) + if ( line.contains( message ) ) { messageIt.remove(); } @@ -118,7 +116,7 @@ public class MavenITmng2883LegacyRepoOfflineTest if ( !missingMessages.isEmpty() ) { - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); buffer.append( "The following key messages were missing from build output:\n\n" ); @@ -148,7 +146,7 @@ public class MavenITmng2883LegacyRepoOfflineTest verifier.deleteDirectory( "target" ); verifier.deleteArtifacts( "org.apache.maven.its.mng2883" ); - File settings = verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", + File settings = verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); // used to inject the remote repository @@ -164,7 +162,8 @@ public class MavenITmng2883LegacyRepoOfflineTest } catch ( VerificationException e ) { - throw new VerificationException( "Build should succeed the first time through when NOT in offline mode!", e ); + throw new VerificationException( "Build should succeed the first time through when NOT in offline mode!", + e ); } // the centerpiece of these tests! @@ -189,7 +188,7 @@ public class MavenITmng2883LegacyRepoOfflineTest // expected } - List<String> missingMessages = new ArrayList<String>(); + List<String> missingMessages = new ArrayList<>(); // FIXME: We need a more prominent diagnosis including system being in offline mode for 2.0.x. missingMessages.add( "offline mode." ); @@ -203,7 +202,7 @@ public class MavenITmng2883LegacyRepoOfflineTest { String message = (String) messageIt.next(); - if ( line.indexOf( message ) > -1 ) + if ( line.contains( message ) ) { messageIt.remove(); } @@ -212,7 +211,7 @@ public class MavenITmng2883LegacyRepoOfflineTest if ( !missingMessages.isEmpty() ) { - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); buffer.append( "The following key messages were missing from build output:\n\n" ); @@ -242,7 +241,7 @@ public class MavenITmng2883LegacyRepoOfflineTest verifier.deleteDirectory( "target" ); verifier.deleteArtifacts( "org.apache.maven.its.mng2883" ); - File settings = verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", + File settings = verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); // used to inject the remote repository @@ -274,7 +273,7 @@ public class MavenITmng2883LegacyRepoOfflineTest // expected } - List<String> missingMessages = new ArrayList<String>(); + List<String> missingMessages = new ArrayList<>(); missingMessages.add( " is offline" ); missingMessages.add( "org.apache.maven.its.mng2883:plugin" ); @@ -286,7 +285,7 @@ public class MavenITmng2883LegacyRepoOfflineTest { String message = messageIt.next(); - if ( line.indexOf( message ) > -1 ) + if ( line.contains( message ) ) { messageIt.remove(); } @@ -295,7 +294,7 @@ public class MavenITmng2883LegacyRepoOfflineTest if ( !missingMessages.isEmpty() ) { - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); buffer.append( "The following key messages were missing from build output:\n\n" ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java index a7abcfd..e34bfae 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java @@ -19,8 +19,6 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; import java.io.File; @@ -28,7 +26,7 @@ import java.util.List; /** * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3220";>MNG-3220</a>. - * + * * @version $Id$ */ public class MavenITmng3220ImportScopeTest @@ -50,7 +48,8 @@ public class MavenITmng3220ImportScopeTest verifier.setAutoclean( false ); verifier.deleteDirectory( "target" ); verifier.deleteArtifacts( "org.apache.maven.its.mng3220" ); - verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); + verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", + verifier.newDefaultFilterProperties() ); verifier.addCliOption( "--settings" ); verifier.addCliOption( "settings.xml" ); verifier.executeGoal( "validate" ); @@ -69,7 +68,8 @@ public class MavenITmng3220ImportScopeTest verifier.setAutoclean( false ); verifier.deleteDirectory( "target" ); verifier.deleteArtifacts( "org.apache.maven.its.mng3220" ); - verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); + verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", + verifier.newDefaultFilterProperties() ); verifier.addCliOption( "--settings" ); verifier.addCliOption( "settings.xml" ); @@ -91,8 +91,8 @@ public class MavenITmng3220ImportScopeTest boolean found = false; for ( String line : lines ) { - if ( line.indexOf( "\'dependencies.dependency.version\' is missing for junit:junit" ) > -1 - || line.indexOf( "\'dependencies.dependency.version\' for junit:junit:jar is missing" ) > -1 ) + if ( line.contains( "\'dependencies.dependency.version\' is missing for junit:junit" ) || line.contains( + "\'dependencies.dependency.version\' for junit:junit:jar is missing" ) ) { found = true; break; http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java index 05276af..0627a7a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java @@ -19,15 +19,6 @@ package org.apache.maven.it; * under the License. */ -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.apache.maven.it.util.ResourceExtractor; import org.apache.maven.shared.utils.io.FileUtils; import org.mortbay.jetty.Handler; @@ -35,9 +26,17 @@ import org.mortbay.jetty.Request; import org.mortbay.jetty.Server; import org.mortbay.jetty.handler.AbstractHandler; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + /** * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3415";>MNG-3415</a>. - * + * * @version $Id$ */ public class MavenITmng3415JunkRepositoryMetadataTest @@ -56,25 +55,25 @@ public class MavenITmng3415JunkRepositoryMetadataTest /** * This test simply verifies that when a metadata transfer fails (network error, etc.) * no metadata file is written to the local repository. - * + * <p/> * Steps executed to verify this test: - * + * <p/> * 0. Find the local repository directory: - * a. build the maven-find-local-repo-plugin, then run it, to spit out the path of the - * local repository in use by default. Read the output file to get this path. - * (Yes, it's heavy, but it's reliable.) + * a. build the maven-find-local-repo-plugin, then run it, to spit out the path of the + * local repository in use by default. Read the output file to get this path. + * (Yes, it's heavy, but it's reliable.) * 1. Setup the test: - * a. Make sure the metadata for the test-repo is NOT in the local repository. - * b. Make sure the dependency POM IS in the local repository, so we're not - * distracted by failed builds that are unrelated. - * c. Create the settings file for use in this test, which contains the invalid - * remote repository entry. + * a. Make sure the metadata for the test-repo is NOT in the local repository. + * b. Make sure the dependency POM IS in the local repository, so we're not + * distracted by failed builds that are unrelated. + * c. Create the settings file for use in this test, which contains the invalid + * remote repository entry. * 2. Build the test project the first time - * a. Verify that a TransferFailedException is in the build output for the test-repo - * b. Verify that the metadata for the dependency POM is NOT in the local - * repository afterwards. + * a. Verify that a TransferFailedException is in the build output for the test-repo + * b. Verify that the metadata for the dependency POM is NOT in the local + * repository afterwards. * 3. Build the test project the second time - * a. See (2.a) and (2.b) above; the same criteria applies here. + * a. See (2.a) and (2.b) above; the same criteria applies here. */ public void testitTransferFailed() throws Exception @@ -126,25 +125,25 @@ public class MavenITmng3415JunkRepositoryMetadataTest /** * This test simply verifies that when metadata doesn't exist on the remote * repository, a basic metadata file is written to the local repository. - * + * <p/> * Steps executed to verify this test: - * + * <p/> * 0. Find the local repository directory: - * a. build the maven-find-local-repo-plugin, then run it, to spit out the path of the - * local repository in use by default. Read the output file to get this path. - * (Yes, it's heavy, but it's reliable.) + * a. build the maven-find-local-repo-plugin, then run it, to spit out the path of the + * local repository in use by default. Read the output file to get this path. + * (Yes, it's heavy, but it's reliable.) * 1. Setup the test: - * a. Make sure the metadata for the test-repo is NOT in the local repository. - * b. Make sure the dependency POM IS in the local repository, so we're not - * distracted by failed builds that are unrelated. - * c. Create the settings file for use in this test, which contains the VALID - * remote repository entry. + * a. Make sure the metadata for the test-repo is NOT in the local repository. + * b. Make sure the dependency POM IS in the local repository, so we're not + * distracted by failed builds that are unrelated. + * c. Create the settings file for use in this test, which contains the VALID + * remote repository entry. * 2. Build the test project the first time - * a. Verify that the remote repository is checked for the metadata file + * a. Verify that the remote repository is checked for the metadata file * 3. Build the test project the second time - * a. Verify that the remote repository is NOT checked for the metadata file again - * b. Verify that the file used for updateInterval calculations was NOT changed from - * the first build. + * a. Verify that the remote repository is NOT checked for the metadata file again + * b. Verify that the file used for updateInterval calculations was NOT changed from + * the first build. */ public void testShouldNotRepeatedlyUpdateOnResourceNotFoundException() throws Exception @@ -159,7 +158,7 @@ public class MavenITmng3415JunkRepositoryMetadataTest verifier.setAutoclean( false ); verifier.deleteArtifacts( "org.apache.maven.its.mng3415" ); - final List<String> requestUris = new ArrayList<String>(); + final List<String> requestUris = new ArrayList<>(); Handler repoHandler = new AbstractHandler() { @@ -199,8 +198,8 @@ public class MavenITmng3415JunkRepositoryMetadataTest verifier.verifyErrorFreeLog(); - assertTrue( requestUris.toString(), - requestUris.contains( "/org/apache/maven/its/mng3415/missing/1.0-SNAPSHOT/maven-metadata.xml" ) ); + assertTrue( requestUris.toString(), requestUris.contains( + "/org/apache/maven/its/mng3415/missing/1.0-SNAPSHOT/maven-metadata.xml" ) ); requestUris.clear(); @@ -215,10 +214,13 @@ public class MavenITmng3415JunkRepositoryMetadataTest verifier.verifyErrorFreeLog(); verifier.resetStreams(); - assertFalse( requestUris.toString(), - requestUris.contains( "/org/apache/maven/its/mng3415/missing/1.0-SNAPSHOT/maven-metadata.xml" ) ); + assertFalse( requestUris.toString(), requestUris.contains( + "/org/apache/maven/its/mng3415/missing/1.0-SNAPSHOT/maven-metadata.xml" ) ); - assertEquals( "Last-modified time should be unchanged from first build through second build for the file we use for updateInterval checks.", firstLastMod, updateCheckFile.lastModified() ); + assertEquals( + "Last-modified time should be unchanged from first build through second build for the file we use for" + + " updateInterval checks.", + firstLastMod, updateCheckFile.lastModified() ); } finally { @@ -231,8 +233,8 @@ public class MavenITmng3415JunkRepositoryMetadataTest { File metadata = getMetadataFile( verifier ); - assertFalse( "Metadata file should NOT be present in local repository: " - + metadata.getAbsolutePath(), metadata.exists() ); + assertFalse( "Metadata file should NOT be present in local repository: " + metadata.getAbsolutePath(), + metadata.exists() ); } private void setupDummyDependency( Verifier verifier, File testDir, boolean resetUpdateInterval ) http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java index e489f07..d608932 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java @@ -19,19 +19,19 @@ package org.apache.maven.it; * under the License. */ -import java.io.File; -import java.io.FileReader; -import java.io.IOException; - import org.apache.maven.it.util.ResourceExtractor; import org.apache.maven.shared.utils.io.FileUtils; import org.codehaus.plexus.util.xml.Xpp3Dom; import org.codehaus.plexus.util.xml.Xpp3DomBuilder; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; + /** * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3441";>MNG-3441</a>. - * + * * @version $Id$ */ public class MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest @@ -45,8 +45,7 @@ public class MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest public void testitMNG3441() throws Exception { - File testDir = - ResourceExtractor.simpleExtractResources( getClass(), "/mng-3441" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3441" ); File targetRepository = new File( testDir, "target-repo" ); FileUtils.deleteDirectory( targetRepository ); @@ -63,7 +62,8 @@ public class MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest verifier.verifyErrorFreeLog(); Xpp3Dom dom = readDom( new File( targetRepository, - "org/apache/maven/its/mng3441/test-artifact/1.0-SNAPSHOT/maven-metadata.xml" ) ); + "org/apache/maven/its/mng3441/test-artifact/1.0-SNAPSHOT/maven-metadata.xml" + ) ); assertEquals( "2", dom.getChild( "versioning" ).getChild( "snapshot" ).getChild( "buildNumber" ).getValue() ); dom = readDom( new File( targetRepository, "org/apache/maven/its/mng3441/maven-metadata.xml" ) ); @@ -77,14 +77,9 @@ public class MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest private Xpp3Dom readDom( File file ) throws XmlPullParserException, IOException { - FileReader reader = new FileReader( file ); - try + try ( FileReader reader = new FileReader( file ) ) { return Xpp3DomBuilder.build( reader ); } - finally - { - reader.close(); - } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java ---------------------------------------------------------------------- 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 11235f2..cbf6e36 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 @@ -19,19 +19,18 @@ package org.apache.maven.it; * under the License. */ +import org.apache.maven.it.util.ResourceExtractor; + import java.io.File; import java.util.ArrayList; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.util.ResourceExtractor; - /** * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3710";>MNG-3710</a>. - * - * @todo Fill in a better description of what this test verifies! + * * @author <a href="mailto:bri...@apache.org";>Brian Fox</a> * @author jdcasey + * @todo Fill in a better description of what this test verifies! */ public class MavenITmng3710PollutedClonedPluginsTest extends AbstractMavenIntegrationTestCase @@ -44,8 +43,7 @@ public class MavenITmng3710PollutedClonedPluginsTest public void testitMNG3710_POMInheritance() throws Exception { - File testDir = - ResourceExtractor.simpleExtractResources( getClass(), "/mng-3710/pom-inheritance" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3710/pom-inheritance" ); File pluginDir = new File( testDir, "maven-mng3710-pomInheritance-plugin" ); File projectsDir = new File( testDir, "projects" ); @@ -77,8 +75,7 @@ public class MavenITmng3710PollutedClonedPluginsTest public void testitMNG3710_OriginalModel() throws Exception { - File testDir = - ResourceExtractor.simpleExtractResources( getClass(), "/mng-3710/original-model" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3710/original-model" ); File pluginsDir = new File( testDir, "plugins" ); File projectDir = new File( testDir, "project" ); @@ -91,11 +88,11 @@ public class MavenITmng3710PollutedClonedPluginsTest verifier.resetStreams(); verifier = newVerifier( projectDir.getAbsolutePath() ); - - List<String> goals = new ArrayList<String>(); + + List<String> goals = new ArrayList<>(); goals.add( "org.apache.maven.its.mng3710:mavenit-mng3710-directInvoke-plugin:1:run" ); goals.add( "validate" ); - + verifier.executeGoals( goals ); verifier.verifyErrorFreeLog(); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java index 8c1267a..04fedda 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java @@ -19,16 +19,16 @@ package org.apache.maven.it; * under the License. */ +import org.apache.maven.it.util.ResourceExtractor; + import java.io.File; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.maven.it.util.ResourceExtractor; - /** * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3719";>MNG-3719</a>. - * + * * @author Brett Porter * @version $Id$ */ @@ -63,11 +63,11 @@ public class MavenITmng3719PomExecutionOrderingTest for ( int i = 0; i < content.size(); i++ ) { String line = (String) content.get( i ); - + Matcher m = pattern.matcher( line ); if ( m.matches() ) { - int step = Integer.valueOf( m.group( 1 ) ).intValue(); + int step = Integer.valueOf( m.group( 1 ) ); stepLines[step - 1] = i + 1; } } http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java index b6f137f..d8a6fbc 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java @@ -19,7 +19,6 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; import java.io.File; @@ -31,7 +30,7 @@ import java.util.Properties; /** * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3732";>MNG-3732</a>. - * + * * @author Benjamin Bentmann * @version $Id$ */ @@ -63,7 +62,7 @@ public class MavenITmng3732ActiveProfilesTest verifier.resetStreams(); Properties props = verifier.loadProperties( "target/profile.properties" ); - List<String> ids = new ArrayList<String>(); + List<String> ids = new ArrayList<>(); // support for profiles.xml removed from 3.x (see MNG-4060) if ( matchesVersionRange( "[2.0,3.0-alpha-1)" ) ) @@ -75,7 +74,7 @@ public class MavenITmng3732ActiveProfilesTest ids.remove( "it-defaults" ); Collections.sort( ids ); - assertEquals( Arrays.asList( new String[] { "pom", "profiles", "settings" } ), ids ); + assertEquals( Arrays.asList( new String[]{ "pom", "profiles", "settings" } ), ids ); assertEquals( "4", props.getProperty( "project.activeProfiles" ) ); assertEquals( "PASSED-1", props.getProperty( "project.properties.pomProperty" ) ); @@ -90,9 +89,9 @@ public class MavenITmng3732ActiveProfilesTest ids.remove( "it-defaults" ); Collections.sort( ids ); - assertEquals( Arrays.asList( new String[] { "pom", "settings" } ), ids ); + assertEquals( Arrays.asList( new String[]{ "pom", "settings" } ), ids ); assertEquals( "3", props.getProperty( "project.activeProfiles" ) ); - + assertEquals( "PASSED-1", props.getProperty( "project.properties.pomProperty" ) ); assertEquals( "PASSED-2", props.getProperty( "project.properties.settingsProperty" ) ); } http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java index bb8ad1a..b6c315e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java @@ -19,7 +19,6 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; import java.io.File; @@ -27,7 +26,7 @@ import java.util.Properties; /** * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3807";>MNG-3807</a>. - * + * * @version $Id$ */ public class MavenITmng3807PluginConfigExpressionEvaluationTest @@ -73,7 +72,7 @@ public class MavenITmng3807PluginConfigExpressionEvaluationTest { assertNotNull( value ); assertTrue( value.length() > 0 ); - assertTrue( value, value.indexOf( "${" ) < 0 ); + assertTrue( value, !value.contains( "${" ) ); } } http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java ---------------------------------------------------------------------- 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 2bec145..2e89f16 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 @@ -19,18 +19,16 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; import java.io.File; import java.util.Collection; -import java.util.Iterator; import java.util.Properties; import java.util.TreeSet; /** * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3843";>MNG-3843</a>. - * + * * @author Benjamin Bentmann * @version $Id$ */ @@ -100,7 +98,8 @@ public class MavenITmng3843PomInheritanceTest assertEquals( "1", props.getProperty( "project.build.resources" ) ); assertPathEquals( basedir, "src/main/resources", props.getProperty( "project.build.resources.0.directory" ) ); assertEquals( "1", props.getProperty( "project.build.testResources" ) ); - assertPathEquals( basedir, "src/test/resources", props.getProperty( "project.build.testResources.0.directory" ) ); + assertPathEquals( basedir, "src/test/resources", + props.getProperty( "project.build.testResources.0.directory" ) ); assertPathEquals( basedir, "target", props.getProperty( "project.build.directory" ) ); assertPathEquals( basedir, "target/classes", props.getProperty( "project.build.outputDirectory" ) ); assertPathEquals( basedir, "target/test-classes", props.getProperty( "project.build.testOutputDirectory" ) ); @@ -147,9 +146,11 @@ public class MavenITmng3843PomInheritanceTest assertEquals( "http://parent.url/ci";, props.getProperty( "project.ciManagement.url" ) ); assertEquals( "http://parent.url/issues";, props.getProperty( "project.issueManagement.url" ) ); assertEquals( "http://parent.url/dist";, props.getProperty( "project.distributionManagement.repository.url" ) ); - assertEquals( "http://parent.url/snaps";, props.getProperty( "project.distributionManagement.snapshotRepository.url" ) ); + assertEquals( "http://parent.url/snaps";, + props.getProperty( "project.distributionManagement.snapshotRepository.url" ) ); assertUrlCommon( "http://parent.url/site";, props.getProperty( "project.distributionManagement.site.url" ) ); - assertUrlCommon( "http://parent.url/download";, props.getProperty( "project.distributionManagement.downloadUrl" ) ); + assertUrlCommon( "http://parent.url/download";, + props.getProperty( "project.distributionManagement.downloadUrl" ) ); if ( matchesVersionRange( "(2.0.2,)" ) ) { assertMissing( props, "project.distributionManagement.relocation." ); @@ -214,9 +215,11 @@ public class MavenITmng3843PomInheritanceTest assertEquals( "http://child.url/ci";, props.getProperty( "project.ciManagement.url" ) ); assertEquals( "http://child.url/issues";, props.getProperty( "project.issueManagement.url" ) ); assertEquals( "http://child.url/dist";, props.getProperty( "project.distributionManagement.repository.url" ) ); - assertEquals( "http://child.url/snaps";, props.getProperty( "project.distributionManagement.snapshotRepository.url" ) ); + assertEquals( "http://child.url/snaps";, + props.getProperty( "project.distributionManagement.snapshotRepository.url" ) ); assertUrlCommon( "http://child.url/site";, props.getProperty( "project.distributionManagement.site.url" ) ); - assertUrlCommon( "http://child.url/download";, props.getProperty( "project.distributionManagement.downloadUrl" ) ); + assertUrlCommon( "http://child.url/download";, + props.getProperty( "project.distributionManagement.downloadUrl" ) ); assertEquals( "child-reloc-msg", props.getProperty( "project.distributionManagement.relocation.message" ) ); assertMissing( props, "project.profiles." ); assertEquals( "coreit", props.getProperty( "project.build.finalName" ) ); @@ -239,22 +242,22 @@ public class MavenITmng3843PomInheritanceTest assertEquals( "1", props.getProperty( "project.build.plugins" ) ); } assertEquals( "4", props.getProperty( "project.dependencies" ) ); - Collection<String> actualDeps = new TreeSet<String>(); + Collection<String> actualDeps = new TreeSet<>(); actualDeps.add( props.getProperty( "project.dependencies.0.artifactId" ) ); actualDeps.add( props.getProperty( "project.dependencies.1.artifactId" ) ); actualDeps.add( props.getProperty( "project.dependencies.2.artifactId" ) ); actualDeps.add( props.getProperty( "project.dependencies.3.artifactId" ) ); - Collection<String> expectedDeps = new TreeSet<String>(); + Collection<String> expectedDeps = new TreeSet<>(); expectedDeps.add( "parent-dep-b" ); expectedDeps.add( "child-dep-b" ); expectedDeps.add( "child-dep-c" ); expectedDeps.add( "child-dep-d" ); assertEquals( expectedDeps, actualDeps ); assertEquals( "2", props.getProperty( "project.dependencyManagement.dependencies" ) ); - Collection<String> actualMngtDeps = new TreeSet<String>(); + Collection<String> actualMngtDeps = new TreeSet<>(); actualMngtDeps.add( props.getProperty( "project.dependencyManagement.dependencies.0.artifactId" ) ); actualMngtDeps.add( props.getProperty( "project.dependencyManagement.dependencies.1.artifactId" ) ); - Collection<String> expectedMngtDeps = new TreeSet<String>(); + Collection<String> expectedMngtDeps = new TreeSet<>(); expectedMngtDeps.add( "parent-dep-a" ); expectedMngtDeps.add( "child-dep-a" ); assertEquals( expectedMngtDeps, actualMngtDeps ); @@ -286,9 +289,9 @@ public class MavenITmng3843PomInheritanceTest private void assertMissing( Properties props, String prefix ) { - for ( Iterator<?> it = props.keySet().iterator(); it.hasNext(); ) + for ( Object o : props.keySet() ) { - String key = it.next().toString(); + String key = o.toString(); assertFalse( "Found unexpected key: " + key, key.startsWith( prefix ) ); } } http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java index 5cf7cd2..b19c416 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java @@ -19,17 +19,17 @@ package org.apache.maven.it; * under the License. */ +import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.utils.Os; + import java.io.File; import java.util.HashMap; import java.util.Map; import java.util.Properties; -import org.apache.maven.it.util.ResourceExtractor; -import org.apache.maven.shared.utils.Os; - /** * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3940";>MNG-3940</a>. - * + * * @author Benjamin Bentmann * @version $Id$ */ @@ -51,7 +51,7 @@ public class MavenITmng3940EnvVarInterpolationTest { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3940" ); - Map<String, String> envVars = new HashMap<String, String>(); + Map<String, String> envVars = new HashMap<>(); /* * NOTE: The POM is using MAVEN_MNG_3940 to reference the var (just as one would refer to PATH). On Windows, * this must resolve case-insensitively so we use different character casing for the variable here. @@ -64,7 +64,7 @@ public class MavenITmng3940EnvVarInterpolationTest { envVars.put( "MAVEN_MNG_3940", "PASSED" ); } - + Verifier verifier = newVerifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); verifier.deleteDirectory( "target" ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java ---------------------------------------------------------------------- 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 61e0e7b..dd757df 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 @@ -19,12 +19,12 @@ package org.apache.maven.it; * under the License. */ +import org.apache.maven.it.util.ResourceExtractor; + import java.io.File; import java.util.List; import java.util.Properties; -import org.apache.maven.it.util.ResourceExtractor; - /** * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4091";>MNG-4091</a>: * Bad plugin descriptor error handling @@ -61,7 +61,6 @@ public class MavenITmng4091BadPluginDescriptorTest verifier.resetStreams(); } - List<String> logFile = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false ); String msg = "Plugin's descriptor contains the wrong version: 2.0-SNAPSHOT"; @@ -69,7 +68,7 @@ public class MavenITmng4091BadPluginDescriptorTest boolean foundMessage = false; for ( String line : logFile ) { - if ( line.indexOf( msg ) > -1 ) + if ( line.contains( msg ) ) { foundMessage = true; break; http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java index b9ac919..35214b7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java @@ -19,7 +19,6 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; import java.io.File; @@ -29,7 +28,7 @@ import java.util.List; /** * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4180";>MNG-4180</a>. - * + * * @author Benjamin Bentmann */ public class MavenITmng4180PerDependencyExclusionsTest @@ -64,7 +63,7 @@ public class MavenITmng4180PerDependencyExclusionsTest List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" ); Collections.sort( artifacts ); - List<String> expected = new ArrayList<String>(); + List<String> expected = new ArrayList<>(); expected.add( "org.apache.maven.its.mng4180:a:jar:0.1" ); expected.add( "org.apache.maven.its.mng4180:b:jar:0.1" ); expected.add( "org.apache.maven.its.mng4180:c:jar:0.1" ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java index a73c053..628a728 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java @@ -19,7 +19,6 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; import java.io.File; @@ -30,7 +29,7 @@ import java.util.Properties; /** * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4190";>MNG-4190</a>. - * + * * @author Benjamin Bentmann */ public class MavenITmng4190MirrorRepoMergingTest @@ -66,7 +65,7 @@ public class MavenITmng4190MirrorRepoMergingTest List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" ); Collections.sort( artifacts ); - List<String> expected = new ArrayList<String>(); + List<String> expected = new ArrayList<>(); expected.add( "org.apache.maven.its.mng4190:a:jar:0.1" ); expected.add( "org.apache.maven.its.mng4190:b:jar:0.1-SNAPSHOT" ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java index 82d547e..424f1a2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java @@ -19,7 +19,6 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; import java.io.File; @@ -29,7 +28,7 @@ import java.util.List; /** * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4203";>MNG-4203</a>. - * + * * @author Benjamin Bentmann */ public class MavenITmng4203TransitiveDependencyExclusionTest @@ -63,7 +62,7 @@ public class MavenITmng4203TransitiveDependencyExclusionTest List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" ); Collections.sort( artifacts ); - List<String> expected = new ArrayList<String>(); + List<String> expected = new ArrayList<>(); expected.add( "org.apache.maven.its.mng4203:b:jar:0.1" ); expected.add( "org.apache.maven.its.mng4203:c:jar:0.1" ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java ---------------------------------------------------------------------- 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 39f21e0..383d265 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 @@ -175,7 +175,7 @@ public class MavenITmng4235HttpAuthDeploymentChecksumsTest public static class RepoHandler extends ResourceHandler { - List<DeployedResource> deployedResources = new ArrayList<DeployedResource>(); + List<DeployedResource> deployedResources = new ArrayList<>(); public void handle( String target, HttpServletRequest request, HttpServletResponse response, int dispatch ) throws IOException, ServletException @@ -193,18 +193,12 @@ public class MavenITmng4235HttpAuthDeploymentChecksumsTest dir.mkdirs(); } - OutputStream os = resource.getOutputStream(); - request.getContentLength(); - try + try ( OutputStream os = resource.getOutputStream() ) { IO.copy( request.getInputStream(), os ); } - finally - { - os.close(); - } DeployedResource deployedResource = new DeployedResource(); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java index 8825006..465e699 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java @@ -56,29 +56,30 @@ public class MavenITmng4275RelocationWarningTest verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - + List<String> lines = verifier.loadFile( new File( testDir, verifier.getLogFileName() ), false ); boolean foundWarning = false; for ( String line : lines ) { if ( foundWarning ) { - assertTrue( - "Relocation target should have been logged right after warning.", - line.indexOf( "This artifact has been relocated to org.apache.maven.its.mng4275:relocated:1" ) > -1 ); + assertTrue( "Relocation target should have been logged right after warning.", line.contains( + "This artifact has been relocated to org.apache.maven.its.mng4275:relocated:1" ) ); break; } else if ( line.startsWith( "[WARNING] While downloading org.apache.maven.its.mng4275:relocation:1" ) ) { foundWarning = true; } - else if ( line.matches( "\\[WARNING\\].* org.apache.maven.its.mng4275:relocation:jar:1 .* org.apache.maven.its.mng4275:relocated:jar:1.*" ) ) + else if ( line.matches( + "\\[WARNING\\].* org.apache.maven.its.mng4275:relocation:jar:1 .* org.apache.maven.its" + + ".mng4275:relocated:jar:1.*" ) ) { foundWarning = true; break; } } - + assertTrue( "Relocation warning should haven been logged.", foundWarning ); } http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java index 30b3aa0..1615012 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java @@ -19,9 +19,15 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import org.mortbay.jetty.Handler; +import org.mortbay.jetty.Request; +import org.mortbay.jetty.Server; +import org.mortbay.jetty.handler.AbstractHandler; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; import java.io.PrintWriter; @@ -30,18 +36,9 @@ import java.util.Date; import java.util.List; import java.util.Properties; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.mortbay.jetty.Handler; -import org.mortbay.jetty.Request; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.handler.AbstractHandler; - /** * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4326";>MNG-4326</a>. - * + * * @author Benjamin Bentmann */ public class MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest @@ -71,7 +68,7 @@ public class MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest verifier.verifyErrorFreeLog(); verifier.resetStreams(); - final List<String> uris = new ArrayList<String>(); + final List<String> uris = new ArrayList<>(); Handler repoHandler = new AbstractHandler() { @@ -82,8 +79,8 @@ public class MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest String uri = request.getRequestURI(); - if ( uri.startsWith( "/repo/org/apache/maven/its/mng4326" ) - && !uri.endsWith( ".md5" ) && !uri.endsWith( ".sha1" ) ) + if ( uri.startsWith( "/repo/org/apache/maven/its/mng4326" ) && !uri.endsWith( ".md5" ) && !uri.endsWith( + ".sha1" ) ) { uris.add( uri.substring( 34 ) ); } http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java index 7813d83..a092ef7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java @@ -19,7 +19,6 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; import java.io.File; @@ -27,7 +26,7 @@ import java.util.Properties; /** * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4353";>MNG-4353</a>. - * + * * @author Benjamin Bentmann */ public class MavenITmng4353PluginDependencyResolutionFromPomRepoTest @@ -53,15 +52,17 @@ public class MavenITmng4353PluginDependencyResolutionFromPomRepoTest verifier.deleteArtifacts( "org.apache.maven.its.mng4353" ); Properties filterProps = verifier.newDefaultFilterProperties(); verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps ); - verifier.filterFile( "repo-1/org/apache/maven/its/mng4353/maven-mng4353-plugin/0.1/template.pom", - "repo-1/org/apache/maven/its/mng4353/maven-mng4353-plugin/0.1/maven-mng4353-plugin-0.1.pom", "UTF-8", filterProps ); + verifier.filterFile( "repo-1/org/apache/maven/its/mng4353/maven-mng4353-plugin/0.1/template.pom", + "repo-1/org/apache/maven/its/mng4353/maven-mng4353-plugin/0.1/maven-mng4353-plugin-0.1" + + ".pom", + "UTF-8", filterProps ); verifier.addCliOption( "--settings" ); verifier.addCliOption( "settings.xml" ); verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - Properties props = verifier.loadProperties( "target/touch.properties" );; + Properties props = verifier.loadProperties( "target/touch.properties" ); assertEquals( "passed", props.getProperty( "test" ) ); } http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java index b8a32ab..aec8f8f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java @@ -19,14 +19,14 @@ package org.apache.maven.it; * under the License. */ -import java.io.File; - import org.apache.maven.it.util.ResourceExtractor; import org.apache.maven.shared.utils.io.FileUtils; +import java.io.File; + /** * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4368";>MNG-4368</a>. - * + * * @author Benjamin Bentmann */ public class MavenITmng4368TimestampAwareArtifactInstallerTest @@ -63,11 +63,12 @@ public class MavenITmng4368TimestampAwareArtifactInstallerTest verifier.verifyErrorFreeLog(); verifier.resetStreams(); - File installedPom = new File( verifier.getArtifactPath( "org.apache.maven.its.mng4368", "test", "0.1-SNAPSHOT", "pom" ) ); + File installedPom = + new File( verifier.getArtifactPath( "org.apache.maven.its.mng4368", "test", "0.1-SNAPSHOT", "pom" ) ); String pom = FileUtils.fileRead( installedPom, "UTF-8" ); assertTrue( pom.indexOf( "Branch-A" ) > 0 ); - assertTrue( pom.indexOf( "Branch-B" ) < 0 ); + assertTrue( !pom.contains( "Branch-B" ) ); assertEquals( aPom.length(), bPom.length() ); assertTrue( aPom.lastModified() > bPom.lastModified() ); @@ -81,7 +82,7 @@ public class MavenITmng4368TimestampAwareArtifactInstallerTest verifier.resetStreams(); pom = FileUtils.fileRead( installedPom, "UTF-8" ); - assertTrue( pom.indexOf( "Branch-A" ) < 0 ); + assertTrue( !pom.contains( "Branch-A" ) ); assertTrue( pom.indexOf( "Branch-B" ) > 0 ); } @@ -114,11 +115,12 @@ public class MavenITmng4368TimestampAwareArtifactInstallerTest verifier.verifyErrorFreeLog(); verifier.resetStreams(); - File installedArtifact = new File( verifier.getArtifactPath( "org.apache.maven.its.mng4368", "test", "0.1-SNAPSHOT", "jar" ) ); + File installedArtifact = + new File( verifier.getArtifactPath( "org.apache.maven.its.mng4368", "test", "0.1-SNAPSHOT", "jar" ) ); String data = FileUtils.fileRead( installedArtifact, "UTF-8" ); assertTrue( data.indexOf( "Branch-A" ) > 0 ); - assertTrue( data.indexOf( "Branch-B" ) < 0 ); + assertTrue( !data.contains( "Branch-B" ) ); assertEquals( aArtifact.length(), bArtifact.length() ); assertTrue( aArtifact.lastModified() > bArtifact.lastModified() ); @@ -132,7 +134,7 @@ public class MavenITmng4368TimestampAwareArtifactInstallerTest verifier.resetStreams(); data = FileUtils.fileRead( installedArtifact, "UTF-8" ); - assertTrue( data.indexOf( "Branch-A" ) < 0 ); + assertTrue( !data.contains( "Branch-A" ) ); assertTrue( data.indexOf( "Branch-B" ) > 0 ); long lastModified = installedArtifact.lastModified(); @@ -148,7 +150,7 @@ public class MavenITmng4368TimestampAwareArtifactInstallerTest verifier.resetStreams(); data = FileUtils.fileRead( installedArtifact, "UTF-8" ); - assertTrue( data.indexOf( "Branch-B" ) < 0 ); + assertTrue( !data.contains( "Branch-B" ) ); assertTrue( data.indexOf( "Branch-C" ) > 0 ); } http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java index 1a360f3..c1e105d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java @@ -19,7 +19,6 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; import java.io.File; @@ -29,7 +28,7 @@ import java.util.List; /** * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4403";>MNG-4403</a>. - * + * * @author Benjamin Bentmann */ public class MavenITmng4403LenientDependencyPomParsingTest @@ -65,7 +64,7 @@ public class MavenITmng4403LenientDependencyPomParsingTest List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" ); Collections.sort( artifacts ); - List<String> expected = new ArrayList<String>(); + List<String> expected = new ArrayList<>(); expected.add( "org.apache.maven.its.mng4403:a:jar:0.1" ); expected.add( "org.apache.maven.its.mng4403:b:jar:0.1" ); expected.add( "org.apache.maven.its.mng4403:c:jar:0.1" );
