diff --git a/pom.xml b/pom.xml index 5964b2177..ab8e6ee27 100644 --- a/pom.xml +++ b/pom.xml @@ -196,28 +196,17 @@ under the License. org.codehaus.plexus plexus-xml - - - - junit - junit - 4.13.2 - test - - - - org.hamcrest - hamcrest-core - - - org.hamcrest hamcrest 3.0 test - + + org.junit.jupiter + junit-jupiter-api + test + org.slf4j slf4j-simple @@ -227,7 +216,13 @@ under the License. org.mockito mockito-core - 4.6.1 + 4.11.0 + test + + + org.mockito + mockito-junit-jupiter + 4.11.0 test diff --git a/src/functional-tests/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java b/src/functional-tests/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java deleted file mode 100644 index e8e0fbe0f..000000000 --- a/src/functional-tests/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java +++ /dev/null @@ -1,642 +0,0 @@ -package org.apache.maven.plugin.assembly; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - - -import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.handler.ArtifactHandler; -import org.apache.maven.artifact.metadata.ArtifactMetadata; -import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.artifact.resolver.filter.ArtifactFilter; -import org.apache.maven.artifact.versioning.ArtifactVersion; -import org.apache.maven.artifact.versioning.OverConstrainedVersionException; -import org.apache.maven.artifact.versioning.VersionRange; -import org.apache.maven.model.Model; -import org.apache.maven.plugin.Mojo; -import org.apache.maven.plugin.testing.AbstractMojoTestCase; -import org.apache.maven.plugin.testing.stubs.MavenProjectStub; -import org.codehaus.plexus.archiver.Archiver; -import org.codehaus.plexus.archiver.ArchiverException; -import org.codehaus.plexus.archiver.UnArchiver; -import org.codehaus.plexus.archiver.diags.NoOpArchiver; -import org.codehaus.plexus.archiver.manager.ArchiverManager; -import org.codehaus.plexus.archiver.manager.NoSuchArchiverException; -import org.codehaus.plexus.util.DirectoryScanner; -import org.codehaus.plexus.util.FileUtils; -import org.codehaus.plexus.util.IOUtil; -import org.codehaus.plexus.util.StringUtils; - -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.Writer; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -/** - * Test common features of all assembly mojos. - * - * @todo Switch to use test-only mojos, once we can generate descriptors for those... - */ -public class BasicAbstractAssemblyMojoFeaturesTest - extends AbstractMojoTestCase -{ - - public void testOutputFileNameMapping() throws Exception - { - String pluginConfig = "outputFileNameMapping-pluginConfig.xml"; - - List requiredDependencies = new ArrayList(); - - requiredDependencies.add( "dependencies/test.jar" ); - requiredDependencies.add( "dependencies/test2.jar" ); - - Mojo mojo = run( pluginConfig, "directory-inline" ); - assertFilesAdded( mojo, requiredDependencies ); - } - - public void testModuleSetSourceIncludedBinariesNotIncluded() throws Exception - { - String pluginConfig = "moduleSetSourceIncludedBinariesNotIncluded-pluginConfig.xml"; - - Mojo mojo = run( pluginConfig, "attached" ); - - List required = Collections.singletonList( "sources/module1/src/main/java/org/test/module1/App.java" ); - - assertFilesAdded( mojo, required ); - } - - private Mojo run( String pluginConfig, String mojoName ) throws Exception - { - String pluginConfigResource = "basicAbstractAssemblyMojoFeaturesTest/" + pluginConfig; - - File pluginConfigFile = new File( getBasedir(), "src/test/plugin-configs/" + pluginConfigResource ); - - assertTrue( "Cannot find plugin-configuration: \'" + pluginConfigResource + "\' in context-classloader\'s classpath.", pluginConfigFile.exists() ); - - // TODO: Need to replace this with test-only mojos... - Mojo mojo = (Mojo) lookupMojo( mojoName, pluginConfigFile.getAbsolutePath() ); - - FileLoggingArchiverManagerStub archiverManager = (FileLoggingArchiverManagerStub) getVariableValueFromObject( mojo, "archiverManager" ); - archiverManager.clearArchiver(); - - mojo.execute(); - - return mojo; - } - - private void assertFilesAdded( Mojo mojo, List requiredDependencies ) throws Exception - { - FileLoggingArchiverManagerStub archiverManager = (FileLoggingArchiverManagerStub) getVariableValueFromObject( mojo, "archiverManager" ); - - FileLoggingArchiverStub archiver = (FileLoggingArchiverStub) archiverManager.getArchiver( (File)null ); - - Set addedFiles = archiver.getAddedFiles(); - - System.out.println( "The following files were added to the test assembly:\n" + addedFiles.toString().replace(',', '\n' ) ); - - for ( Iterator it = requiredDependencies.iterator(); it.hasNext(); ) - { - String targetPath = (String) it.next(); - - assertTrue( "Required dependency path missing: \'" + targetPath + "\'", addedFiles.contains( targetPath ) ); - } - } - - public static final class BasedirSettableMavenProjectStub extends MavenProjectStub - { - - File basedir; - - public File getBasedir() - { - return basedir; - } - - public void setBasedir( File basedir ) - { - this.basedir = basedir; - } - - - } - - public static final class FileLoggingArchiverManagerStub - implements ArchiverManager - { - private FileLoggingArchiverStub archiverStub; - - public Archiver getArchiver( String string ) throws NoSuchArchiverException - { - if ( archiverStub == null ) - { - archiverStub = new FileLoggingArchiverStub(); - } - - return archiverStub; - } - - void clearArchiver() - { - archiverStub = null; - } - - public UnArchiver getUnArchiver( String arg0 ) throws NoSuchArchiverException - { - // TODO Auto-generated method stub - return null; - } - - public UnArchiver getUnArchiver( File arg0 ) throws NoSuchArchiverException - { - // TODO Auto-generated method stub - return null; - } - - public Archiver getArchiver( File arg0 ) throws NoSuchArchiverException - { - // TODO Auto-generated method stub - return null; - } - } - - public static final class FileLoggingArchiverStub - extends NoOpArchiver - { - - private Set files = new LinkedHashSet(); - private DirectoryScanner scanner = new DirectoryScanner(); - - public void addFile( File file, String targetPath, int mode ) throws ArchiverException - { - files.add( targetPath ); - } - - public void addFile( File file, String targetPath ) throws ArchiverException - { - files.add( targetPath ); - } - - public Set getAddedFiles() - { - return files; - } - - public void addDirectory( File dir ) throws ArchiverException - { - System.out.println( "Add dir 1" ); - addDirectory_( dir, null, null, null ); - } - - public void addDirectory( File dir, String prefix ) throws ArchiverException - { - System.out.println( "Add dir 2" ); - addDirectory_( dir, prefix, null, null ); - } - - public void addDirectory( File dir, String[] includes, String[] excludes ) throws ArchiverException - { - System.out.println( "Add dir 3" ); - addDirectory_( dir, null, includes, excludes ); - } - - public void addDirectory( File dir, String prefix, String[] includes, String[] excludes ) throws ArchiverException - { - System.out.println( "Add dir 3" ); - addDirectory_( dir, prefix, includes, excludes ); - } - - private void addDirectory_( File dir, String prefix, String[] includes, String[] excludes ) throws ArchiverException - { - try - { - String include = StringUtils.join( includes, "," ); - String exclude = StringUtils.join( excludes, "," ); - - String prepend = prefix; - - if ( prepend != null && !prepend.endsWith( "/" ) ) - { - prepend += "/"; - } - - System.out.println( "Scanning: " + dir + "\nwith includes: " + include + "\nand excludes: " + exclude + "\nand prepending dir prefix: " + prepend ); - - List fileNames = FileUtils.getFileNames( dir, include, exclude, false ); - - for ( Iterator it = fileNames.iterator(); it.hasNext(); ) - { - String name = (String) it.next(); - - String fn = prepend + dir.getPath() + "/" + name; - fn.replace( '\\', '/' ); - - System.out.println( "Adding: " + fn ); - - files.add( fn ); - } - } - catch ( IOException e ) - { - throw new ArchiverException( "Error scanning for file names.", e ); - } - } - } - - public static final class TwoDependencyReactorProjectStub - extends MavenProjectStub - { - private String groupId = "org.test.project"; - private String artifactId = "test-project"; - private String version = "1"; - private String packaging = "jar"; - private String scope = "compile"; - - private String depOneArtifactId; - private String depOneGroupId; - private String depOneVersion; - private String depOneType = "jar"; - private String depOneScope = "compile"; - private File depOneFile; - - private String depTwoArtifactId; - private String depTwoGroupId; - private String depTwoVersion; - private String depTwoType = "jar"; - private String depTwoScope = "compile"; - private File depTwoFile; - private LinkedHashSet artifacts; - - public Set getArtifacts() - { - artifacts = new LinkedHashSet(); - - addArtifact( depOneGroupId, depOneArtifactId, depOneVersion, depOneType, depOneScope, depOneFile ); - addArtifact( depTwoGroupId, depTwoArtifactId, depTwoVersion, depTwoType, depTwoScope, depTwoFile ); - - return artifacts; - } - - private void addArtifact( String groupId, String artifactId, String version, String type, String scope, File file ) - { - Artifact artifact = new HandlerEquippedArtifactStub( groupId, artifactId, version, type, scope ); - artifact.setFile( file ); - - artifacts .add( artifact ); - } - - public Artifact getArtifact() - { - return new HandlerEquippedArtifactStub( groupId, artifactId, version, packaging, scope ); - } - - public TwoDependencyReactorProjectStub() - { - Model model = getModel(); - if( model == null ) - { - model = new Model(); - setModel( model ); - } - - Properties props = model.getProperties(); - if ( props == null ) - { - props = new Properties(); - model.setProperties( props ); - } - } - } - - public static final class HandlerEquippedArtifactStub implements Artifact - { - - private String type; - private String artifactId; - private String groupId; - private String version; - private String classifier; - private String scope; - private File file; - - public HandlerEquippedArtifactStub( String groupId, String artifactId, String version, String type, String scope ) - { - this.groupId = groupId; - this.artifactId = artifactId; - this.version = version; - this.type = type; - this.scope = scope; - } - - public HandlerEquippedArtifactStub() - { - } - - public ArtifactHandler getArtifactHandler() - { - ArtifactHandler handler = new ArtifactHandler() - { - - public String getClassifier() - { - return classifier; - } - - public String getDirectory() - { - return null; - } - - public String getExtension() - { - return type; - } - - public String getLanguage() - { - return "java"; - } - - public String getPackaging() - { - return type; - } - - public boolean isAddedToClasspath() - { - return true; - } - - public boolean isIncludesDependencies() - { - return true; - } - - }; - - return handler; - } - - public void addMetadata( ArtifactMetadata arg0 ) - { - // TODO Auto-generated method stub - - } - - public String getArtifactId() - { - return artifactId; - } - - public List getAvailableVersions() - { - return Collections.singletonList( version ); - } - - public String getBaseVersion() - { - return version; - } - - public String getClassifier() - { - return classifier; - } - - public String getDependencyConflictId() - { - return groupId + ":" + artifactId + ":" + type + ":" + version; - } - - public ArtifactFilter getDependencyFilter() - { - // TODO Auto-generated method stub - return null; - } - - public List getDependencyTrail() - { - // TODO Auto-generated method stub - return null; - } - - public String getDownloadUrl() - { - // TODO Auto-generated method stub - return null; - } - - public File getFile() - { - return file; - } - - public String getGroupId() - { - return groupId; - } - - public String getId() - { - return getDependencyConflictId() + ":" + scope; - } - - public Collection getMetadataList() - { - return null; - } - - public ArtifactRepository getRepository() - { - return null; - } - - public String getScope() - { - return scope; - } - - public ArtifactVersion getSelectedVersion() throws OverConstrainedVersionException - { - return null; - } - - public String getType() - { - return type; - } - - public String getVersion() - { - return version; - } - - public VersionRange getVersionRange() - { - return VersionRange.createFromVersion( version ); - } - - public boolean hasClassifier() - { - return classifier != null; - } - - public boolean isOptional() - { - return false; - } - - public boolean isRelease() - { - return false; - } - - public boolean isResolved() - { - return true; - } - - public boolean isSelectedVersionKnown() throws OverConstrainedVersionException - { - return true; - } - - public boolean isSnapshot() - { - return false; - } - - public void selectVersion( String arg0 ) - { - } - - public void setArtifactHandler( ArtifactHandler arg0 ) - { - } - - public void setArtifactId( String artifactId ) - { - this.artifactId = artifactId; - } - - public void setAvailableVersions( List arg0 ) - { - } - - public void setBaseVersion( String version ) - { - this.version = version; - } - - public void setDependencyFilter( ArtifactFilter arg0 ) - { - } - - public void setDependencyTrail( List arg0 ) - { - } - - public void setDownloadUrl( String arg0 ) - { - } - - public void setFile( File file ) - { - this.file = file; - - if ( file.exists() ) - { - Writer writer = null; - try - { - writer = new FileWriter( file ); - writer.write( "test artifact" ); - } - catch ( IOException e ) - { - IllegalArgumentException error = new IllegalArgumentException( "Cannot write test file: " + file + ". Reason: " + e.getMessage() ); - error.initCause( e ); - - throw error; - } - finally - { - IOUtil.close( writer ); - } - } - } - - public void setGroupId( String groupId ) - { - this.groupId = groupId; - } - - public void setRelease( boolean arg0 ) - { - } - - public void setRepository( ArtifactRepository arg0 ) - { - } - - public void setResolved( boolean arg0 ) - { - } - - public void setResolvedVersion( String version ) - { - this.version = version; - } - - public void setScope( String scope ) - { - this.scope = scope; - } - - public void setVersion( String version ) - { - this.version = version; - } - - public void setVersionRange( VersionRange arg0 ) - { - } - - public void updateVersion( String arg0, ArtifactRepository arg1 ) - { - } - - public int compareTo( Object o ) - { - return 0; - } - - public void setOptional( boolean optional ) - { - } - } -} diff --git a/src/functional-tests/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator2Test.java b/src/functional-tests/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator2Test.java deleted file mode 100644 index 7f1d1cdc3..000000000 --- a/src/functional-tests/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator2Test.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.apache.maven.plugin.assembly.interpolation; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - - -import junit.framework.TestCase; -import org.apache.maven.model.Model; -import org.apache.maven.plugins.assembly.interpolation.AssemblyInterpolationException; -import org.apache.maven.plugins.assembly.interpolation.AssemblyInterpolator; -import org.apache.maven.plugins.assembly.io.DefaultAssemblyReader; -import org.apache.maven.plugins.assembly.model.Assembly; -import org.apache.maven.plugins.assembly.model.DependencySet; - -import java.io.IOException; -import java.util.Collections; -import java.util.List; - -public class AssemblyInterpolator2Test - extends TestCase -{ - - public void testDependencyOutputFileNameMappingsAreNotInterpolated() - throws IOException, AssemblyInterpolationException - { - AssemblyInterpolator interpolator = new AssemblyInterpolator(); - - Model model = new Model(); - model.setArtifactId( "artifact-id" ); - model.setGroupId( "group.id" ); - model.setVersion( "1" ); - - Assembly assembly = new Assembly(); - - DependencySet set = new DependencySet(); - set.setOutputFileNameMapping( "${artifact.artifactId}.${artifact.extension}" ); - - assembly.addDependencySet( set ); - - Assembly outputAssembly = interpolator.interpolate( assembly, model, Collections.EMPTY_MAP, - DefaultAssemblyReader.create(model)); - - List outputDependencySets = outputAssembly.getDependencySets(); - assertEquals( 1, outputDependencySets.size() ); - - DependencySet outputSet = (DependencySet) outputDependencySets.get( 0 ); - - assertEquals( set.getOutputFileNameMapping(), outputSet.getOutputFileNameMapping() ); - } - -} diff --git a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerStub.java b/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerStub.java deleted file mode 100644 index ba046ba8e..000000000 --- a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerStub.java +++ /dev/null @@ -1,124 +0,0 @@ -package org.apache.maven.plugin.assembly.stubs; - -/* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.archiver.Archiver; -import org.codehaus.plexus.archiver.UnArchiver; -import org.codehaus.plexus.archiver.manager.ArchiverManager; -import org.codehaus.plexus.archiver.manager.NoSuchArchiverException; - -import java.io.File; - -/** - * @author Edwin Punzalan - */ -public class ArchiverManagerStub - implements ArchiverManager -{ - public static Archiver archiverStub; - - public static UnArchiverStub unArchiverStub; - - public ArchiverManagerStub() - { - archiverStub = null; - - unArchiverStub = null; - } - - public Archiver getArchiver( String string ) - throws NoSuchArchiverException - { - if ( archiverStub == null ) - { - if( "dir".equals( string ) ) - { - archiverStub = new DirectoryArchiverStub(); - } - else if ( "tar".equals( string ) ) - { - archiverStub = new TarArchiverStub(); - } - else if ( "war".equals( string ) ) - { - archiverStub = new WarArchiverStub(); - } - else if ( "zip".equals( string ) || - "jar".equals( string ) ) - { - archiverStub = new JarArchiverStub(); - } - else - { - throw new NoSuchArchiverException( string ); - } - } - - return archiverStub; - } - - public void setArchiver( JarArchiverStub archiver ) - { - archiverStub = archiver; - } - - public UnArchiver getUnArchiver( String string ) - throws NoSuchArchiverException - { - if ( unArchiverStub == null ) - { - if ( "jar".equals( string ) ) - { - unArchiverStub = new SignedUnArchiver(); - } - else - { - unArchiverStub = new UnArchiverStub(); - } - } - - return unArchiverStub; - } - - public UnArchiver getUnArchiver( File file ) - throws NoSuchArchiverException - { - if ( unArchiverStub == null ) - { - String filename = file.getName(); - - unArchiverStub = (UnArchiverStub) getUnArchiver( filename.substring( filename.lastIndexOf( '.' ) + 1 ) ); - } - - return unArchiverStub; - } - - public Archiver getArchiver( File string ) - throws NoSuchArchiverException - { - if ( archiverStub == null ) - { - archiverStub = new JarArchiverStub(); - } - - return archiverStub; - } - public void setUnArchiver( UnArchiverStub unArchiver ) - { - unArchiverStub = unArchiver; - } -} diff --git a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerWithExceptionStub.java b/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerWithExceptionStub.java deleted file mode 100644 index 406c5169c..000000000 --- a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerWithExceptionStub.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.apache.maven.plugin.assembly.stubs; - -import java.io.File; - -import org.codehaus.plexus.archiver.Archiver; -import org.codehaus.plexus.archiver.UnArchiver; -import org.codehaus.plexus.archiver.manager.NoSuchArchiverException; - -/* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @author Edwin Punzalan - */ -public class ArchiverManagerWithExceptionStub - extends ArchiverManagerStub -{ - public UnArchiver getUnArchiver( String string ) - throws NoSuchArchiverException - { - throw new NoSuchArchiverException( "Expected exception" ); - } - - public Archiver getArchiver( String string ) - throws NoSuchArchiverException - { - throw new NoSuchArchiverException( "Expected exception" ); - } - - public UnArchiver getUnArchiver( File string ) - throws NoSuchArchiverException - { - throw new NoSuchArchiverException( "Expected exception" ); - } - - public Archiver getArchiver( File string ) - throws NoSuchArchiverException - { - throw new NoSuchArchiverException( "Expected exception" ); - } -} diff --git a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ArtifactStub.java b/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ArtifactStub.java deleted file mode 100644 index 78e163c8d..000000000 --- a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ArtifactStub.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.apache.maven.plugin.assembly.stubs; - -/* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.apache.maven.artifact.DefaultArtifact; -import org.apache.maven.artifact.handler.DefaultArtifactHandler; -import org.apache.maven.artifact.versioning.VersionRange; -import org.codehaus.plexus.PlexusTestCase; - -import java.io.File; - -/** - * @author Edwin Punzalan - */ -public class ArtifactStub - extends DefaultArtifact -{ - public ArtifactStub( String groupId, String artifactId, String version, String packaging, String scope ) - { - this( groupId, artifactId, version, packaging, null, scope ); - } - - public ArtifactStub( String groupId, String artifactId, String version, String packaging, String classifier, String scope ) - { - super( groupId, artifactId, VersionRange.createFromVersion( version ), scope, packaging, - classifier, new DefaultArtifactHandler( packaging ), false ); - } - - public File getFile() - { - return new File( PlexusTestCase.getBasedir() + "/target/local-repo", getArtifactId() + "-" + getVersion() + "." + getType() ) - { - public long lastModified() - { - return System.currentTimeMillis(); - } - }; - } -} diff --git a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/AssemblyMavenProjectStub.java b/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/AssemblyMavenProjectStub.java deleted file mode 100644 index 637f2109e..000000000 --- a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/AssemblyMavenProjectStub.java +++ /dev/null @@ -1,173 +0,0 @@ -package org.apache.maven.plugin.assembly.stubs; - -/* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.apache.maven.plugin.testing.stubs.MavenProjectStub; -import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.DefaultArtifact; -import org.apache.maven.artifact.repository.DefaultArtifactRepository; -import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout; -import org.apache.maven.artifact.handler.DefaultArtifactHandler; -import org.apache.maven.artifact.versioning.VersionRange; -import org.apache.maven.model.Model; -import org.apache.maven.model.Build; -import org.codehaus.plexus.PlexusTestCase; - -import java.util.Set; -import java.util.Collections; -import java.util.Properties; -import java.util.List; -import java.io.File; - -/** - * @author Edwin Punzalan - */ -public class AssemblyMavenProjectStub - extends MavenProjectStub -{ - private String groupId, artifactId, version; - - private Artifact artifact; - - private Set artifacts; - - private Model model; - - private File basedir; - - public Build getBuild() - { - return model.getBuild(); - } - - public List getRemoteArtifactRepositories() - { - ArtifactRepository repository = new DefaultArtifactRepository( "central", - "file://" + PlexusTestCase.getBasedir() + "/src/test/remote-repo", - new DefaultRepositoryLayout() ); - - return Collections.singletonList( repository ); - } - - public AssemblyMavenProjectStub() - { - groupId = "assembly"; - artifactId = "test-project"; - version = "1.0"; - } - - public Set getDependencyArtifacts() - { - return Collections.singleton( - new DefaultArtifact( "assembly", "dependency-artifact", VersionRange.createFromVersion( "1.0" ), - Artifact.SCOPE_COMPILE, "jar", null, new DefaultArtifactHandler( "jar" ), false ) - ); - } - - public File getBasedir() - { - if ( basedir == null ) - { - basedir = new File( PlexusTestCase.getBasedir() ); - } - - return basedir; - } - - public Artifact getArtifact() - { - if ( artifact == null ) - { - artifact = new ArtifactStub( groupId, artifactId, version, "jar", Artifact.SCOPE_COMPILE ); - } - - return artifact; - } - - public Model getModel() - { - if ( model == null ) - { - model = new Model(); - - model.setProperties( new Properties() ); - - model.setGroupId( getGroupId() ); - - model.setArtifactId( getArtifactId() ); - - model.setVersion( getVersion() ); - - Build build = new Build(); - build.setFinalName( getArtifactId() + "-" + getVersion() ); - model.setBuild( build ); - } - - return model; - } - - public Set getArtifacts() - { - if ( artifacts == null ) - { - artifacts = Collections.EMPTY_SET; - } - - return artifacts; - } - - public void setArtifacts( Set artifacts ) - { - this.artifacts = artifacts; - } - - public Properties getProperties() - { - return new Properties(); - } - - public String getGroupId() - { - return groupId; - } - - public void setGroupId( String groupId ) - { - this.groupId = groupId; - } - - public String getArtifactId() - { - return artifactId; - } - - public void setArtifactId( String artifactId ) - { - this.artifactId = artifactId; - } - - public String getVersion() - { - return version; - } - - public void setVersion( String version ) - { - this.version = version; - } -} diff --git a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/DirectoryArchiverStub.java b/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/DirectoryArchiverStub.java deleted file mode 100644 index 47aa10d6d..000000000 --- a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/DirectoryArchiverStub.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.apache.maven.plugin.assembly.stubs; - -import org.codehaus.plexus.archiver.ArchiverException; - -import java.io.IOException; - -/* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @author Allan Ramirez - */ -public class DirectoryArchiverStub - extends JarArchiverStub -{ - public void createArchive() - throws ArchiverException, IOException - { - getDestFile().mkdirs(); - } -} diff --git a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/JarArchiverStub.java b/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/JarArchiverStub.java deleted file mode 100644 index b4aa2a25b..000000000 --- a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/JarArchiverStub.java +++ /dev/null @@ -1,227 +0,0 @@ -package org.apache.maven.plugin.assembly.stubs; - -/* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.archiver.ArchiverException; -import org.codehaus.plexus.archiver.jar.JarArchiver; -import org.codehaus.plexus.archiver.jar.Manifest; -import org.codehaus.plexus.archiver.jar.ManifestException; - -import java.io.File; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -/** - * @author Edwin Punzalan - */ -public class JarArchiverStub - extends JarArchiver -{ - private Map files = new HashMap(); - - private File destFile; - - private int fileMode = 0; - - private int dirMode = 0; - - private boolean includeEmptyDirs = false; - - private Manifest manifest; - - public void createArchive() - throws ArchiverException, IOException - { - destFile.getParentFile().mkdirs(); - destFile.delete(); - - if ( !destFile.createNewFile() ) - { - throw new ArchiverException( "Unable to create archive file: " + destFile.getAbsolutePath() ); - } - } - - public void addDirectory( File file ) - throws ArchiverException - { - addDirectory( file, "" ); - } - - public void addDirectory( File file, String string ) - throws ArchiverException - { - addDirectory( file, string, null, null ); - } - - public void addDirectory( File file, String[] strings, String[] strings1 ) - throws ArchiverException - { - addDirectory( file, file.getName(), strings, strings1 ); - } - - public void addDirectory( File file, String string, String[] includes, String[] excludes ) - throws ArchiverException - { - System.out.println( "Adding dir " + file.getPath() ); - - files.put( file, new ArchiverFile( file, string, includes, excludes ) ); - } - - public void addFile( File file, String string ) - throws ArchiverException - { - addFile( file, string, 0 ); - } - - public void addFile( File file, String string, int i ) - throws ArchiverException - { - System.out.println( "Adding file " + file.getPath() ); - - ArchiverFile archiverFile = new ArchiverFile( file, string, null, null ); - - archiverFile.setFileMode( i ); - - files.put( file, archiverFile ); - } - - public File getDestFile() - { - return destFile; - } - - public void setDestFile( File file ) - { - destFile = file; - } - - public void setDefaultFileMode( int i ) - { - fileMode = i; - } - - public int getDefaultFileMode() - { - return fileMode; - } - - public void setDefaultDirectoryMode( int i ) - { - dirMode = i; - } - - public int getDefaultDirectoryMode() - { - return dirMode; - } - - public boolean getIncludeEmptyDirs() - { - return includeEmptyDirs; - } - - public void setIncludeEmptyDirs( boolean b ) - { - includeEmptyDirs = b; - } - - public Map getFiles() - { - return files; - } - - public void addConfiguredManifest( Manifest newManifest ) - throws ManifestException - { - manifest = newManifest; - } - - public Manifest getManifest() - { - return manifest; - } - - public class ArchiverFile - { - private File file; - - private String outputName; - - private String[] includes, excludes; - - private int fileMode; - - private ArchiverFile( File file, String outputName, String[] includes, String[] excludes ) - { - this.file = file; - this.outputName = outputName; - this.includes = includes; - this.excludes = excludes; - } - - public File getFile() - { - return file; - } - - public void setFile( File file ) - { - this.file = file; - } - - public String getOutputName() - { - return outputName; - } - - public void setOutputName( String outputName ) - { - this.outputName = outputName; - } - - public String[] getIncludes() - { - return includes; - } - - public void setIncludes( String[] includes ) - { - this.includes = includes; - } - - public String[] getExcludes() - { - return excludes; - } - - public void setExcludes( String[] excludes ) - { - this.excludes = excludes; - } - - public int getFileMode() - { - return fileMode; - } - - public void setFileMode( int fileMode ) - { - this.fileMode = fileMode; - } - } -} diff --git a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/MavenProjectWithArtifactsStub.java b/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/MavenProjectWithArtifactsStub.java deleted file mode 100644 index 6b3cd92f3..000000000 --- a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/MavenProjectWithArtifactsStub.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.apache.maven.plugin.assembly.stubs; - -import org.apache.maven.artifact.Artifact; - -import java.util.Set; -import java.util.HashSet; - -/* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @author Edwin Punzalan - */ -public class MavenProjectWithArtifactsStub - extends AssemblyMavenProjectStub -{ - public MavenProjectWithArtifactsStub() - { - Set artifacts = new HashSet(); - - artifacts.add( new ArtifactStub( "assembly", "dependency-artifact1", "1.0", "jar", Artifact.SCOPE_COMPILE ) ); - artifacts.add( new ArtifactStub( "assembly", "dependency-artifact2", "1.0", "jar", Artifact.SCOPE_RUNTIME ) ); - artifacts.add( new ArtifactStub( "assembly", "dependency-artifact3", "1.0", "jar", Artifact.SCOPE_TEST ) ); - - setArtifacts( artifacts ); - } -} diff --git a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/MavenProjectWithDependencyClassifierStub.java b/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/MavenProjectWithDependencyClassifierStub.java deleted file mode 100644 index 668fdf8be..000000000 --- a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/MavenProjectWithDependencyClassifierStub.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.apache.maven.plugin.assembly.stubs; - -import org.apache.maven.artifact.Artifact; - -import java.util.Set; -import java.util.HashSet; - -/* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @author Edwin Punzalan - */ -public class MavenProjectWithDependencyClassifierStub - extends MavenProjectWithArtifactsStub -{ - public MavenProjectWithDependencyClassifierStub() - { - Set artifacts = new HashSet(); - - artifacts.add( new ArtifactStub( "assembly", "dependency-artifact1", "1.0", - "jar", "classifier", Artifact.SCOPE_COMPILE ) ); - artifacts.add( new ArtifactStub( "assembly", "dependency-artifact2", "1.0", "jar", Artifact.SCOPE_RUNTIME ) ); - artifacts.add( new ArtifactStub( "assembly", "dependency-artifact3", "1.0", "jar", Artifact.SCOPE_TEST ) ); - - setArtifacts( artifacts ); - } -} diff --git a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ReactorMavenProjectStub.java b/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ReactorMavenProjectStub.java deleted file mode 100644 index d5c9990f3..000000000 --- a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ReactorMavenProjectStub.java +++ /dev/null @@ -1,159 +0,0 @@ -package org.apache.maven.plugin.assembly.stubs; - -/* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.apache.maven.artifact.Artifact; -import org.apache.maven.model.Build; -import org.apache.maven.model.Model; -import org.apache.maven.model.Reporting; -import org.apache.maven.plugin.testing.stubs.MavenProjectStub; -import org.apache.maven.project.MavenProject; -import org.codehaus.plexus.util.FileUtils; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Properties; -import java.util.Set; - -/** - * @author Edwin Punzalan - */ -public class ReactorMavenProjectStub - extends MavenProjectStub -{ - public static List reactorProjects = new ArrayList(); - - private MavenProject parent; - - private Model model; - - private File basedir; - - public ReactorMavenProjectStub() - { - this( "jar" ); - } - - public ReactorMavenProjectStub( String packaging ) - { - super(); - - reactorProjects.add( this ); - - setGroupId( "assembly" ); - setArtifactId( "reactor-project-" + reactorProjects.size() ); - setVersion( "1.0" ); - setPackaging( packaging ); - - setArtifact( new ArtifactStub( getGroupId(), getArtifactId(), - getVersion(), getPackaging(), Artifact.SCOPE_COMPILE ) ); - } - - public String getId() - { - return getGroupId() + ":" + getArtifactId() + ":" + getVersion() + ":" + getPackaging(); - } - - public Set getArtifacts() - { - Set artifacts = new HashSet(); - - artifacts.add( new ArtifactStub( "assembly", "reactor-dependency", "1.0", "jar", Artifact.SCOPE_COMPILE ) ); - - return artifacts; - } - - public File getBasedir() - { - File basedir = super.getBasedir(); - - if ( parent != null ) - { - basedir = parent.getBasedir(); - } - - return new File( basedir, getArtifactId() ); - } - - public Reporting getReporting() - { - return model.getReporting(); - } - - public Model getModel() - { - if ( model == null ) - { - model = new Model(); - - model.setGroupId( getGroupId() ); - - model.setArtifactId( getArtifactId() ); - - model.setVersion( getVersion() ); - - model.setPackaging( getPackaging() ); - - model.setProperties( new Properties() ); - - Build build = new Build(); - build.setFinalName( getArtifactId() + "-" + getVersion() + "." + getPackaging() ); - - if ( parent != null ) - { - build.setDirectory( parent.getBasedir().getAbsolutePath() + "/" + getArtifactId() + "/target" ); - FileUtils.mkdir( build.getDirectory() ); - - build.setOutputDirectory( parent.getBasedir().getAbsolutePath() + "/" + - getArtifactId() + "/target/classes" ); - FileUtils.mkdir( build.getOutputDirectory() ); - - build.setTestOutputDirectory( parent.getBasedir().getAbsolutePath() + "/" + - getArtifactId() + "/target/test-classes" ); - FileUtils.mkdir( build.getTestOutputDirectory() ); - - Reporting reporting = new Reporting(); - reporting.setOutputDirectory( parent.getBasedir().getAbsolutePath() + "/" + - getArtifactId() + "/target/site" ); - FileUtils.mkdir( reporting.getOutputDirectory() ); - - model.setReporting( reporting ); - } - - model.setBuild( build ); - } - - return model; - } - - public Build getBuild() - { - return getModel().getBuild(); - } - - public void setParent( MavenProject parent ) - { - this.parent = parent; - } - - public MavenProject getParent() - { - return parent; - } -} diff --git a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/SignedUnArchiver.java b/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/SignedUnArchiver.java deleted file mode 100644 index 18ad86da0..000000000 --- a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/SignedUnArchiver.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.apache.maven.plugin.assembly.stubs; - -import org.codehaus.plexus.archiver.ArchiverException; - -import java.io.IOException; -import java.io.File; - -/* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @author Edwin Punzalan - */ -public class SignedUnArchiver - extends UnArchiverStub -{ - public void extract() - throws ArchiverException, IOException - { - super.extract(); - - File signatureDir = new File( getDestDirectory(), "META-INF" ); - signatureDir.mkdirs(); - - File signatureFile = new File( signatureDir, "security-file.RSA" ); - signatureFile.createNewFile(); - - signatureFile = new File( signatureDir, "security-file.DSA" ); - signatureFile.createNewFile(); - - signatureFile = new File( signatureDir, "security-file.SF" ); - signatureFile.createNewFile(); - - signatureFile = new File( signatureDir, "security-file.rsa" ); - signatureFile.createNewFile(); - - signatureFile = new File( signatureDir, "security-file.dsa" ); - signatureFile.createNewFile(); - - signatureFile = new File( signatureDir, "security-file.sf" ); - signatureFile.createNewFile(); - - signatureFile = new File( signatureDir, "non-security-file" ); - signatureFile.createNewFile(); - } -} diff --git a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/TarArchiverStub.java b/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/TarArchiverStub.java deleted file mode 100644 index a58ec68dd..000000000 --- a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/TarArchiverStub.java +++ /dev/null @@ -1,227 +0,0 @@ -package org.apache.maven.plugin.assembly.stubs; - -/* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.archiver.tar.TarArchiver; -import org.codehaus.plexus.archiver.tar.TarLongFileMode; -import org.codehaus.plexus.archiver.ArchiverException; - -import java.util.Map; -import java.util.HashMap; -import java.io.File; -import java.io.IOException; - -/** - * @author Edwin Punzalan - */ -public class TarArchiverStub - extends TarArchiver -{ - private Map files = new HashMap(); - - private File destFile; - - private int fileMode = 0; - - private int dirMode = 0; - - private boolean includeEmptyDirs = false; - - private TarCompressionMethod tarCompressionMethod; - - private TarLongFileMode longFileMode; - - public void setLongfile( TarLongFileMode mode ) - { - this.longFileMode = mode; - } - - public void setCompression( TarCompressionMethod mode ) - { - tarCompressionMethod = mode; - } - - public void createArchive() - throws ArchiverException, IOException - { - destFile.getParentFile().mkdirs(); - destFile.delete(); - - if ( !destFile.createNewFile() ) - { - throw new ArchiverException( "Unable to create archive file: " + destFile.getAbsolutePath() ); - } - } - - public void addDirectory( File file ) - throws ArchiverException - { - addDirectory( file, "" ); - } - - public void addDirectory( File file, String string ) - throws ArchiverException - { - addDirectory( file, string, null, null ); - } - - public void addDirectory( File file, String[] strings, String[] strings1 ) - throws ArchiverException - { - addDirectory( file, file.getName(), strings, strings1 ); - } - - public void addDirectory( File file, String string, String[] includes, String[] excludes ) - throws ArchiverException - { - System.out.println( "Adding dir " + file.getPath() ); - - files.put( file, new ArchiverFile( file, string, includes, excludes ) ); - } - - public void addFile( File file, String string ) - throws ArchiverException - { - addFile( file, string, 0 ); - } - - public void addFile( File file, String string, int i ) - throws ArchiverException - { - System.out.println( "Adding file " + file.getPath() ); - - ArchiverFile archiverFile = new ArchiverFile( file, string, null, null ); - - archiverFile.setFileMode( i ); - - files.put( file, archiverFile ); - } - - public File getDestFile() - { - return destFile; - } - - public void setDestFile( File file ) - { - destFile = file; - } - - public void setDefaultFileMode( int i ) - { - fileMode = i; - } - - public int getDefaultFileMode() - { - return fileMode; - } - - public void setDefaultDirectoryMode( int i ) - { - dirMode = i; - } - - public int getDefaultDirectoryMode() - { - return dirMode; - } - - public boolean getIncludeEmptyDirs() - { - return includeEmptyDirs; - } - - public void setIncludeEmptyDirs( boolean b ) - { - includeEmptyDirs = b; - } - - public Map getFiles() - { - return files; - } - - public class ArchiverFile - { - private File file; - - private String outputName; - - private String[] includes, excludes; - - private int fileMode; - - private ArchiverFile( File file, String outputName, String[] includes, String[] excludes ) - { - this.file = file; - this.outputName = outputName; - this.includes = includes; - this.excludes = excludes; - } - - public File getFile() - { - return file; - } - - public void setFile( File file ) - { - this.file = file; - } - - public String getOutputName() - { - return outputName; - } - - public void setOutputName( String outputName ) - { - this.outputName = outputName; - } - - public String[] getIncludes() - { - return includes; - } - - public void setIncludes( String[] includes ) - { - this.includes = includes; - } - - public String[] getExcludes() - { - return excludes; - } - - public void setExcludes( String[] excludes ) - { - this.excludes = excludes; - } - - public int getFileMode() - { - return fileMode; - } - - public void setFileMode( int fileMode ) - { - this.fileMode = fileMode; - } - } -} diff --git a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/UnArchiverStub.java b/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/UnArchiverStub.java deleted file mode 100644 index 6c0fb5f99..000000000 --- a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/UnArchiverStub.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.apache.maven.plugin.assembly.stubs; - -/* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.archiver.ArchiverException; -import org.codehaus.plexus.archiver.UnArchiver; - -import java.io.File; -import java.io.IOException; - -/** - * @author Edwin Punzalan - */ -public class UnArchiverStub - implements UnArchiver -{ - private File sourceFile, destDir; - - public void extract() - throws ArchiverException, IOException - { - File extractedFile = new File( getDestDirectory(), getSourceFile().getName() + ".extracted" ); - - if ( !extractedFile.exists() ) - { - extractedFile.createNewFile(); - } - } - - public File getDestDirectory() - { - return destDir; - } - - public void setDestDirectory( File file ) - { - destDir = file; - } - - public File getDestFile() - { - return null; - } - - public void setDestFile( File file ) - { - } - - public File getSourceFile() - { - return sourceFile; - } - - public void setSourceFile( File file ) - { - this.sourceFile = file; - } - - public void setOverwrite( boolean b ) - { - } -// -// public List getUnpackedFiles() -// { -// return unpackedFiles; -// } -// -// public class UnpackedArchive -// { -// private File sourceFile, destDirectory; -// -// private UnpackedArchive( File sourceFile, File destDirectory ) -// { -// this.sourceFile = sourceFile; -// this.destDirectory = destDirectory; -// } -// -// public File getSourceFile() -// { -// return sourceFile; -// } -// -// public File getDestDirectory() -// { -// return destDirectory; -// } -// -// public boolean equals( Object obj ) -// { -// boolean equal = false; -// -// if ( obj instanceof UnpackedArchive ) -// { -// UnpackedArchive unpacked = (UnpackedArchive) obj; -// if ( unpacked.getSourceFile().equals( getSourceFile() ) && -// unpacked.getDestDirectory().equals( getDestDirectory() ) ) -// { -// equal = true; -// } -// } -// -// return equal; -// } -// } -} diff --git a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/UnArchiverWithException.java b/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/UnArchiverWithException.java deleted file mode 100644 index fd423c3c7..000000000 --- a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/UnArchiverWithException.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.apache.maven.plugin.assembly.stubs; - -import org.codehaus.plexus.archiver.ArchiverException; - -import java.io.IOException; - -/* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @author Edwin Punzalan - */ -public class UnArchiverWithException - extends UnArchiverStub -{ - public void extract() - throws ArchiverException, IOException - { - throw new ArchiverException( "exception explicitly thrown for testing" ); - } -} diff --git a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/WarArchiverStub.java b/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/WarArchiverStub.java deleted file mode 100644 index a968b9101..000000000 --- a/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/WarArchiverStub.java +++ /dev/null @@ -1,224 +0,0 @@ -package org.apache.maven.plugin.assembly.stubs; - -/* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.archiver.war.WarArchiver; -import org.codehaus.plexus.archiver.ArchiverException; - -import java.util.Map; -import java.util.HashMap; -import java.io.File; -import java.io.IOException; - -/** - * @author Edwin Punzalan - */ -public class WarArchiverStub - extends WarArchiver -{ - private Map files = new HashMap(); - - private File destFile; - - private int fileMode = 0; - - private int dirMode = 0; - - private boolean includeEmptyDirs = false; - - private boolean ignoreWebxml = false; - - public void createArchive() - throws ArchiverException, IOException - { - destFile.getParentFile().mkdirs(); - destFile.delete(); - - if ( !destFile.createNewFile() ) - { - throw new ArchiverException( "Unable to create archive file: " + destFile.getAbsolutePath() ); - } - } - - public void addDirectory( File file ) - throws ArchiverException - { - addDirectory( file, "" ); - } - - public void addDirectory( File file, String string ) - throws ArchiverException - { - addDirectory( file, string, null, null ); - } - - public void addDirectory( File file, String[] strings, String[] strings1 ) - throws ArchiverException - { - addDirectory( file, file.getName(), strings, strings1 ); - } - - public void addDirectory( File file, String string, String[] includes, String[] excludes ) - throws ArchiverException - { - System.out.println( "Adding dir " + file.getPath() ); - - files.put( file, new ArchiverFile( file, string, includes, excludes ) ); - } - - public void addFile( File file, String string ) - throws ArchiverException - { - addFile( file, string, 0 ); - } - - public void addFile( File file, String string, int i ) - throws ArchiverException - { - System.out.println( "Adding file " + file.getPath() ); - - ArchiverFile archiverFile = new ArchiverFile( file, string, null, null ); - - archiverFile.setFileMode( i ); - - files.put( file, archiverFile ); - } - - public File getDestFile() - { - return destFile; - } - - public void setDestFile( File file ) - { - destFile = file; - } - - public void setDefaultFileMode( int i ) - { - fileMode = i; - } - - public int getDefaultFileMode() - { - return fileMode; - } - - public void setDefaultDirectoryMode( int i ) - { - dirMode = i; - } - - public int getDefaultDirectoryMode() - { - return dirMode; - } - - public boolean getIncludeEmptyDirs() - { - return includeEmptyDirs; - } - - public void setIncludeEmptyDirs( boolean b ) - { - includeEmptyDirs = b; - } - - public Map getFiles() - { - return files; - } - - public void setIgnoreWebxml( boolean ignore ) - { - this.ignoreWebxml = ignore; - } - - public boolean getIgnoreWebxml() - { - return ignoreWebxml; - } - - public class ArchiverFile - { - private File file; - - private String outputName; - - private String[] includes, excludes; - - private int fileMode; - - private ArchiverFile( File file, String outputName, String[] includes, String[] excludes ) - { - this.file = file; - this.outputName = outputName; - this.includes = includes; - this.excludes = excludes; - } - - public File getFile() - { - return file; - } - - public void setFile( File file ) - { - this.file = file; - } - - public String getOutputName() - { - return outputName; - } - - public void setOutputName( String outputName ) - { - this.outputName = outputName; - } - - public String[] getIncludes() - { - return includes; - } - - public void setIncludes( String[] includes ) - { - this.includes = includes; - } - - public String[] getExcludes() - { - return excludes; - } - - public void setExcludes( String[] excludes ) - { - this.excludes = excludes; - } - - public int getFileMode() - { - return fileMode; - } - - public void setFileMode( int fileMode ) - { - this.fileMode = fileMode; - } - } -} diff --git a/src/functional-tests/plugin-configs/assembly/MASSEMBLY-98-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/MASSEMBLY-98-plugin-config.xml deleted file mode 100644 index ea3ebf339..000000000 --- a/src/functional-tests/plugin-configs/assembly/MASSEMBLY-98-plugin-config.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/MASSEMBLY-98/target - assembly - ${basedir}/target/test-harness/assembly/MASSEMBLY-98/work - - ${localRepository} - - - - - - MASSEMBLY-98 - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/MASSEMBLY-98/archive-tmp - ${basedir}/target/test-harness/assembly/MASSEMBLY-98/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/NoSuchArchiverException-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/NoSuchArchiverException-plugin-config.xml deleted file mode 100644 index e547c5f89..000000000 --- a/src/functional-tests/plugin-configs/assembly/NoSuchArchiverException-plugin-config.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/NoSuchArchiverException/target - assembly - ${basedir}/target/test-harness/assembly/NoSuchArchiverException/work - - ${localRepository} - - - - - ${basedir}/src/test/resources/assemblies/NoSuchArchiverException.xml - warn - ${basedir} - ${basedir}/target/test-harness/assembly/NoSuchArchiverException/archive-tmp - ${basedir}/target/test-harness/assembly/NoSuchArchiverException/site - false - false - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/classifier-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/classifier-plugin-config.xml deleted file mode 100644 index 33623a695..000000000 --- a/src/functional-tests/plugin-configs/assembly/classifier-plugin-config.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/classifier/target - assembly - ${basedir}/target/test-harness/assembly/classifier/work - - ${localRepository} - - test-harness - - - simple - warn - ${basedir} - ${basedir}/target/test-harness/assembly/classifier/archive-tmp - ${basedir}/target/test-harness/assembly/classifier/site - false - false - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/component-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/component-plugin-config.xml deleted file mode 100644 index 3746c946c..000000000 --- a/src/functional-tests/plugin-configs/assembly/component-plugin-config.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/component/target - assembly - ${basedir}/target/test-harness/assembly/component/work - - ${localRepository} - - - - - - empty - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/component/archive-tmp - ${basedir}/target/test-harness/assembly/component/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/depSet-default-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/depSet-default-plugin-config.xml deleted file mode 100644 index 2ce10d23b..000000000 --- a/src/functional-tests/plugin-configs/assembly/depSet-default-plugin-config.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/depSet-default/target - assembly - ${basedir}/target/test-harness/assembly/depSet-default/work - - ${localRepository} - - - - - - dependencySet-default - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/depSet-default/archive-tmp - ${basedir}/target/test-harness/assembly/depSet-default/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/depSet-excludes-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/depSet-excludes-plugin-config.xml deleted file mode 100644 index 386a24022..000000000 --- a/src/functional-tests/plugin-configs/assembly/depSet-excludes-plugin-config.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/depSet-excludes/target - assembly - ${basedir}/target/test-harness/assembly/depSet-excludes/work - - ${localRepository} - - - - - - dependencySet-excludes - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/depSet-excludes/archive-tmp - ${basedir}/target/test-harness/assembly/depSet-excludes/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/depSet-filename-mapping-and-classifier-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/depSet-filename-mapping-and-classifier-plugin-config.xml deleted file mode 100644 index 147b7c369..000000000 --- a/src/functional-tests/plugin-configs/assembly/depSet-filename-mapping-and-classifier-plugin-config.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/depSet-filename-mapping-and-classifier/target - assembly - ${basedir}/target/test-harness/assembly/depSet-filename-mapping-and-classifier/work - - ${localRepository} - - - - - - dependencySet-filename-mapping-and-classifier - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/depSet-filename-mapping-and-classifier/archive-tmp - ${basedir}/target/test-harness/assembly/depSet-filename-mapping-and-classifier/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/depSet-filename-mapping-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/depSet-filename-mapping-plugin-config.xml deleted file mode 100644 index 300237c63..000000000 --- a/src/functional-tests/plugin-configs/assembly/depSet-filename-mapping-plugin-config.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/depSet-filename-mapping/target - assembly - ${basedir}/target/test-harness/assembly/depSet-filename-mapping/work - - ${localRepository} - - - - - - dependencySet-filename-mapping - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/depSet-filename-mapping/archive-tmp - ${basedir}/target/test-harness/assembly/depSet-filename-mapping/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/depSet-includes-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/depSet-includes-plugin-config.xml deleted file mode 100644 index 53c075aff..000000000 --- a/src/functional-tests/plugin-configs/assembly/depSet-includes-plugin-config.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/depSet-includes/target - assembly - ${basedir}/target/test-harness/assembly/depSet-includes/work - - ${localRepository} - - - - - - dependencySet-includes - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/depSet-includes/archive-tmp - ${basedir}/target/test-harness/assembly/depSet-includes/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/depSet-scoped-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/depSet-scoped-plugin-config.xml deleted file mode 100644 index 3db222857..000000000 --- a/src/functional-tests/plugin-configs/assembly/depSet-scoped-plugin-config.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/depSet-scoped/target - assembly - ${basedir}/target/test-harness/assembly/depSet-scoped/work - - ${localRepository} - - - - - - dependencySet-scoped - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/depSet-scoped/archive-tmp - ${basedir}/target/test-harness/assembly/depSet-scoped/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/depSet-unpack-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/depSet-unpack-plugin-config.xml deleted file mode 100644 index aa39b892d..000000000 --- a/src/functional-tests/plugin-configs/assembly/depSet-unpack-plugin-config.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/depSet-unpack/target - assembly - ${basedir}/target/test-harness/assembly/depSet-unpack/work - - ${localRepository} - - - - - - dependencySet-unpack - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/depSet-unpack/archive-tmp - ${basedir}/target/test-harness/assembly/depSet-unpack/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/descriptorSourceDirectory-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/descriptorSourceDirectory-plugin-config.xml deleted file mode 100644 index c75cbdc89..000000000 --- a/src/functional-tests/plugin-configs/assembly/descriptorSourceDirectory-plugin-config.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/descriptorSourceDirectory/target - assembly - ${basedir}/target/test-harness/assembly/descriptorSourceDirectory/work - - ${localRepository} - - - - - ${basedir}/src/test/resources/assemblies/descriptorSourceDirectory - warn - ${basedir} - ${basedir}/target/test-harness/assembly/descriptorSourceDirectory/archive-tmp - ${basedir}/target/test-harness/assembly/descriptorSourceDirectory/site - false - false - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/fileItem-fileMode-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/fileItem-fileMode-plugin-config.xml deleted file mode 100644 index 97406164a..000000000 --- a/src/functional-tests/plugin-configs/assembly/fileItem-fileMode-plugin-config.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/fileItem-fileMode/target - assembly - ${basedir}/target/test-harness/assembly/fileItem-fileMode/work - - ${localRepository} - - - - - - fileItem-fileMode - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/fileItem-fileMode/archive-tmp - ${basedir}/target/test-harness/assembly/fileItem-fileMode/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/fileItem-filter-file-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/fileItem-filter-file-plugin-config.xml deleted file mode 100644 index a92631410..000000000 --- a/src/functional-tests/plugin-configs/assembly/fileItem-filter-file-plugin-config.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/fileItem-filter-file/target - assembly - ${basedir}/target/test-harness/assembly/fileItem-filter-file/work - - ${localRepository} - - - - - - fileItem-filter-file - - warn - - target/test-classes/fileSet/filterFile.properties - - ${basedir} - ${basedir}/target/test-harness/assembly/fileItem-filter-file/archive-tmp - ${basedir}/target/test-harness/assembly/fileItem-filter-file/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/fileItem-filtered-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/fileItem-filtered-plugin-config.xml deleted file mode 100644 index 1e4f867f5..000000000 --- a/src/functional-tests/plugin-configs/assembly/fileItem-filtered-plugin-config.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/fileItem-filtered/target - assembly - ${basedir}/target/test-harness/assembly/fileItem-filtered/work - - ${localRepository} - - - - - - fileItem-filtered - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/fileItem-filtered/archive-tmp - ${basedir}/target/test-harness/assembly/fileItem-filtered/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/fileItem-lineEndings-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/fileItem-lineEndings-plugin-config.xml deleted file mode 100644 index 6c0f0f4a6..000000000 --- a/src/functional-tests/plugin-configs/assembly/fileItem-lineEndings-plugin-config.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/fileItem-lineEndings/target - assembly - ${basedir}/target/test-harness/assembly/fileItem-lineEndings/work - - ${localRepository} - - - - - - fileItem-lineEndings - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/fileItem-lineEndings/archive-tmp - ${basedir}/target/test-harness/assembly/fileItem-lineEndings/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/fileItem-output-name-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/fileItem-output-name-plugin-config.xml deleted file mode 100644 index 950921d5d..000000000 --- a/src/functional-tests/plugin-configs/assembly/fileItem-output-name-plugin-config.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/fileItem-output-name/target - assembly - ${basedir}/target/test-harness/assembly/fileItem-output-name/work - - ${localRepository} - - - - - - fileItem-output-name - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/fileItem-output-name/archive-tmp - ${basedir}/target/test-harness/assembly/fileItem-output-name/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/fileItem-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/fileItem-plugin-config.xml deleted file mode 100644 index c41cab178..000000000 --- a/src/functional-tests/plugin-configs/assembly/fileItem-plugin-config.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/fileItem/target - assembly - ${basedir}/target/test-harness/assembly/fileItem/work - - ${localRepository} - - - - - - fileItem - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/fileItem/archive-tmp - ${basedir}/target/test-harness/assembly/fileItem/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/fileSet-archiveBaseDir-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/fileSet-archiveBaseDir-plugin-config.xml deleted file mode 100644 index d590ebbd6..000000000 --- a/src/functional-tests/plugin-configs/assembly/fileSet-archiveBaseDir-plugin-config.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/fileSet-archiveBaseDir/target - assembly - ${basedir}/target/test-harness/assembly/fileSet-archiveBaseDir/work - - ${localRepository} - - - - - - fileSet-archiveBaseDirectory - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/fileSet-archiveBaseDir/archive-tmp - ${basedir}/target/test-harness/assembly/fileSet-archiveBaseDir/site - false - true - ${basedir}/target/test-classes - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/fileSet-crlf-lineEndings-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/fileSet-crlf-lineEndings-plugin-config.xml deleted file mode 100644 index b60d074ce..000000000 --- a/src/functional-tests/plugin-configs/assembly/fileSet-crlf-lineEndings-plugin-config.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/fileSet-crlf-lineEndings/target - assembly - ${basedir}/target/test-harness/assembly/fileSet-crlf-lineEndings/work - - ${localRepository} - - - - - - fileSet-crlf-lineEndings - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/fileSet-crlf-lineEndings/archive-tmp - ${basedir}/target/test-harness/assembly/fileSet-crlf-lineEndings/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/fileSet-doesnt-exist-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/fileSet-doesnt-exist-plugin-config.xml deleted file mode 100644 index 7de3f1b5b..000000000 --- a/src/functional-tests/plugin-configs/assembly/fileSet-doesnt-exist-plugin-config.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/fileSet-doesnt-exist/target - assembly - ${basedir}/target/test-harness/assembly/fileSet-doesnt-exist/work - - ${localRepository} - - - - - - fileSet-doesnt-exist - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/fileSet-doesnt-exist/archive-tmp - ${basedir}/target/test-harness/assembly/fileSet-doesnt-exist/site - false - true - ${basedir}/target/test-classes - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/fileSet-dos-lineEndings-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/fileSet-dos-lineEndings-plugin-config.xml deleted file mode 100644 index c77dfab23..000000000 --- a/src/functional-tests/plugin-configs/assembly/fileSet-dos-lineEndings-plugin-config.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/fileSet-dos-lineEndings/target - assembly - ${basedir}/target/test-harness/assembly/fileSet-dos-lineEndings/work - - ${localRepository} - - - - - - fileSet-dos-lineEndings - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/fileSet-dos-lineEndings/archive-tmp - ${basedir}/target/test-harness/assembly/fileSet-dos-lineEndings/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/fileSet-includes-excludes-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/fileSet-includes-excludes-plugin-config.xml deleted file mode 100644 index b60cef494..000000000 --- a/src/functional-tests/plugin-configs/assembly/fileSet-includes-excludes-plugin-config.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/fileSet-include-exclude/target - assembly - ${basedir}/target/test-harness/assembly/fileSet-include-exclude/work - - ${localRepository} - - - - - - fileSet-includes-excludes - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/fileSet-include-exclude/archive-tmp - ${basedir}/target/test-harness/assembly/fileSet-include-exclude/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/fileSet-lf-lineEndings-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/fileSet-lf-lineEndings-plugin-config.xml deleted file mode 100644 index 1fdc055ef..000000000 --- a/src/functional-tests/plugin-configs/assembly/fileSet-lf-lineEndings-plugin-config.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/fileSet-lf-lineEndings/target - assembly - ${basedir}/target/test-harness/assembly/fileSet-lf-lineEndings/work - - ${localRepository} - - - - - - fileSet-lf-lineEndings - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/fileSet-lf-lineEndings/archive-tmp - ${basedir}/target/test-harness/assembly/fileSet-lf-lineEndings/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/fileSet-lineEndings-exception-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/fileSet-lineEndings-exception-plugin-config.xml deleted file mode 100644 index d09c35042..000000000 --- a/src/functional-tests/plugin-configs/assembly/fileSet-lineEndings-exception-plugin-config.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - maven-assembly-plugin - - - ${basedir}/target/test-harness/assembly/fileSet-lineEndings-exception/target - assembly - ${basedir}/target/test-harness/assembly/fileSet-lineEndings-exception/work - - ${localRepository} - - - - - - fileSet-lineEndings-exception - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/fileSet-lineEndings-exception/archive-tmp - ${basedir}/target/test-harness/assembly/fileSet-lineEndings-exception/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/fileSet-no-directory-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/fileSet-no-directory-plugin-config.xml deleted file mode 100644 index c95e87c06..000000000 --- a/src/functional-tests/plugin-configs/assembly/fileSet-no-directory-plugin-config.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/fileSet-no-directory/target - assembly - ${basedir}/target/test-harness/assembly/fileSet-no-directory/work - - ${localRepository} - - - - - - fileSet-no-directory - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/fileSet-no-directory/archive-tmp - ${basedir}/target/test-harness/assembly/fileSet-no-directory/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/fileSet-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/fileSet-plugin-config.xml deleted file mode 100644 index 47f28e230..000000000 --- a/src/functional-tests/plugin-configs/assembly/fileSet-plugin-config.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/fileSet/target - assembly - ${basedir}/target/test-harness/assembly/fileSet/work - - ${localRepository} - - - - - - fileSet - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/fileSet/archive-tmp - ${basedir}/target/test-harness/assembly/fileSet/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/fileSet-unix-lineEndings-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/fileSet-unix-lineEndings-plugin-config.xml deleted file mode 100644 index f1e02a3d0..000000000 --- a/src/functional-tests/plugin-configs/assembly/fileSet-unix-lineEndings-plugin-config.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/fileSet-unix-lineEndings/target - assembly - ${basedir}/target/test-harness/assembly/fileSet-unix-lineEndings/work - - ${localRepository} - - - - - - fileSet-unix-lineEndings - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/fileSet-unix-lineEndings/archive-tmp - ${basedir}/target/test-harness/assembly/fileSet-unix-lineEndings/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/includeSite-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/includeSite-plugin-config.xml deleted file mode 100644 index 6397c58a3..000000000 --- a/src/functional-tests/plugin-configs/assembly/includeSite-plugin-config.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/includeSite/target - assembly - ${basedir}/target/test-harness/assembly/includeSite/work - - ${localRepository} - - - - - ${basedir}/src/test/resources/assemblies/simple.xml - warn - ${basedir} - ${basedir}/target/test-harness/assembly/includeSite/archive-tmp - ${basedir}/target/test-harness/assembly/includeSite/site - true - false - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/manifest-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/manifest-plugin-config.xml deleted file mode 100644 index 1a1e99c12..000000000 --- a/src/functional-tests/plugin-configs/assembly/manifest-plugin-config.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/manifestFile/target - assembly - ${basedir}/target/test-harness/assembly/manifestFile/work - - ${localRepository} - - - - - ${basedir}/src/test/resources/assemblies/simple.xml - warn - ${basedir} - ${basedir}/target/test-harness/assembly/manifestFile/archive-tmp - ${basedir}/target/test-harness/assembly/manifestFile/site - false - false - - - org.apache.sample.main - - - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/manifestFile-FileNotFoundException-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/manifestFile-FileNotFoundException-plugin-config.xml deleted file mode 100644 index 4808be2d2..000000000 --- a/src/functional-tests/plugin-configs/assembly/manifestFile-FileNotFoundException-plugin-config.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/manifestFile-NoSuchFileException/target - assembly - ${basedir}/target/test-harness/assembly/manifestFile-NoSuchFileException/work - - ${localRepository} - - - - - ${basedir}/src/test/resources/assemblies/simple.xml - warn - ${basedir} - ${basedir}/target/test-harness/assembly/manifestFile-NoSuchFileException/archive-tmp - ${basedir}/target/test-harness/assembly/manifestFile-NoSuchFileException/site - false - false - - ${basedir}/target/test-harness/assembly/manifestFile/no-such-manifest.file - - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/manifestFile-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/manifestFile-plugin-config.xml deleted file mode 100644 index ed154f0c1..000000000 --- a/src/functional-tests/plugin-configs/assembly/manifestFile-plugin-config.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/manifestFile/target - assembly - ${basedir}/target/test-harness/assembly/manifestFile/work - - ${localRepository} - - - - - ${basedir}/src/test/resources/assemblies/simple.xml - warn - ${basedir} - ${basedir}/target/test-harness/assembly/manifestFile/archive-tmp - ${basedir}/target/test-harness/assembly/manifestFile/site - false - false - - ${basedir}/target/test-harness/assembly/manifestFile/test-manifest.file - - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/min-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/min-plugin-config.xml deleted file mode 100644 index a65c63263..000000000 --- a/src/functional-tests/plugin-configs/assembly/min-plugin-config.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/min/target - assembly - ${basedir}/target/test-harness/assembly/min/work - - ${localRepository} - - - - - ${basedir}/src/test/resources/assemblies/simple.xml - warn - ${basedir} - ${basedir}/target/test-harness/assembly/min/archive-tmp - ${basedir}/target/test-harness/assembly/min/site - false - false - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/moduleSet-excludes-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/moduleSet-excludes-plugin-config.xml deleted file mode 100644 index f5db522e9..000000000 --- a/src/functional-tests/plugin-configs/assembly/moduleSet-excludes-plugin-config.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/moduleSet-excludes/target - assembly - ${basedir}/target/test-harness/assembly/moduleSet-excludes/work - - ${localRepository} - - - - - - - - ${basedir}/target/test-harness/assembly/moduleSet-excludes - - - moduleSet-excludes - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/moduleSet-excludes/archive-tmp - ${basedir}/target/test-harness/assembly/moduleSet-excludes/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/moduleSet-include-dependencies-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/moduleSet-include-dependencies-plugin-config.xml deleted file mode 100644 index 92c740cbf..000000000 --- a/src/functional-tests/plugin-configs/assembly/moduleSet-include-dependencies-plugin-config.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/moduleSet-include-dependencies/target - assembly - ${basedir}/target/test-harness/assembly/moduleSet-include-dependencies/work - - ${localRepository} - - - - - - - - ${basedir}/target/test-harness/assembly/moduleSet-include-dependencies - - - moduleSet-include-dependencies - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/moduleSet-include-dependencies/archive-tmp - ${basedir}/target/test-harness/assembly/moduleSet-include-dependencies/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/moduleSet-includes-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/moduleSet-includes-plugin-config.xml deleted file mode 100644 index f146ba502..000000000 --- a/src/functional-tests/plugin-configs/assembly/moduleSet-includes-plugin-config.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/moduleSet-includes/target - assembly - ${basedir}/target/test-harness/assembly/moduleSet-includes/work - - ${localRepository} - - - - - - - - ${basedir}/target/test-harness/assembly/moduleSet-includes - - - moduleSet-includes - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/moduleSet-includes/archive-tmp - ${basedir}/target/test-harness/assembly/moduleSet-includes/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/moduleSet-packed-including-dependencies-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/moduleSet-packed-including-dependencies-plugin-config.xml deleted file mode 100644 index 6d26ca415..000000000 --- a/src/functional-tests/plugin-configs/assembly/moduleSet-packed-including-dependencies-plugin-config.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/moduleSet-packed-including-dependencies/target - assembly - ${basedir}/target/test-harness/assembly/moduleSet-packed-including-dependencies/work - - ${localRepository} - - - - - - - ${basedir}/target/test-harness/assembly/moduleSet-packed-including-dependencies - - - moduleSet-packed-including-dependencies - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/moduleSet-packed-including-dependencies/archive-tmp - ${basedir}/target/test-harness/assembly/moduleSet-packed-including-dependencies/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/moduleSet-packed-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/moduleSet-packed-plugin-config.xml deleted file mode 100644 index 4f572e352..000000000 --- a/src/functional-tests/plugin-configs/assembly/moduleSet-packed-plugin-config.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/moduleSet-packed/target - assembly - ${basedir}/target/test-harness/assembly/moduleSet-packed/work - - ${localRepository} - - - - - - - - ${basedir}/target/test-harness/assembly/moduleSet-packed - - - moduleSet-packed - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/moduleSet-packed/archive-tmp - ${basedir}/target/test-harness/assembly/moduleSet-packed/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/moduleSet-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/moduleSet-plugin-config.xml deleted file mode 100644 index ef65163b5..000000000 --- a/src/functional-tests/plugin-configs/assembly/moduleSet-plugin-config.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/moduleSet/target - assembly - ${basedir}/target/test-harness/assembly/moduleSet/work - - ${localRepository} - - - - - - - - ${basedir}/target/test-harness/assembly/moduleSet - - - moduleSet - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/moduleSet/archive-tmp - ${basedir}/target/test-harness/assembly/moduleSet/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/plexus-components-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/plexus-components-plugin-config.xml deleted file mode 100644 index 8c011e914..000000000 --- a/src/functional-tests/plugin-configs/assembly/plexus-components-plugin-config.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/plexus-components/target - assembly - ${basedir}/target/test-harness/assembly/plexus-components/work - - ${localRepository} - - - - - ${basedir}/src/test/resources/assemblies/plexus-components.xml - warn - ${basedir} - ${basedir}/target/test-harness/assembly/plexus-components/archive-tmp - ${basedir}/target/test-harness/assembly/plexus-components/site - false - false - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/repository-groupVersionAlignment-excludes-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/repository-groupVersionAlignment-excludes-plugin-config.xml deleted file mode 100644 index b28501661..000000000 --- a/src/functional-tests/plugin-configs/assembly/repository-groupVersionAlignment-excludes-plugin-config.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/repository-groupVersionAlignment-excludes/target - assembly - ${basedir}/target/test-harness/assembly/repository-groupVersionAlignment-excludes/work - - ${localRepository} - - - - - - repository-groupVersionAlignment-excludes - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/repository-groupVersionAlignment-excludes/archive-tmp - ${basedir}/target/test-harness/assembly/repository-groupVersionAlignment-excludes/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/repository-groupVersionAlignment-includes-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/repository-groupVersionAlignment-includes-plugin-config.xml deleted file mode 100644 index 890dd55cb..000000000 --- a/src/functional-tests/plugin-configs/assembly/repository-groupVersionAlignment-includes-plugin-config.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/repository-groupVersionAlignment-includes/target - assembly - ${basedir}/target/test-harness/assembly/repository-groupVersionAlignment-includes/work - - ${localRepository} - - - - - - repository-groupVersionAlignment-includes - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/repository-groupVersionAlignment-includes/archive-tmp - ${basedir}/target/test-harness/assembly/repository-groupVersionAlignment-includes/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/repository-groupVersionAlignment-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/repository-groupVersionAlignment-plugin-config.xml deleted file mode 100644 index c49e83ab4..000000000 --- a/src/functional-tests/plugin-configs/assembly/repository-groupVersionAlignment-plugin-config.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/repository-groupVersionAlignment/target - assembly - ${basedir}/target/test-harness/assembly/repository-groupVersionAlignment/work - - ${localRepository} - - - - - - repository-groupVersionAlignment - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/repository-groupVersionAlignment/archive-tmp - ${basedir}/target/test-harness/assembly/repository-groupVersionAlignment/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/repository-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/repository-plugin-config.xml deleted file mode 100644 index e64063a44..000000000 --- a/src/functional-tests/plugin-configs/assembly/repository-plugin-config.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/repository/target - assembly - ${basedir}/target/test-harness/assembly/repository/work - - ${localRepository} - - - - - - ${basedir}/src/test/resources/assemblies/repository.xml - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/repository/archive-tmp - ${basedir}/target/test-harness/assembly/repository/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/repository-with-metadata-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/repository-with-metadata-plugin-config.xml deleted file mode 100644 index a9d8c8068..000000000 --- a/src/functional-tests/plugin-configs/assembly/repository-with-metadata-plugin-config.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/repository-with-metadata/target - assembly - ${basedir}/target/test-harness/assembly/repository-with-metadata/work - - ${localRepository} - - - - - - repository-with-metadata - - warn - ${basedir} - ${basedir}/target/test-harness/assembly/repository-with-metadata/archive-tmp - ${basedir}/target/test-harness/assembly/repository-with-metadata/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/tar-bz2-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/tar-bz2-plugin-config.xml deleted file mode 100644 index c7bb8e23d..000000000 --- a/src/functional-tests/plugin-configs/assembly/tar-bz2-plugin-config.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/tar-bz2/target - assembly - ${basedir}/target/test-harness/assembly/tar-bz2/work - - ${localRepository} - - - - - ${basedir}/src/test/resources/assemblies/tar-bz2.xml - fail - ${basedir} - ${basedir}/target/test-harness/assembly/tar-bz2/archive-tmp - ${basedir}/target/test-harness/assembly/tar-bz2/site - false - false - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/tar-gz-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/tar-gz-plugin-config.xml deleted file mode 100644 index bf6bf7821..000000000 --- a/src/functional-tests/plugin-configs/assembly/tar-gz-plugin-config.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/tar-gz/target - assembly - ${basedir}/target/test-harness/assembly/tar-gz/work - - ${localRepository} - - - - - ${basedir}/src/test/resources/assemblies/tar-gz.xml - warn - ${basedir} - ${basedir}/target/test-harness/assembly/tar-gz/archive-tmp - ${basedir}/target/test-harness/assembly/tar-gz/site - false - false - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/tbz2-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/tbz2-plugin-config.xml deleted file mode 100644 index eb4ca77d9..000000000 --- a/src/functional-tests/plugin-configs/assembly/tbz2-plugin-config.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/tbz2/target - assembly - ${basedir}/target/test-harness/assembly/tbz2/work - - ${localRepository} - - - - - ${basedir}/src/test/resources/assemblies/tbz2.xml - fail - ${basedir} - ${basedir}/target/test-harness/assembly/tbz2/archive-tmp - ${basedir}/target/test-harness/assembly/tbz2/site - false - false - - - - - - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/tbz2/target - assembly - ${basedir}/target/test-harness/assembly/tbz2/work - - ${localRepository} - - - - - ${basedir}/src/test/resources/assemblies/tbz2.xml - fail - ${basedir} - ${basedir}/target/test-harness/assembly/tbz2/archive-tmp - ${basedir}/target/test-harness/assembly/tbz2/site - false - false - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/tgz-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/tgz-plugin-config.xml deleted file mode 100644 index 66118e6b2..000000000 --- a/src/functional-tests/plugin-configs/assembly/tgz-plugin-config.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/tgz/target - assembly - ${basedir}/target/test-harness/assembly/tgz/work - - ${localRepository} - - - - - ${basedir}/src/test/resources/assemblies/tgz.xml - warn - ${basedir} - ${basedir}/target/test-harness/assembly/tgz/archive-tmp - ${basedir}/target/test-harness/assembly/tgz/site - false - false - - - - - diff --git a/src/functional-tests/plugin-configs/assembly/war-plugin-config.xml b/src/functional-tests/plugin-configs/assembly/war-plugin-config.xml deleted file mode 100644 index 07e254a6d..000000000 --- a/src/functional-tests/plugin-configs/assembly/war-plugin-config.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/assembly/war/target - assembly - ${basedir}/target/test-harness/assembly/war/work - - ${localRepository} - - - - - ${basedir}/src/test/resources/assemblies/war.xml - warn - ${basedir} - ${basedir}/target/test-harness/assembly/war/archive-tmp - ${basedir}/target/test-harness/assembly/war/site - false - false - - - - - diff --git a/src/functional-tests/plugin-configs/attached/depSet-plugin-config.xml b/src/functional-tests/plugin-configs/attached/depSet-plugin-config.xml deleted file mode 100644 index bd471e3ea..000000000 --- a/src/functional-tests/plugin-configs/attached/depSet-plugin-config.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/attached/depSet/target - assembly - ${basedir}/target/test-harness/attached/depSet/work - - ${localRepository} - - - - - dependencySet-default - - warn - ${basedir} - ${basedir}/target/test-harness/attached/depSet/archive-tmp - ${basedir}/target/test-harness/attached/depSet/site - false - true - - - - - diff --git a/src/functional-tests/plugin-configs/attached/min-plugin-config.xml b/src/functional-tests/plugin-configs/attached/min-plugin-config.xml deleted file mode 100644 index 71b0ec099..000000000 --- a/src/functional-tests/plugin-configs/attached/min-plugin-config.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/attached/min/target - assembly - ${basedir}/target/test-harness/attached/min/work - - ${localRepository} - - - - ${basedir}/src/test/resources/assemblies/simple.xml - warn - ${basedir} - ${basedir}/target/test-harness/attached/min/archive-tmp - ${basedir}/target/test-harness/attached/min/site - false - false - - - - - diff --git a/src/functional-tests/plugin-configs/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping-pluginConfig.xml b/src/functional-tests/plugin-configs/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping-pluginConfig.xml deleted file mode 100644 index c332520c7..000000000 --- a/src/functional-tests/plugin-configs/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping-pluginConfig.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - maven-assembly-plugin - - ${basedir} - - packager - org.test - 0 - test - org.test - 1 - ${basedir}/target/test-harness/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping/dependencies/test.jar - test2 - org.test.2 - 2 - ${basedir}/target/test-harness/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping/dependencies/test2.jar - - - - ${basedir}/src/test/resources/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping-assemblyDescriptor.xml - - ${basedir}/target/test-harness/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping/target - basicAbstractAssemblyMojoFeaturesTest-ouputFileNameMapping - ${basedir}/target/test-harness/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping/work - - ${localRepository} - - - packager - org.test - 0 - test - org.test - 1 - ${basedir}/target/test-harness/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping/dependencies/test.jar - test2 - org.test.2 - 2 - ${basedir}/target/test-harness/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping/dependencies/test2.jar - - - - - - - - \ No newline at end of file diff --git a/src/functional-tests/plugin-configs/directory-inline/dependency-set-plugin-config.xml b/src/functional-tests/plugin-configs/directory-inline/dependency-set-plugin-config.xml deleted file mode 100644 index c86f05056..000000000 --- a/src/functional-tests/plugin-configs/directory-inline/dependency-set-plugin-config.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - maven-assembly-plugin - - ${basedir}/src/test/resources/assemblies/dependencySet-default.xml - ${basedir} - - ${basedir}/target/test-harness/directory-inlince/dependency-set/target - directory-dependency-set - - true - - - - - \ No newline at end of file diff --git a/src/functional-tests/plugin-configs/directory-inline/min-plugin-config.xml b/src/functional-tests/plugin-configs/directory-inline/min-plugin-config.xml deleted file mode 100644 index bd29770cf..000000000 --- a/src/functional-tests/plugin-configs/directory-inline/min-plugin-config.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - maven-assembly-plugin - - ${basedir}/src/test/resources/assemblies/simple.xml - ${basedir} - - ${basedir}/target/test-harness/directory-inline/min/target - directory-inline-min - - true - - - - - \ No newline at end of file diff --git a/src/functional-tests/plugin-configs/directory/appendAssemblyId-false-plugin-config.xml b/src/functional-tests/plugin-configs/directory/appendAssemblyId-false-plugin-config.xml deleted file mode 100644 index 5120040c1..000000000 --- a/src/functional-tests/plugin-configs/directory/appendAssemblyId-false-plugin-config.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - maven-assembly-plugin - - ${basedir}/src/test/resources/assemblies/dependencySet-default.xml - ${basedir} - - - ${basedir}/target/test-harness/directory/appendAssemblyId-false/target - directory-appendAssemblyId-false - - false - classifier - - - - - \ No newline at end of file diff --git a/src/functional-tests/plugin-configs/directory/dependency-set-plugin-config.xml b/src/functional-tests/plugin-configs/directory/dependency-set-plugin-config.xml deleted file mode 100644 index 065f12c9f..000000000 --- a/src/functional-tests/plugin-configs/directory/dependency-set-plugin-config.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - maven-assembly-plugin - - ${basedir}/src/test/resources/assemblies/dependencySet-default.xml - ${basedir} - - - ${basedir}/target/test-harness/directory/dependency-set/target - directory-dependency-set - - true - - - - - \ No newline at end of file diff --git a/src/functional-tests/plugin-configs/directory/min-plugin-config-with-exceptions.xml b/src/functional-tests/plugin-configs/directory/min-plugin-config-with-exceptions.xml deleted file mode 100644 index 4ed5caf28..000000000 --- a/src/functional-tests/plugin-configs/directory/min-plugin-config-with-exceptions.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - maven-assembly-plugin - - ${basedir}/src/test/resources/assemblies/simple.xml - ${basedir} - - ${basedir}/target/test-harness/directory-inline/min/target - directory-inline-min - - true - - - - - \ No newline at end of file diff --git a/src/functional-tests/plugin-configs/directory/min-plugin-config.xml b/src/functional-tests/plugin-configs/directory/min-plugin-config.xml deleted file mode 100644 index fc2e6c676..000000000 --- a/src/functional-tests/plugin-configs/directory/min-plugin-config.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - maven-assembly-plugin - - ${basedir}/src/test/resources/assemblies/fileSet.xml - ${basedir} - - - ${basedir}/target/test-harness/directory/min/target - directory-min - - true - - - - - \ No newline at end of file diff --git a/src/functional-tests/plugin-configs/unpack/archiver-manager-exception-plugin-config.xml b/src/functional-tests/plugin-configs/unpack/archiver-manager-exception-plugin-config.xml deleted file mode 100644 index 139f5b133..000000000 --- a/src/functional-tests/plugin-configs/unpack/archiver-manager-exception-plugin-config.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/unpack/archiver-manager-exception/target - unpack-min - ${basedir}/target/test-harness/unpack/archiver-manager-exception/work - - ${localRepository} - - - - - - - - \ No newline at end of file diff --git a/src/functional-tests/plugin-configs/unpack/min-plugin-config.xml b/src/functional-tests/plugin-configs/unpack/min-plugin-config.xml deleted file mode 100644 index 97587d514..000000000 --- a/src/functional-tests/plugin-configs/unpack/min-plugin-config.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/unpack/min/target - unpack-min - ${basedir}/target/test-harness/unpack/min/work - - ${localRepository} - - - - - - - - \ No newline at end of file diff --git a/src/functional-tests/plugin-configs/unpack/unpack-exception-plugin-config.xml b/src/functional-tests/plugin-configs/unpack/unpack-exception-plugin-config.xml deleted file mode 100644 index 87539dc50..000000000 --- a/src/functional-tests/plugin-configs/unpack/unpack-exception-plugin-config.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/unpack/unpack-exception/target - unpack-min - ${basedir}/target/test-harness/unpack/unpack-exception/work - - ${localRepository} - - - - - - - - \ No newline at end of file diff --git a/src/functional-tests/plugin-configs/unpack/with-reactor-projects-plugin-config.xml b/src/functional-tests/plugin-configs/unpack/with-reactor-projects-plugin-config.xml deleted file mode 100644 index b98f04e8c..000000000 --- a/src/functional-tests/plugin-configs/unpack/with-reactor-projects-plugin-config.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - maven-assembly-plugin - - ${basedir}/target/test-harness/unpack/with-reactor-projects/target - unpack-min - ${basedir}/target/test-harness/unpack/with-reactor-projects/work - - ${localRepository} - - - - - - - - - - - diff --git a/src/functional-tests/remote-repo/assembly/dependency-artifact/1.0/dependency-artifact-1.0.jar b/src/functional-tests/remote-repo/assembly/dependency-artifact/1.0/dependency-artifact-1.0.jar deleted file mode 100644 index ffa64963e..000000000 --- a/src/functional-tests/remote-repo/assembly/dependency-artifact/1.0/dependency-artifact-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -jar contents \ No newline at end of file diff --git a/src/functional-tests/remote-repo/assembly/dependency-artifact/1.0/dependency-artifact-1.0.pom b/src/functional-tests/remote-repo/assembly/dependency-artifact/1.0/dependency-artifact-1.0.pom deleted file mode 100644 index 0e40bd7b4..000000000 --- a/src/functional-tests/remote-repo/assembly/dependency-artifact/1.0/dependency-artifact-1.0.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - assembly - dependency-artifact - 1.0 - jar - \ No newline at end of file diff --git a/src/functional-tests/remote-repo/assembly/dependency-artifact/1.1/dependency-artifact-1.1.jar b/src/functional-tests/remote-repo/assembly/dependency-artifact/1.1/dependency-artifact-1.1.jar deleted file mode 100644 index ffa64963e..000000000 --- a/src/functional-tests/remote-repo/assembly/dependency-artifact/1.1/dependency-artifact-1.1.jar +++ /dev/null @@ -1 +0,0 @@ -jar contents \ No newline at end of file diff --git a/src/functional-tests/remote-repo/assembly/dependency-artifact/1.1/dependency-artifact-1.1.pom b/src/functional-tests/remote-repo/assembly/dependency-artifact/1.1/dependency-artifact-1.1.pom deleted file mode 100644 index ee36db91d..000000000 --- a/src/functional-tests/remote-repo/assembly/dependency-artifact/1.1/dependency-artifact-1.1.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - assembly - dependency-artifact - 1.1 - jar - \ No newline at end of file diff --git a/src/functional-tests/resources/assemblies/NoSuchArchiverException.xml b/src/functional-tests/resources/assemblies/NoSuchArchiverException.xml deleted file mode 100644 index bf09313c9..000000000 --- a/src/functional-tests/resources/assemblies/NoSuchArchiverException.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - simple - - txt - - - - target/test-harness/assembly/min/target - - *.jar - - - - diff --git a/src/functional-tests/resources/assemblies/components/FileItem.xml b/src/functional-tests/resources/assemblies/components/FileItem.xml deleted file mode 100644 index 549b1ea26..000000000 --- a/src/functional-tests/resources/assemblies/components/FileItem.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - target/test-classes/fileSet/README.txt - - - target/test-classes/fileSet/LICENSE.txt - - - \ No newline at end of file diff --git a/src/functional-tests/resources/assemblies/components/FileSet.xml b/src/functional-tests/resources/assemblies/components/FileSet.xml deleted file mode 100644 index 617320d0e..000000000 --- a/src/functional-tests/resources/assemblies/components/FileSet.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - target/test-classes/fileSet - - - \ No newline at end of file diff --git a/src/functional-tests/resources/assemblies/components/dependencySet.xml b/src/functional-tests/resources/assemblies/components/dependencySet.xml deleted file mode 100644 index ecfcb4947..000000000 --- a/src/functional-tests/resources/assemblies/components/dependencySet.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - false - - test - - - \ No newline at end of file diff --git a/src/functional-tests/resources/assemblies/dependencySet-default.xml b/src/functional-tests/resources/assemblies/dependencySet-default.xml deleted file mode 100644 index acd6db28f..000000000 --- a/src/functional-tests/resources/assemblies/dependencySet-default.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - dependencySet-default - - zip - - - - false - - test - - - diff --git a/src/functional-tests/resources/assemblies/dependencySet-excludes.xml b/src/functional-tests/resources/assemblies/dependencySet-excludes.xml deleted file mode 100644 index 754d947f2..000000000 --- a/src/functional-tests/resources/assemblies/dependencySet-excludes.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - dependencySet-excludes - - zip - - - - false - - test - - assembly:dependency-artifact1 - - - - diff --git a/src/functional-tests/resources/assemblies/dependencySet-filename-mapping-and-classifier.xml b/src/functional-tests/resources/assemblies/dependencySet-filename-mapping-and-classifier.xml deleted file mode 100644 index a5ac6a2d5..000000000 --- a/src/functional-tests/resources/assemblies/dependencySet-filename-mapping-and-classifier.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - dependencySet-filename-mapping - - zip - - false - - - ${version}.${artifactId}.${groupId} - false - libs - test - - - diff --git a/src/functional-tests/resources/assemblies/dependencySet-filename-mapping.xml b/src/functional-tests/resources/assemblies/dependencySet-filename-mapping.xml deleted file mode 100644 index e8a4a4535..000000000 --- a/src/functional-tests/resources/assemblies/dependencySet-filename-mapping.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - dependencySet-filename-mapping - - zip - - false - - - ${version}-${artifactId}-${groupId} - false - libs - test - - - diff --git a/src/functional-tests/resources/assemblies/dependencySet-includes.xml b/src/functional-tests/resources/assemblies/dependencySet-includes.xml deleted file mode 100644 index abbb31e2c..000000000 --- a/src/functional-tests/resources/assemblies/dependencySet-includes.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - dependencySet-includes - - zip - - - - false - - test - - assembly:dependency-artifact1 - - - - diff --git a/src/functional-tests/resources/assemblies/dependencySet-scoped.xml b/src/functional-tests/resources/assemblies/dependencySet-scoped.xml deleted file mode 100644 index 239ff7257..000000000 --- a/src/functional-tests/resources/assemblies/dependencySet-scoped.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - dependencySet-scoped - - zip - - - - false - - - - diff --git a/src/functional-tests/resources/assemblies/dependencySet-unpack.xml b/src/functional-tests/resources/assemblies/dependencySet-unpack.xml deleted file mode 100644 index 973771fc3..000000000 --- a/src/functional-tests/resources/assemblies/dependencySet-unpack.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - dependencySet-unpack - - zip - - - - true - - test - - - diff --git a/src/functional-tests/resources/assemblies/descriptorSourceDirectory/simple.xml b/src/functional-tests/resources/assemblies/descriptorSourceDirectory/simple.xml deleted file mode 100644 index fc233b565..000000000 --- a/src/functional-tests/resources/assemblies/descriptorSourceDirectory/simple.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - simple - - zip - - - - target/test-harness/assembly/descriptorSourceDirectory/target - - *.jar - - - - diff --git a/src/functional-tests/resources/assemblies/empty.xml b/src/functional-tests/resources/assemblies/empty.xml deleted file mode 100644 index 65515728f..000000000 --- a/src/functional-tests/resources/assemblies/empty.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - empty - - zip - - - src/test/resources/assemblies/components/dependencySet.xml - src/test/resources/assemblies/components/FileItem.xml - src/test/resources/assemblies/components/FileSet.xml - - diff --git a/src/functional-tests/resources/assemblies/fileItem-fileMode.xml b/src/functional-tests/resources/assemblies/fileItem-fileMode.xml deleted file mode 100644 index c0699df35..000000000 --- a/src/functional-tests/resources/assemblies/fileItem-fileMode.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - fileItem - - zip - - - - target/test-classes/fileSet/README.txt - 777 - - - diff --git a/src/functional-tests/resources/assemblies/fileItem-filter-file.xml b/src/functional-tests/resources/assemblies/fileItem-filter-file.xml deleted file mode 100644 index f1fa79f9a..000000000 --- a/src/functional-tests/resources/assemblies/fileItem-filter-file.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - fileItem - - zip - - - - target/test-classes/fileSet/README.txt - true - - - diff --git a/src/functional-tests/resources/assemblies/fileItem-filtered.xml b/src/functional-tests/resources/assemblies/fileItem-filtered.xml deleted file mode 100644 index f1fa79f9a..000000000 --- a/src/functional-tests/resources/assemblies/fileItem-filtered.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - fileItem - - zip - - - - target/test-classes/fileSet/README.txt - true - - - diff --git a/src/functional-tests/resources/assemblies/fileItem-lineEndings.xml b/src/functional-tests/resources/assemblies/fileItem-lineEndings.xml deleted file mode 100644 index 89c96e003..000000000 --- a/src/functional-tests/resources/assemblies/fileItem-lineEndings.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - fileItem - - zip - - - - target/test-classes/fileSet/README.txt - unix - - - diff --git a/src/functional-tests/resources/assemblies/fileItem-output-name.xml b/src/functional-tests/resources/assemblies/fileItem-output-name.xml deleted file mode 100644 index 70cafa64a..000000000 --- a/src/functional-tests/resources/assemblies/fileItem-output-name.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - fileItem - - zip - - - - target/test-classes/fileSet/README.txt - output - READTHIS.txt - - - diff --git a/src/functional-tests/resources/assemblies/fileItem.xml b/src/functional-tests/resources/assemblies/fileItem.xml deleted file mode 100644 index 1ae555b93..000000000 --- a/src/functional-tests/resources/assemblies/fileItem.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - fileItem - - zip - - - - target/test-classes/fileSet/README.txt - - - target/test-classes/fileSet/LICENSE.txt - - - diff --git a/src/functional-tests/resources/assemblies/fileSet-archiveBaseDirectory.xml b/src/functional-tests/resources/assemblies/fileSet-archiveBaseDirectory.xml deleted file mode 100644 index 6f22db98c..000000000 --- a/src/functional-tests/resources/assemblies/fileSet-archiveBaseDirectory.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - fileSet - - zip - - - - fileSet - keep - - - diff --git a/src/functional-tests/resources/assemblies/fileSet-crlf-lineEndings.xml b/src/functional-tests/resources/assemblies/fileSet-crlf-lineEndings.xml deleted file mode 100644 index 618a97383..000000000 --- a/src/functional-tests/resources/assemblies/fileSet-crlf-lineEndings.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - fileSet - - zip - - - - target/test-classes/fileSet - crlf - - - diff --git a/src/functional-tests/resources/assemblies/fileSet-doesnt-exist.xml b/src/functional-tests/resources/assemblies/fileSet-doesnt-exist.xml deleted file mode 100644 index 1db6636d7..000000000 --- a/src/functional-tests/resources/assemblies/fileSet-doesnt-exist.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - fileSet - - zip - - - - donkey - unix - - - diff --git a/src/functional-tests/resources/assemblies/fileSet-dos-lineEndings.xml b/src/functional-tests/resources/assemblies/fileSet-dos-lineEndings.xml deleted file mode 100644 index df8099440..000000000 --- a/src/functional-tests/resources/assemblies/fileSet-dos-lineEndings.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - fileSet - - zip - - - - target/test-classes/fileSet - dos - - - diff --git a/src/functional-tests/resources/assemblies/fileSet-includes-excludes.xml b/src/functional-tests/resources/assemblies/fileSet-includes-excludes.xml deleted file mode 100644 index 1a688c8d1..000000000 --- a/src/functional-tests/resources/assemblies/fileSet-includes-excludes.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - fileSet - - zip - - - - target/test-classes/fileSet - - **/*.txt - - - **/*.xml - - - - diff --git a/src/functional-tests/resources/assemblies/fileSet-lf-lineEndings.xml b/src/functional-tests/resources/assemblies/fileSet-lf-lineEndings.xml deleted file mode 100644 index 1b87c71be..000000000 --- a/src/functional-tests/resources/assemblies/fileSet-lf-lineEndings.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - fileSet - - zip - - - - target/test-classes/fileSet - lf - - - diff --git a/src/functional-tests/resources/assemblies/fileSet-lineEndings-exception.xml b/src/functional-tests/resources/assemblies/fileSet-lineEndings-exception.xml deleted file mode 100644 index 6044d6635..000000000 --- a/src/functional-tests/resources/assemblies/fileSet-lineEndings-exception.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - fileSet - - zip - - - - target/test-classes/fileSet - invalid - - - diff --git a/src/functional-tests/resources/assemblies/fileSet-no-directory.xml b/src/functional-tests/resources/assemblies/fileSet-no-directory.xml deleted file mode 100644 index 61baab877..000000000 --- a/src/functional-tests/resources/assemblies/fileSet-no-directory.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - fileSet - - zip - - - - - - - diff --git a/src/functional-tests/resources/assemblies/fileSet-unix-lineEndings.xml b/src/functional-tests/resources/assemblies/fileSet-unix-lineEndings.xml deleted file mode 100644 index 905090321..000000000 --- a/src/functional-tests/resources/assemblies/fileSet-unix-lineEndings.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - fileSet - - zip - - - - target/test-classes/fileSet - unix - - - diff --git a/src/functional-tests/resources/assemblies/fileSet.xml b/src/functional-tests/resources/assemblies/fileSet.xml deleted file mode 100644 index 6bc528836..000000000 --- a/src/functional-tests/resources/assemblies/fileSet.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - fileSet - - zip - - - - target/test-classes/fileSet - - - diff --git a/src/functional-tests/resources/assemblies/moduleSet-excludes.xml b/src/functional-tests/resources/assemblies/moduleSet-excludes.xml deleted file mode 100644 index c6c1f957d..000000000 --- a/src/functional-tests/resources/assemblies/moduleSet-excludes.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - moduleSet - - zip - - - - - assembly:reactor-project-1 - - - - - - diff --git a/src/functional-tests/resources/assemblies/moduleSet-include-dependencies.xml b/src/functional-tests/resources/assemblies/moduleSet-include-dependencies.xml deleted file mode 100644 index 5c12949ef..000000000 --- a/src/functional-tests/resources/assemblies/moduleSet-include-dependencies.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - moduleSet - - zip - - - - - - true - - - - diff --git a/src/functional-tests/resources/assemblies/moduleSet-includes.xml b/src/functional-tests/resources/assemblies/moduleSet-includes.xml deleted file mode 100644 index 10ab0e4fa..000000000 --- a/src/functional-tests/resources/assemblies/moduleSet-includes.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - moduleSet - - zip - - - - - assembly:reactor-project-1 - - - - - - diff --git a/src/functional-tests/resources/assemblies/moduleSet-packed-including-dependencies.xml b/src/functional-tests/resources/assemblies/moduleSet-packed-including-dependencies.xml deleted file mode 100644 index a69db0e0a..000000000 --- a/src/functional-tests/resources/assemblies/moduleSet-packed-including-dependencies.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - moduleSet - - zip - - - - - false - true - - - - diff --git a/src/functional-tests/resources/assemblies/moduleSet-packed.xml b/src/functional-tests/resources/assemblies/moduleSet-packed.xml deleted file mode 100644 index d328a70b5..000000000 --- a/src/functional-tests/resources/assemblies/moduleSet-packed.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - moduleSet - - zip - - - - - false - - - - diff --git a/src/functional-tests/resources/assemblies/moduleSet.xml b/src/functional-tests/resources/assemblies/moduleSet.xml deleted file mode 100644 index 2f4a33bb2..000000000 --- a/src/functional-tests/resources/assemblies/moduleSet.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - moduleSet - - zip - - - - - - - - diff --git a/src/functional-tests/resources/assemblies/plexus-components.xml b/src/functional-tests/resources/assemblies/plexus-components.xml deleted file mode 100644 index 33cbf5e26..000000000 --- a/src/functional-tests/resources/assemblies/plexus-components.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - plexus-components - - zip - - - - target/test-classes/fileSet - - META-INF/plexus/components.xml - - - - diff --git a/src/functional-tests/resources/assemblies/simple.xml b/src/functional-tests/resources/assemblies/simple.xml deleted file mode 100644 index 06f9c0d58..000000000 --- a/src/functional-tests/resources/assemblies/simple.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - simple - - zip - - - - - target/test-harness/assembly/min/target - - *.jar - - - - diff --git a/src/functional-tests/resources/assemblies/tar-bz2.xml b/src/functional-tests/resources/assemblies/tar-bz2.xml deleted file mode 100644 index 04eb956d6..000000000 --- a/src/functional-tests/resources/assemblies/tar-bz2.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - simple - - tar.bz2 - - - - target/test-harness/assembly/tar-bz2/target - - *.jar - - - - diff --git a/src/functional-tests/resources/assemblies/tar-gz.xml b/src/functional-tests/resources/assemblies/tar-gz.xml deleted file mode 100644 index 9881e30fd..000000000 --- a/src/functional-tests/resources/assemblies/tar-gz.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - simple - - tar.gz - - - - target/test-harness/assembly/tar-gz/target - - *.jar - - - - diff --git a/src/functional-tests/resources/assemblies/tbz2.xml b/src/functional-tests/resources/assemblies/tbz2.xml deleted file mode 100644 index 4708d3db9..000000000 --- a/src/functional-tests/resources/assemblies/tbz2.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - simple - - tbz2 - - - - target/test-harness/assembly/tbz2/target - - *.jar - - - - diff --git a/src/functional-tests/resources/assemblies/tgz.xml b/src/functional-tests/resources/assemblies/tgz.xml deleted file mode 100644 index dbcc6c84e..000000000 --- a/src/functional-tests/resources/assemblies/tgz.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - simple - - tgz - - - - target/test-harness/assembly/tgz/target - - *.jar - - - - diff --git a/src/functional-tests/resources/assemblies/war.xml b/src/functional-tests/resources/assemblies/war.xml deleted file mode 100644 index 0aac29048..000000000 --- a/src/functional-tests/resources/assemblies/war.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - simple - - war - - - - target/test-harness/assembly/war/target - - *.jar - - - - diff --git a/src/functional-tests/resources/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping-assemblyDescriptor.xml b/src/functional-tests/resources/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping-assemblyDescriptor.xml deleted file mode 100644 index 96863bff6..000000000 --- a/src/functional-tests/resources/basicAbstractAssemblyMojoFeaturesTest/outputFileNameMapping-assemblyDescriptor.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - outputFileNameMapping - - dir - - false - - - - org.test:test - org.test.2:test2 - - /dependencies/ - ${artifact.artifactId}.${artifact.extension} - - - diff --git a/src/it/it-project-parent/pom.xml b/src/it/it-project-parent/pom.xml index 37af86999..490dda515 100644 --- a/src/it/it-project-parent/pom.xml +++ b/src/it/it-project-parent/pom.xml @@ -33,6 +33,11 @@ under the License. commons-io @commonsIoVersion@ + + org.junit.jupiter + junit-jupiter-api + @versions.junit5@ + diff --git a/src/it/projects/bugs/massembly-285/massembly-285-assembly/verify.bsh b/src/it/projects/bugs/massembly-285/massembly-285-assembly/verify.bsh index 01f07f773..965402cdb 100644 --- a/src/it/projects/bugs/massembly-285/massembly-285-assembly/verify.bsh +++ b/src/it/projects/bugs/massembly-285/massembly-285-assembly/verify.bsh @@ -23,4 +23,4 @@ import java.io.File; This is where you verify the results of the assembly build. You may need to check the existence of a file, or even peek within a jar file to determine whether the assembly did the right thing. */ -return new File( basedir, "target/${artifactId}-${version}-bin.dir/lib/junit.jar" ).exists(); +return new File( basedir, "target/${artifactId}-${version}-bin.dir/lib/junit-jupiter-api.jar" ).exists(); diff --git a/src/it/projects/bugs/massembly-285/massembly-285-mod1/pom.xml b/src/it/projects/bugs/massembly-285/massembly-285-mod1/pom.xml index 52ebef038..61a2f0efe 100644 --- a/src/it/projects/bugs/massembly-285/massembly-285-mod1/pom.xml +++ b/src/it/projects/bugs/massembly-285/massembly-285-mod1/pom.xml @@ -29,9 +29,8 @@ under the License. - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/bugs/massembly-285/massembly-285-mod1/src/test/java/tests/AppTest.java b/src/it/projects/bugs/massembly-285/massembly-285-mod1/src/test/java/tests/AppTest.java index 8c34397cc..e2a38a8bb 100644 --- a/src/it/projects/bugs/massembly-285/massembly-285-mod1/src/test/java/tests/AppTest.java +++ b/src/it/projects/bugs/massembly-285/massembly-285-mod1/src/test/java/tests/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/bugs/massembly-285/massembly-285-mod2/pom.xml b/src/it/projects/bugs/massembly-285/massembly-285-mod2/pom.xml index 48e04e27f..e92fced95 100644 --- a/src/it/projects/bugs/massembly-285/massembly-285-mod2/pom.xml +++ b/src/it/projects/bugs/massembly-285/massembly-285-mod2/pom.xml @@ -29,9 +29,8 @@ under the License. - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/bugs/massembly-285/massembly-285-mod2/src/test/java/tests/AppTest.java b/src/it/projects/bugs/massembly-285/massembly-285-mod2/src/test/java/tests/AppTest.java index 8c34397cc..e2a38a8bb 100644 --- a/src/it/projects/bugs/massembly-285/massembly-285-mod2/src/test/java/tests/AppTest.java +++ b/src/it/projects/bugs/massembly-285/massembly-285-mod2/src/test/java/tests/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/components/component-dependencySet/pom.xml b/src/it/projects/components/component-dependencySet/pom.xml index aa7b61318..d8690ede3 100644 --- a/src/it/projects/components/component-dependencySet/pom.xml +++ b/src/it/projects/components/component-dependencySet/pom.xml @@ -41,9 +41,8 @@ under the License. - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/components/component-dependencySet/src/test/java/test/AppTest.java b/src/it/projects/components/component-dependencySet/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/components/component-dependencySet/src/test/java/test/AppTest.java +++ b/src/it/projects/components/component-dependencySet/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/components/component-moduleSet/child1/pom.xml b/src/it/projects/components/component-moduleSet/child1/pom.xml index cbead74fa..75c6f43e7 100644 --- a/src/it/projects/components/component-moduleSet/child1/pom.xml +++ b/src/it/projects/components/component-moduleSet/child1/pom.xml @@ -28,9 +28,8 @@ under the License. child1 - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/components/component-moduleSet/child1/src/test/java/test/AppTest.java b/src/it/projects/components/component-moduleSet/child1/src/test/java/test/AppTest.java index d5c12059c..25016db0d 100644 --- a/src/it/projects/components/component-moduleSet/child1/src/test/java/test/AppTest.java +++ b/src/it/projects/components/component-moduleSet/child1/src/test/java/test/AppTest.java @@ -20,39 +20,19 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); } -} +} \ No newline at end of file diff --git a/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/pom.xml b/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/pom.xml index 19aa0a9da..1b1070b45 100644 --- a/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/pom.xml +++ b/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/pom.xml @@ -28,9 +28,8 @@ under the License. child1 - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/test/java/test/AppTest.java b/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/test/java/test/AppTest.java index d5c12059c..25016db0d 100644 --- a/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/test/java/test/AppTest.java +++ b/src/it/projects/container-descriptors/metaInf-services-aggregation/child1/src/test/java/test/AppTest.java @@ -20,39 +20,19 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); } -} +} \ No newline at end of file diff --git a/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/pom.xml b/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/pom.xml index 330f4e05f..a0af3326d 100644 --- a/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/pom.xml +++ b/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/pom.xml @@ -36,9 +36,8 @@ under the License. 1.0-SNAPSHOT - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/test/java/test/AppTest.java b/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/test/java/test/AppTest.java index d5c12059c..25016db0d 100644 --- a/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/test/java/test/AppTest.java +++ b/src/it/projects/container-descriptors/metaInf-services-aggregation/child2/src/test/java/test/AppTest.java @@ -20,39 +20,19 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); } -} +} \ No newline at end of file diff --git a/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/pom.xml b/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/pom.xml index 19aa0a9da..1b1070b45 100644 --- a/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/pom.xml +++ b/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/pom.xml @@ -28,9 +28,8 @@ under the License. child1 - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/test/java/test/AppTest.java b/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/test/java/test/AppTest.java index d5c12059c..25016db0d 100644 --- a/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/test/java/test/AppTest.java +++ b/src/it/projects/container-descriptors/metaInf-spring-aggregation/child1/src/test/java/test/AppTest.java @@ -20,39 +20,19 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); } -} +} \ No newline at end of file diff --git a/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/pom.xml b/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/pom.xml index 330f4e05f..a0af3326d 100644 --- a/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/pom.xml +++ b/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/pom.xml @@ -36,9 +36,8 @@ under the License. 1.0-SNAPSHOT - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/test/java/test/AppTest.java b/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/test/java/test/AppTest.java index d5c12059c..25016db0d 100644 --- a/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/test/java/test/AppTest.java +++ b/src/it/projects/container-descriptors/metaInf-spring-aggregation/child2/src/test/java/test/AppTest.java @@ -20,39 +20,19 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); } -} +} \ No newline at end of file diff --git a/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/pom.xml b/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/pom.xml index e588627c4..f618c260a 100644 --- a/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/pom.xml +++ b/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/pom.xml @@ -32,9 +32,8 @@ under the License. - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/test/java/test/AppTest.java b/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/test/java/test/AppTest.java index d5c12059c..25016db0d 100644 --- a/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/test/java/test/AppTest.java +++ b/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/src/test/java/test/AppTest.java @@ -20,39 +20,19 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); } -} +} \ No newline at end of file diff --git a/src/it/projects/dependency-sets/dep-with-transitive-filter/pom.xml b/src/it/projects/dependency-sets/dep-with-transitive-filter/pom.xml index 59d04e3db..f952bc83e 100644 --- a/src/it/projects/dependency-sets/dep-with-transitive-filter/pom.xml +++ b/src/it/projects/dependency-sets/dep-with-transitive-filter/pom.xml @@ -31,9 +31,8 @@ under the License. - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test @@ -45,6 +44,12 @@ under the License. org.apache.maven.reporting maven-reporting-impl 2.0.4.1 + + + junit + junit + + diff --git a/src/it/projects/dependency-sets/dep-with-transitive-filter/src/test/java/test/AppTest.java b/src/it/projects/dependency-sets/dep-with-transitive-filter/src/test/java/test/AppTest.java index d5c12059c..25016db0d 100644 --- a/src/it/projects/dependency-sets/dep-with-transitive-filter/src/test/java/test/AppTest.java +++ b/src/it/projects/dependency-sets/dep-with-transitive-filter/src/test/java/test/AppTest.java @@ -20,39 +20,19 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); } -} +} \ No newline at end of file diff --git a/src/it/projects/dependency-sets/dependencySet-matchScope/child1/pom.xml b/src/it/projects/dependency-sets/dependencySet-matchScope/child1/pom.xml index 034afe212..c191b480f 100644 --- a/src/it/projects/dependency-sets/dependencySet-matchScope/child1/pom.xml +++ b/src/it/projects/dependency-sets/dependencySet-matchScope/child1/pom.xml @@ -31,9 +31,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/dependency-sets/dependencySet-matchScope/child1/src/test/java/test/AppTest.java b/src/it/projects/dependency-sets/dependencySet-matchScope/child1/src/test/java/test/AppTest.java index d5c12059c..25016db0d 100644 --- a/src/it/projects/dependency-sets/dependencySet-matchScope/child1/src/test/java/test/AppTest.java +++ b/src/it/projects/dependency-sets/dependencySet-matchScope/child1/src/test/java/test/AppTest.java @@ -20,39 +20,19 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); } -} +} \ No newline at end of file diff --git a/src/it/projects/dependency-sets/dependencySet-matchScope/child2/pom.xml b/src/it/projects/dependency-sets/dependencySet-matchScope/child2/pom.xml index 17df2b2a9..1c12c1531 100644 --- a/src/it/projects/dependency-sets/dependencySet-matchScope/child2/pom.xml +++ b/src/it/projects/dependency-sets/dependencySet-matchScope/child2/pom.xml @@ -36,9 +36,8 @@ under the License. 1.0-SNAPSHOT - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/dependency-sets/dependencySet-matchScope/child2/src/test/java/test/AppTest.java b/src/it/projects/dependency-sets/dependencySet-matchScope/child2/src/test/java/test/AppTest.java index d5c12059c..25016db0d 100644 --- a/src/it/projects/dependency-sets/dependencySet-matchScope/child2/src/test/java/test/AppTest.java +++ b/src/it/projects/dependency-sets/dependencySet-matchScope/child2/src/test/java/test/AppTest.java @@ -20,39 +20,19 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); } -} +} \ No newline at end of file diff --git a/src/it/projects/dependency-sets/dependencySet-matchScope/verify.bsh b/src/it/projects/dependency-sets/dependencySet-matchScope/verify.bsh index 8b29f24cb..7644cd3b5 100644 --- a/src/it/projects/dependency-sets/dependencySet-matchScope/verify.bsh +++ b/src/it/projects/dependency-sets/dependencySet-matchScope/verify.bsh @@ -49,9 +49,9 @@ try result = false; } - System.out.println( "Looking for absence of 'lib/junit.jar' jar entry." ); + System.out.println( "Looking for absence of 'lib/junit-jupiter-api.jar' jar entry." ); - if ( jf.getEntry( "lib/junit.jar" ) != null ) + if ( jf.getEntry( "lib/junit-jupiter-api.jar" ) != null ) { System.err.println( "junit jar should not be present." ); result = false; diff --git a/src/it/projects/dependency-sets/dependencySet-nonTransitive/child1/pom.xml b/src/it/projects/dependency-sets/dependencySet-nonTransitive/child1/pom.xml index 1d9f07357..87ea57825 100644 --- a/src/it/projects/dependency-sets/dependencySet-nonTransitive/child1/pom.xml +++ b/src/it/projects/dependency-sets/dependencySet-nonTransitive/child1/pom.xml @@ -29,9 +29,9 @@ under the License. - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api + test diff --git a/src/it/projects/dependency-sets/dependencySet-nonTransitive/child1/src/test/java/test/AppTest.java b/src/it/projects/dependency-sets/dependencySet-nonTransitive/child1/src/test/java/test/AppTest.java index d5c12059c..25016db0d 100644 --- a/src/it/projects/dependency-sets/dependencySet-nonTransitive/child1/src/test/java/test/AppTest.java +++ b/src/it/projects/dependency-sets/dependencySet-nonTransitive/child1/src/test/java/test/AppTest.java @@ -20,39 +20,19 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); } -} +} \ No newline at end of file diff --git a/src/it/projects/dependency-sets/dependencySet-nonTransitive/verify.bsh b/src/it/projects/dependency-sets/dependencySet-nonTransitive/verify.bsh index 8b29f24cb..7644cd3b5 100644 --- a/src/it/projects/dependency-sets/dependencySet-nonTransitive/verify.bsh +++ b/src/it/projects/dependency-sets/dependencySet-nonTransitive/verify.bsh @@ -49,9 +49,9 @@ try result = false; } - System.out.println( "Looking for absence of 'lib/junit.jar' jar entry." ); + System.out.println( "Looking for absence of 'lib/junit-jupiter-api.jar' jar entry." ); - if ( jf.getEntry( "lib/junit.jar" ) != null ) + if ( jf.getEntry( "lib/junit-jupiter-api.jar" ) != null ) { System.err.println( "junit jar should not be present." ); result = false; diff --git a/src/it/projects/dependency-sets/dependencySet-notUnpacked/child1/pom.xml b/src/it/projects/dependency-sets/dependencySet-notUnpacked/child1/pom.xml index 44f495ecf..443f3756a 100644 --- a/src/it/projects/dependency-sets/dependencySet-notUnpacked/child1/pom.xml +++ b/src/it/projects/dependency-sets/dependencySet-notUnpacked/child1/pom.xml @@ -31,9 +31,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/dependency-sets/dependencySet-notUnpacked/child1/src/test/java/test/AppTest.java b/src/it/projects/dependency-sets/dependencySet-notUnpacked/child1/src/test/java/test/AppTest.java index d5c12059c..25016db0d 100644 --- a/src/it/projects/dependency-sets/dependencySet-notUnpacked/child1/src/test/java/test/AppTest.java +++ b/src/it/projects/dependency-sets/dependencySet-notUnpacked/child1/src/test/java/test/AppTest.java @@ -20,39 +20,19 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); } -} +} \ No newline at end of file diff --git a/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/pom.xml b/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/pom.xml index bd74820f3..823c9760e 100644 --- a/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/pom.xml +++ b/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/pom.xml @@ -36,9 +36,8 @@ under the License. 1.0-SNAPSHOT - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/src/test/java/test/AppTest.java b/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/src/test/java/test/AppTest.java index d5c12059c..25016db0d 100644 --- a/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/src/test/java/test/AppTest.java +++ b/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/src/test/java/test/AppTest.java @@ -20,39 +20,19 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); } -} +} \ No newline at end of file diff --git a/src/it/projects/dependency-sets/dependencySet-notUnpacked/verify.bsh b/src/it/projects/dependency-sets/dependencySet-notUnpacked/verify.bsh index 8b29f24cb..7644cd3b5 100644 --- a/src/it/projects/dependency-sets/dependencySet-notUnpacked/verify.bsh +++ b/src/it/projects/dependency-sets/dependencySet-notUnpacked/verify.bsh @@ -49,9 +49,9 @@ try result = false; } - System.out.println( "Looking for absence of 'lib/junit.jar' jar entry." ); + System.out.println( "Looking for absence of 'lib/junit-jupiter-api.jar' jar entry." ); - if ( jf.getEntry( "lib/junit.jar" ) != null ) + if ( jf.getEntry( "lib/junit-jupiter-api.jar" ) != null ) { System.err.println( "junit jar should not be present." ); result = false; diff --git a/src/it/projects/dependency-sets/dependencySet-unpacked/child1/pom.xml b/src/it/projects/dependency-sets/dependencySet-unpacked/child1/pom.xml index ab0c30029..f6266b5e1 100644 --- a/src/it/projects/dependency-sets/dependencySet-unpacked/child1/pom.xml +++ b/src/it/projects/dependency-sets/dependencySet-unpacked/child1/pom.xml @@ -31,9 +31,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/dependency-sets/dependencySet-unpacked/child1/src/test/java/test/AppTest.java b/src/it/projects/dependency-sets/dependencySet-unpacked/child1/src/test/java/test/AppTest.java index d5c12059c..25016db0d 100644 --- a/src/it/projects/dependency-sets/dependencySet-unpacked/child1/src/test/java/test/AppTest.java +++ b/src/it/projects/dependency-sets/dependencySet-unpacked/child1/src/test/java/test/AppTest.java @@ -20,39 +20,19 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); } -} +} \ No newline at end of file diff --git a/src/it/projects/dependency-sets/dependencySet-unpacked/child2/pom.xml b/src/it/projects/dependency-sets/dependencySet-unpacked/child2/pom.xml index c59ee65a9..8dd102512 100644 --- a/src/it/projects/dependency-sets/dependencySet-unpacked/child2/pom.xml +++ b/src/it/projects/dependency-sets/dependencySet-unpacked/child2/pom.xml @@ -36,9 +36,8 @@ under the License. 1.0-SNAPSHOT - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/dependency-sets/dependencySet-unpacked/child2/src/test/java/test/AppTest.java b/src/it/projects/dependency-sets/dependencySet-unpacked/child2/src/test/java/test/AppTest.java index d5c12059c..25016db0d 100644 --- a/src/it/projects/dependency-sets/dependencySet-unpacked/child2/src/test/java/test/AppTest.java +++ b/src/it/projects/dependency-sets/dependencySet-unpacked/child2/src/test/java/test/AppTest.java @@ -20,39 +20,19 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); } -} +} \ No newline at end of file diff --git a/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/pom.xml b/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/pom.xml index 9257d7668..23d9c2c99 100644 --- a/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/pom.xml +++ b/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/pom.xml @@ -31,9 +31,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/test/java/test/AppTest.java b/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/test/java/test/AppTest.java index d5c12059c..25016db0d 100644 --- a/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/test/java/test/AppTest.java +++ b/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/test/java/test/AppTest.java @@ -20,39 +20,19 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); } -} +} \ No newline at end of file diff --git a/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/pom.xml b/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/pom.xml index 4c20549e2..51e0d8777 100644 --- a/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/pom.xml +++ b/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/pom.xml @@ -36,9 +36,8 @@ under the License. 1.0-SNAPSHOT - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/test/java/test/AppTest.java b/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/test/java/test/AppTest.java index d5c12059c..25016db0d 100644 --- a/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/test/java/test/AppTest.java +++ b/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/test/java/test/AppTest.java @@ -20,39 +20,19 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); } -} +} \ No newline at end of file diff --git a/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child1/pom.xml b/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child1/pom.xml index e644626c4..6308f77e9 100644 --- a/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child1/pom.xml +++ b/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child1/pom.xml @@ -29,9 +29,8 @@ under the License. - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child1/src/test/java/test/AppTest.java b/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child1/src/test/java/test/AppTest.java index d5c12059c..25016db0d 100644 --- a/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child1/src/test/java/test/AppTest.java +++ b/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child1/src/test/java/test/AppTest.java @@ -20,39 +20,19 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); } -} +} \ No newline at end of file diff --git a/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/pom.xml b/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/pom.xml index deda144bb..724380657 100644 --- a/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/pom.xml +++ b/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/pom.xml @@ -35,9 +35,8 @@ under the License. 1.0-SNAPSHOT - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/src/test/java/test/AppTest.java b/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/src/test/java/test/AppTest.java index d5c12059c..25016db0d 100644 --- a/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/src/test/java/test/AppTest.java +++ b/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/src/test/java/test/AppTest.java @@ -20,39 +20,19 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); } -} +} \ No newline at end of file diff --git a/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child1/pom.xml b/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child1/pom.xml index f5521f3a1..c85fb527d 100644 --- a/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child1/pom.xml +++ b/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child1/pom.xml @@ -31,9 +31,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child1/src/test/java/test/AppTest.java b/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child1/src/test/java/test/AppTest.java index d5c12059c..5e8f817d5 100644 --- a/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child1/src/test/java/test/AppTest.java +++ b/src/it/projects/dependency-sets/dependencySet-withExecutedProject/child1/src/test/java/test/AppTest.java @@ -20,39 +20,20 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); } } + diff --git a/src/it/projects/dependency-sets/include-project-artifact/pom.xml b/src/it/projects/dependency-sets/include-project-artifact/pom.xml index 7780780d5..f30f075b0 100644 --- a/src/it/projects/dependency-sets/include-project-artifact/pom.xml +++ b/src/it/projects/dependency-sets/include-project-artifact/pom.xml @@ -33,9 +33,8 @@ under the License. - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/dependency-sets/include-project-artifact/src/test/java/test/AppTest.java b/src/it/projects/dependency-sets/include-project-artifact/src/test/java/test/AppTest.java index d5c12059c..25016db0d 100644 --- a/src/it/projects/dependency-sets/include-project-artifact/src/test/java/test/AppTest.java +++ b/src/it/projects/dependency-sets/include-project-artifact/src/test/java/test/AppTest.java @@ -20,39 +20,19 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); } -} +} \ No newline at end of file diff --git a/src/it/projects/dependency-sets/include-project-artifact/verify.bsh b/src/it/projects/dependency-sets/include-project-artifact/verify.bsh index 1c9fd40e4..55018082c 100644 --- a/src/it/projects/dependency-sets/include-project-artifact/verify.bsh +++ b/src/it/projects/dependency-sets/include-project-artifact/verify.bsh @@ -45,9 +45,9 @@ try return false; } - System.out.println( "Looking for absence of 'lib/junit.jar' jar entry." ); + System.out.println( "Looking for absence of 'lib/junit-jupiter-api.jar' jar entry." ); - if ( new File( dir, "lib/junit-3.8.1.jar" ).exists() ) + if ( new File( dir, "lib/junit-jupiter-api-6.0.0.jar" ).exists() ) { System.err.println( "junit jar should not be present." ); return false; diff --git a/src/it/projects/dependency-sets/include-project-attachments/pom.xml b/src/it/projects/dependency-sets/include-project-attachments/pom.xml index e784e4abc..d901a08cd 100644 --- a/src/it/projects/dependency-sets/include-project-attachments/pom.xml +++ b/src/it/projects/dependency-sets/include-project-attachments/pom.xml @@ -32,11 +32,10 @@ under the License. 1.0-SNAPSHOT - - junit - junit - 3.8.1 - test + + org.junit.jupiter + junit-jupiter-api + test diff --git a/src/it/projects/dependency-sets/include-project-attachments/src/test/java/test/AppTest.java b/src/it/projects/dependency-sets/include-project-attachments/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/dependency-sets/include-project-attachments/src/test/java/test/AppTest.java +++ b/src/it/projects/dependency-sets/include-project-attachments/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/dependency-sets/include-project-attachments/verify.bsh b/src/it/projects/dependency-sets/include-project-attachments/verify.bsh index ed176afaa..cadcb7848 100644 --- a/src/it/projects/dependency-sets/include-project-attachments/verify.bsh +++ b/src/it/projects/dependency-sets/include-project-attachments/verify.bsh @@ -55,9 +55,9 @@ try return false; } - System.out.println( "Looking for absence of 'lib/junit.jar' jar entry." ); + System.out.println( "Looking for absence of 'lib/junit-jupiter-api.jar' jar entry." ); - if ( new File( dir, "lib/junit-3.8.1.jar" ).exists() ) + if ( new File( dir, "lib/junit-jupiter-api-6.0.0.jar" ).exists() ) { System.err.println( "junit jar should not be present." ); return false; diff --git a/src/it/projects/dependency-sets/include-provided/child1/pom.xml b/src/it/projects/dependency-sets/include-provided/child1/pom.xml index 745cde387..ad92df99a 100644 --- a/src/it/projects/dependency-sets/include-provided/child1/pom.xml +++ b/src/it/projects/dependency-sets/include-provided/child1/pom.xml @@ -31,9 +31,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/dependency-sets/include-provided/child1/src/test/java/test/AppTest.java b/src/it/projects/dependency-sets/include-provided/child1/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/dependency-sets/include-provided/child1/src/test/java/test/AppTest.java +++ b/src/it/projects/dependency-sets/include-provided/child1/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/dependency-sets/include-provided/child2/pom.xml b/src/it/projects/dependency-sets/include-provided/child2/pom.xml index 0743329fc..917112b57 100644 --- a/src/it/projects/dependency-sets/include-provided/child2/pom.xml +++ b/src/it/projects/dependency-sets/include-provided/child2/pom.xml @@ -37,9 +37,8 @@ under the License. provided - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/dependency-sets/include-provided/child2/src/test/java/test/AppTest.java b/src/it/projects/dependency-sets/include-provided/child2/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/dependency-sets/include-provided/child2/src/test/java/test/AppTest.java +++ b/src/it/projects/dependency-sets/include-provided/child2/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/dependency-sets/include-provided/verify.bsh b/src/it/projects/dependency-sets/include-provided/verify.bsh index 8b29f24cb..7644cd3b5 100644 --- a/src/it/projects/dependency-sets/include-provided/verify.bsh +++ b/src/it/projects/dependency-sets/include-provided/verify.bsh @@ -49,9 +49,9 @@ try result = false; } - System.out.println( "Looking for absence of 'lib/junit.jar' jar entry." ); + System.out.println( "Looking for absence of 'lib/junit-jupiter-api.jar' jar entry." ); - if ( jf.getEntry( "lib/junit.jar" ) != null ) + if ( jf.getEntry( "lib/junit-jupiter-api.jar" ) != null ) { System.err.println( "junit jar should not be present." ); result = false; diff --git a/src/it/projects/dependency-sets/massembly-235/pom.xml b/src/it/projects/dependency-sets/massembly-235/pom.xml index 75966b765..557d315ce 100644 --- a/src/it/projects/dependency-sets/massembly-235/pom.xml +++ b/src/it/projects/dependency-sets/massembly-235/pom.xml @@ -40,9 +40,8 @@ under the License. 2.2 - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/dependency-sets/massembly-235/src/test/java/HelloWorldTest.java b/src/it/projects/dependency-sets/massembly-235/src/test/java/HelloWorldTest.java index efb679ec4..33e4cd1b2 100644 --- a/src/it/projects/dependency-sets/massembly-235/src/test/java/HelloWorldTest.java +++ b/src/it/projects/dependency-sets/massembly-235/src/test/java/HelloWorldTest.java @@ -17,11 +17,14 @@ * under the License. */ -import junit.framework.TestCase; +import org.junit.jupiter.api.Test; -public class HelloWorldTest extends TestCase +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class HelloWorldTest { - public static final void testSayHello() + @Test + void testSayHello() { assertEquals("Hello World!", HelloWorld.sayHello("World")); } diff --git a/src/it/projects/dependency-sets/massembly-395/child1/pom.xml b/src/it/projects/dependency-sets/massembly-395/child1/pom.xml index 2a94120bf..a8f58a42a 100644 --- a/src/it/projects/dependency-sets/massembly-395/child1/pom.xml +++ b/src/it/projects/dependency-sets/massembly-395/child1/pom.xml @@ -30,9 +30,9 @@ under the License. 1.0-SNAPSHOT - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api + @versions.junit5@ diff --git a/src/it/projects/dependency-sets/massembly-395/child2/pom.xml b/src/it/projects/dependency-sets/massembly-395/child2/pom.xml index f066cc8fd..6fd3c037c 100644 --- a/src/it/projects/dependency-sets/massembly-395/child2/pom.xml +++ b/src/it/projects/dependency-sets/massembly-395/child2/pom.xml @@ -26,10 +26,10 @@ under the License. 1.0-SNAPSHOT - junit - junit - 3.8.1 - test + org.junit.jupiter + junit-jupiter-api + @versions.junit5@ + test \ No newline at end of file diff --git a/src/it/projects/dependency-sets/massembly-395/pom.xml b/src/it/projects/dependency-sets/massembly-395/pom.xml index 0109d4d75..1d6c68130 100644 --- a/src/it/projects/dependency-sets/massembly-395/pom.xml +++ b/src/it/projects/dependency-sets/massembly-395/pom.xml @@ -34,9 +34,8 @@ under the License. my-app - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/dependency-sets/massembly-395/verify.bsh b/src/it/projects/dependency-sets/massembly-395/verify.bsh index ff453bf0d..b90514d79 100644 --- a/src/it/projects/dependency-sets/massembly-395/verify.bsh +++ b/src/it/projects/dependency-sets/massembly-395/verify.bsh @@ -26,7 +26,7 @@ import java.util.zip.*; File f = new File( basedir, "target/my-app-1.0-SNAPSHOT-bin.zip" ); ZipFile zf = new ZipFile( f ); -ZipEntry child1InclEntry = zf.getEntry( "my-app-1.0-SNAPSHOT/modules/junit-3.8.1.jar" ); +ZipEntry child1InclEntry = zf.getEntry( "my-app-1.0-SNAPSHOT/modules/junit-jupiter-api-5.13.1.jar" ); if ( child1InclEntry == null ) { diff --git a/src/it/projects/dependency-sets/massembly-99/module-a/pom.xml b/src/it/projects/dependency-sets/massembly-99/module-a/pom.xml index 2efdad9a9..923652e58 100644 --- a/src/it/projects/dependency-sets/massembly-99/module-a/pom.xml +++ b/src/it/projects/dependency-sets/massembly-99/module-a/pom.xml @@ -31,9 +31,8 @@ 1.0-SNAPSHOT - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/dependency-sets/massembly-99/module-a/src/test/java/com/nf/ass/AppTest.java b/src/it/projects/dependency-sets/massembly-99/module-a/src/test/java/com/nf/ass/AppTest.java index 211266612..23138f21c 100644 --- a/src/it/projects/dependency-sets/massembly-99/module-a/src/test/java/com/nf/ass/AppTest.java +++ b/src/it/projects/dependency-sets/massembly-99/module-a/src/test/java/com/nf/ass/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/dependency-sets/massembly-99/module-b/pom.xml b/src/it/projects/dependency-sets/massembly-99/module-b/pom.xml index 75079fc81..c5892ba32 100644 --- a/src/it/projects/dependency-sets/massembly-99/module-b/pom.xml +++ b/src/it/projects/dependency-sets/massembly-99/module-b/pom.xml @@ -30,9 +30,8 @@ under the License. 1.0-SNAPSHOT - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/dependency-sets/massembly-99/module-b/src/test/java/com/nf/ass/AppTest.java b/src/it/projects/dependency-sets/massembly-99/module-b/src/test/java/com/nf/ass/AppTest.java index 211266612..23138f21c 100644 --- a/src/it/projects/dependency-sets/massembly-99/module-b/src/test/java/com/nf/ass/AppTest.java +++ b/src/it/projects/dependency-sets/massembly-99/module-b/src/test/java/com/nf/ass/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/pom.xml b/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/pom.xml index 3bf612d9a..e98b95b47 100644 --- a/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/pom.xml +++ b/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/pom.xml @@ -31,9 +31,8 @@ under the License. - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/test/java/test/AppTest.java b/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/test/java/test/AppTest.java +++ b/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/dependency-sets/multiple-wildcard-includes/pom.xml b/src/it/projects/dependency-sets/multiple-wildcard-includes/pom.xml index 7a82731cd..719d8b413 100644 --- a/src/it/projects/dependency-sets/multiple-wildcard-includes/pom.xml +++ b/src/it/projects/dependency-sets/multiple-wildcard-includes/pom.xml @@ -31,9 +31,8 @@ under the License. - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test @@ -50,6 +49,12 @@ under the License. org.apache.maven.reporting maven-reporting-impl 3.0.0 + + + junit + junit + + commons-vfs diff --git a/src/it/projects/dependency-sets/multiple-wildcard-includes/src/test/java/test/AppTest.java b/src/it/projects/dependency-sets/multiple-wildcard-includes/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/dependency-sets/multiple-wildcard-includes/src/test/java/test/AppTest.java +++ b/src/it/projects/dependency-sets/multiple-wildcard-includes/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-a/pom.xml b/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-a/pom.xml index 8baae13c1..725307b77 100644 --- a/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-a/pom.xml +++ b/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-a/pom.xml @@ -30,9 +30,8 @@ under the License. 1.0-SNAPSHOT - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-a/src/test/java/com/nf/ass/AppTest.java b/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-a/src/test/java/com/nf/ass/AppTest.java index 211266612..23138f21c 100644 --- a/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-a/src/test/java/com/nf/ass/AppTest.java +++ b/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-a/src/test/java/com/nf/ass/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/pom.xml b/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/pom.xml index d22d5244e..0ebbc2603 100644 --- a/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/pom.xml +++ b/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/pom.xml @@ -30,9 +30,8 @@ under the License. 1.0-SNAPSHOT - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/src/test/java/com/nf/ass/AppTest.java b/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/src/test/java/com/nf/ass/AppTest.java index 211266612..23138f21c 100644 --- a/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/src/test/java/com/nf/ass/AppTest.java +++ b/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/src/test/java/com/nf/ass/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml b/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml index e2971b58a..95d6da09b 100644 --- a/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml +++ b/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml @@ -34,9 +34,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/descriptor-refs/bin/jars-in-archive-root/src/test/java/test/AppTest.java b/src/it/projects/descriptor-refs/bin/jars-in-archive-root/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/descriptor-refs/bin/jars-in-archive-root/src/test/java/test/AppTest.java +++ b/src/it/projects/descriptor-refs/bin/jars-in-archive-root/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child1/pom.xml b/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child1/pom.xml index 928b51db6..b38ec3c02 100644 --- a/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child1/pom.xml +++ b/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child1/pom.xml @@ -31,9 +31,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/pom.xml b/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/pom.xml index cd7418258..d9e60b689 100644 --- a/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/pom.xml +++ b/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/pom.xml @@ -36,9 +36,8 @@ under the License. 1.0-SNAPSHOT - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/test/java/test/AppTest.java b/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/test/java/test/AppTest.java +++ b/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/pom.xml b/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/pom.xml index 0f0ce1f9f..f6457b226 100644 --- a/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/pom.xml +++ b/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/pom.xml @@ -31,9 +31,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/pom.xml b/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/pom.xml index 27020055e..eabc92651 100644 --- a/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/pom.xml +++ b/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/pom.xml @@ -36,9 +36,8 @@ under the License. 1.0-SNAPSHOT - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/test/java/test/AppTest.java b/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/test/java/test/AppTest.java +++ b/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/pom.xml b/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/pom.xml index 29dbe25b9..43d6ddf97 100644 --- a/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/pom.xml +++ b/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/pom.xml @@ -31,9 +31,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/src/test/java/test/AppTest.java b/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/src/test/java/test/AppTest.java +++ b/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/pom.xml b/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/pom.xml index dd4579728..9280576ee 100644 --- a/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/pom.xml +++ b/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/pom.xml @@ -31,9 +31,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/src/test/java/test/AppTest.java b/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/src/test/java/test/AppTest.java +++ b/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml b/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml index d50b18619..6ee1c262d 100644 --- a/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml +++ b/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml @@ -35,9 +35,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/pom.xml b/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/pom.xml index ecc205dfb..1f65f59e5 100644 --- a/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/pom.xml +++ b/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/pom.xml @@ -30,9 +30,8 @@ under the License. - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/java/test/AppTest.java b/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/java/test/AppTest.java +++ b/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/pom.xml b/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/pom.xml index c90b72753..f13b6c1a7 100644 --- a/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/pom.xml +++ b/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/pom.xml @@ -30,9 +30,8 @@ under the License. - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/java/test/AppTest.java b/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/java/test/AppTest.java +++ b/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/pom.xml b/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/pom.xml index 54d734582..e0aa24217 100644 --- a/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/pom.xml +++ b/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/pom.xml @@ -34,9 +34,8 @@ under the License. - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/descriptor-refs/project/no-target-dir/pom.xml b/src/it/projects/descriptor-refs/project/no-target-dir/pom.xml index 99649a146..c407c58c6 100644 --- a/src/it/projects/descriptor-refs/project/no-target-dir/pom.xml +++ b/src/it/projects/descriptor-refs/project/no-target-dir/pom.xml @@ -33,9 +33,8 @@ under the License. - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/descriptor-refs/project/no-target-dir/src/test/java/test/AppTest.java b/src/it/projects/descriptor-refs/project/no-target-dir/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/descriptor-refs/project/no-target-dir/src/test/java/test/AppTest.java +++ b/src/it/projects/descriptor-refs/project/no-target-dir/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/descriptor-refs/project/sources-copied/pom.xml b/src/it/projects/descriptor-refs/project/sources-copied/pom.xml index b4645d117..5a621c8ce 100644 --- a/src/it/projects/descriptor-refs/project/sources-copied/pom.xml +++ b/src/it/projects/descriptor-refs/project/sources-copied/pom.xml @@ -34,9 +34,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/descriptor-refs/project/sources-copied/src/test/java/test/AppTest.java b/src/it/projects/descriptor-refs/project/sources-copied/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/descriptor-refs/project/sources-copied/src/test/java/test/AppTest.java +++ b/src/it/projects/descriptor-refs/project/sources-copied/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/descriptor-refs/src/no-target-dir/pom.xml b/src/it/projects/descriptor-refs/src/no-target-dir/pom.xml index 49aa72d2d..a9d6b782c 100644 --- a/src/it/projects/descriptor-refs/src/no-target-dir/pom.xml +++ b/src/it/projects/descriptor-refs/src/no-target-dir/pom.xml @@ -33,9 +33,8 @@ under the License. - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/descriptor-refs/src/no-target-dir/src/test/java/test/AppTest.java b/src/it/projects/descriptor-refs/src/no-target-dir/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/descriptor-refs/src/no-target-dir/src/test/java/test/AppTest.java +++ b/src/it/projects/descriptor-refs/src/no-target-dir/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml b/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml index 299b36898..d6d27936c 100644 --- a/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml +++ b/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml @@ -33,9 +33,8 @@ under the License. - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/descriptor-refs/src/src-dir-copied/src/test/java/test/AppTest.java b/src/it/projects/descriptor-refs/src/src-dir-copied/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/descriptor-refs/src/src-dir-copied/src/test/java/test/AppTest.java +++ b/src/it/projects/descriptor-refs/src/src-dir-copied/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/file-modes/file-set-fileMode/pom.xml b/src/it/projects/file-modes/file-set-fileMode/pom.xml index 840340921..b065b8258 100644 --- a/src/it/projects/file-modes/file-set-fileMode/pom.xml +++ b/src/it/projects/file-modes/file-set-fileMode/pom.xml @@ -35,9 +35,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/file-modes/file-set-fileMode/src/test/java/test/AppTest.java b/src/it/projects/file-modes/file-set-fileMode/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/file-modes/file-set-fileMode/src/test/java/test/AppTest.java +++ b/src/it/projects/file-modes/file-set-fileMode/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/file-modes/fileItem-fileMode/pom.xml b/src/it/projects/file-modes/fileItem-fileMode/pom.xml index 0e8712c4a..c42ba2b34 100644 --- a/src/it/projects/file-modes/fileItem-fileMode/pom.xml +++ b/src/it/projects/file-modes/fileItem-fileMode/pom.xml @@ -35,9 +35,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/file-modes/fileItem-fileMode/src/test/java/test/AppTest.java b/src/it/projects/file-modes/fileItem-fileMode/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/file-modes/fileItem-fileMode/src/test/java/test/AppTest.java +++ b/src/it/projects/file-modes/fileItem-fileMode/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/file-sets/default-excludes-unspecified/src/test/java/test/AppTest.java b/src/it/projects/file-sets/default-excludes-unspecified/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/file-sets/default-excludes-unspecified/src/test/java/test/AppTest.java +++ b/src/it/projects/file-sets/default-excludes-unspecified/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/file-sets/dont-use-default-excludes/src/test/java/test/AppTest.java b/src/it/projects/file-sets/dont-use-default-excludes/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/file-sets/dont-use-default-excludes/src/test/java/test/AppTest.java +++ b/src/it/projects/file-sets/dont-use-default-excludes/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/file-sets/excluding-svn-dirs/src/test/java/test/AppTest.java b/src/it/projects/file-sets/excluding-svn-dirs/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/file-sets/excluding-svn-dirs/src/test/java/test/AppTest.java +++ b/src/it/projects/file-sets/excluding-svn-dirs/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/file-sets/include-base-directory/src/test/java/test/AppTest.java b/src/it/projects/file-sets/include-base-directory/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/file-sets/include-base-directory/src/test/java/test/AppTest.java +++ b/src/it/projects/file-sets/include-base-directory/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/file-sets/include-parent-dir/child/pom.xml b/src/it/projects/file-sets/include-parent-dir/child/pom.xml index 984e7ee06..3f13d3be0 100644 --- a/src/it/projects/file-sets/include-parent-dir/child/pom.xml +++ b/src/it/projects/file-sets/include-parent-dir/child/pom.xml @@ -31,9 +31,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/file-sets/include-parent-dir/child/src/test/java/test/AppTest.java b/src/it/projects/file-sets/include-parent-dir/child/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/file-sets/include-parent-dir/child/src/test/java/test/AppTest.java +++ b/src/it/projects/file-sets/include-parent-dir/child/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/file-sets/include-parent-dir/pom.xml b/src/it/projects/file-sets/include-parent-dir/pom.xml index 9c25a1f36..369f0a8bb 100644 --- a/src/it/projects/file-sets/include-parent-dir/pom.xml +++ b/src/it/projects/file-sets/include-parent-dir/pom.xml @@ -35,9 +35,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/file-sets/use-default-excludes/src/test/java/test/AppTest.java b/src/it/projects/file-sets/use-default-excludes/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/file-sets/use-default-excludes/src/test/java/test/AppTest.java +++ b/src/it/projects/file-sets/use-default-excludes/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child1/pom.xml b/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child1/pom.xml index 94b99d079..4756748f5 100644 --- a/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child1/pom.xml +++ b/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child1/pom.xml @@ -32,9 +32,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child1/src/test/java/test/AppTest.java b/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child1/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child1/src/test/java/test/AppTest.java +++ b/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child1/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child2/pom.xml b/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child2/pom.xml index 56dd3480d..33f634516 100644 --- a/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child2/pom.xml +++ b/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child2/pom.xml @@ -32,9 +32,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child2/src/test/java/test/AppTest.java b/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child2/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child2/src/test/java/test/AppTest.java +++ b/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/child2/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child1/pom.xml b/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child1/pom.xml index 38c44b61a..23e325749 100644 --- a/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child1/pom.xml +++ b/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child1/pom.xml @@ -34,9 +34,8 @@ - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child1/src/test/java/test/AppTest.java b/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child1/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child1/src/test/java/test/AppTest.java +++ b/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child1/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/pom.xml b/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/pom.xml index f6fb652ca..61f69a16d 100644 --- a/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/pom.xml +++ b/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/pom.xml @@ -56,9 +56,8 @@ - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/src/test/java/test/AppTest.java b/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/src/test/java/test/AppTest.java +++ b/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/mojo-configuration/archiver-ignorePermissions/pom.xml b/src/it/projects/mojo-configuration/archiver-ignorePermissions/pom.xml index fdf4fd18f..80c01e3d9 100644 --- a/src/it/projects/mojo-configuration/archiver-ignorePermissions/pom.xml +++ b/src/it/projects/mojo-configuration/archiver-ignorePermissions/pom.xml @@ -34,9 +34,8 @@ under the License. - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/mojo-configuration/archiver-ignorePermissions/src/test/java/test/AppTest.java b/src/it/projects/mojo-configuration/archiver-ignorePermissions/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/mojo-configuration/archiver-ignorePermissions/src/test/java/test/AppTest.java +++ b/src/it/projects/mojo-configuration/archiver-ignorePermissions/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/mojo-configuration/archiver-ignorePermissions/verify.bsh b/src/it/projects/mojo-configuration/archiver-ignorePermissions/verify.bsh index 5fc410b45..06d78e5f6 100644 --- a/src/it/projects/mojo-configuration/archiver-ignorePermissions/verify.bsh +++ b/src/it/projects/mojo-configuration/archiver-ignorePermissions/verify.bsh @@ -31,7 +31,7 @@ if ( !pom.exists() || !pom.isFile() ) return false; } -File junitJar = new File( basedir, "target/parent-1-bin/parent-1/lib/junit-3.8.1.jar" ); +File junitJar = new File( basedir, "target/parent-1-bin/parent-1/lib/junit-jupiter-api-5.13.1.jar" ); if ( !junitJar.exists() && !junitJar.isFile() ) { System.out.println( "JUnit jar was not included in assembly." ); diff --git a/src/it/projects/mojo-configuration/manifest-with-customEntry/pom.xml b/src/it/projects/mojo-configuration/manifest-with-customEntry/pom.xml index 65b05efb1..1669d9bc2 100644 --- a/src/it/projects/mojo-configuration/manifest-with-customEntry/pom.xml +++ b/src/it/projects/mojo-configuration/manifest-with-customEntry/pom.xml @@ -32,9 +32,8 @@ under the License. 1 - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/mojo-configuration/manifest-with-customEntry/src/test/java/test/AppTest.java b/src/it/projects/mojo-configuration/manifest-with-customEntry/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/mojo-configuration/manifest-with-customEntry/src/test/java/test/AppTest.java +++ b/src/it/projects/mojo-configuration/manifest-with-customEntry/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/mojo-configuration/manifest-with-mainClass/pom.xml b/src/it/projects/mojo-configuration/manifest-with-mainClass/pom.xml index 19c09db3a..7a72da0b6 100644 --- a/src/it/projects/mojo-configuration/manifest-with-mainClass/pom.xml +++ b/src/it/projects/mojo-configuration/manifest-with-mainClass/pom.xml @@ -34,9 +34,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/mojo-configuration/manifest-with-mainClass/src/test/java/test/AppTest.java b/src/it/projects/mojo-configuration/manifest-with-mainClass/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/mojo-configuration/manifest-with-mainClass/src/test/java/test/AppTest.java +++ b/src/it/projects/mojo-configuration/manifest-with-mainClass/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/pom.xml b/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/pom.xml index 150068f3c..5f9a2e749 100644 --- a/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/pom.xml +++ b/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/pom.xml @@ -40,9 +40,8 @@ under the License. maven-plugin - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/src/test/java/test/AppTest.java b/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/src/test/java/test/AppTest.java +++ b/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/mojo-tests/single-in-one-project-hierarchy/pom.xml b/src/it/projects/mojo-tests/single-in-one-project-hierarchy/pom.xml index 942f3f740..599090413 100644 --- a/src/it/projects/mojo-tests/single-in-one-project-hierarchy/pom.xml +++ b/src/it/projects/mojo-tests/single-in-one-project-hierarchy/pom.xml @@ -33,9 +33,8 @@ under the License. 1.0-SNAPSHOT - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/mojo-tests/single-in-one-project-hierarchy/src/test/java/test/AppTest.java b/src/it/projects/mojo-tests/single-in-one-project-hierarchy/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/mojo-tests/single-in-one-project-hierarchy/src/test/java/test/AppTest.java +++ b/src/it/projects/mojo-tests/single-in-one-project-hierarchy/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/mojo-tests/single-in-one-project-hierarchy/verify.bsh b/src/it/projects/mojo-tests/single-in-one-project-hierarchy/verify.bsh index ebff7fb90..0ec5c89a2 100644 --- a/src/it/projects/mojo-tests/single-in-one-project-hierarchy/verify.bsh +++ b/src/it/projects/mojo-tests/single-in-one-project-hierarchy/verify.bsh @@ -19,4 +19,4 @@ import java.io.File; -return new File( basedir, "target/single-in-one-project-hierarchy-1.0-SNAPSHOT-bin/lib/junit.jar" ).exists(); +return new File( basedir, "target/single-in-one-project-hierarchy-1.0-SNAPSHOT-bin/lib/junit-jupiter-api.jar" ).exists(); diff --git a/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml b/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml index 1a83917d4..70de2ab35 100644 --- a/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml +++ b/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml @@ -31,9 +31,8 @@ under the License. jar - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/test/java/test/AppTest.java b/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/test/java/test/AppTest.java +++ b/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml b/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml index a2201572d..05c560ff4 100644 --- a/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml +++ b/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml @@ -32,9 +32,8 @@ under the License. - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/test/java/test/AppTest.java b/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/test/java/test/AppTest.java +++ b/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/verify.bsh b/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/verify.bsh index d084d55ac..9538a9c27 100644 --- a/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/verify.bsh +++ b/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/verify.bsh @@ -21,7 +21,7 @@ import java.io.File; boolean result = true; -result = result && new File( basedir, "child1/target/child1-1.0-SNAPSHOT-bin/lib/junit.jar" ).exists(); -result = result && new File( basedir, "child2/target/child2-1.0-SNAPSHOT-bin/lib/junit.jar" ).exists(); +result = result && new File( basedir, "child1/target/child1-1.0-SNAPSHOT-bin/lib/junit-jupiter-api.jar" ).exists(); +result = result && new File( basedir, "child2/target/child2-1.0-SNAPSHOT-bin/lib/junit-jupiter-api.jar" ).exists(); return result; diff --git a/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/pom.xml b/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/pom.xml index 16d73c42d..b1b7475c2 100644 --- a/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/pom.xml +++ b/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/pom.xml @@ -33,9 +33,8 @@ under the License. 1.0-SNAPSHOT - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/src/test/java/test/AppTest.java b/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/src/test/java/test/AppTest.java +++ b/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/verify.bsh b/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/verify.bsh index c1ff037d2..c3d04375b 100644 --- a/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/verify.bsh +++ b/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/verify.bsh @@ -21,7 +21,7 @@ import java.io.File; boolean result = true; -result = result && new File( basedir, "target/first-bin/lib/junit.jar" ).exists(); -result = result && new File( basedir, "target/second-bin/lib/junit.jar" ).exists(); +result = result && new File( basedir, "target/first-bin/lib/junit-jupiter-api.jar" ).exists(); +result = result && new File( basedir, "target/second-bin/lib/junit-jupiter-api.jar" ).exists(); return result; diff --git a/src/it/projects/multimodule/massembly-298/child1/pom.xml b/src/it/projects/multimodule/massembly-298/child1/pom.xml index 77034e4cd..ae9060a72 100644 --- a/src/it/projects/multimodule/massembly-298/child1/pom.xml +++ b/src/it/projects/multimodule/massembly-298/child1/pom.xml @@ -32,9 +32,8 @@ http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/multimodule/massembly-298/child1/src/test/java/org/test/AppTest.java b/src/it/projects/multimodule/massembly-298/child1/src/test/java/org/test/AppTest.java index 35ee6177e..a4dfd2142 100644 --- a/src/it/projects/multimodule/massembly-298/child1/src/test/java/org/test/AppTest.java +++ b/src/it/projects/multimodule/massembly-298/child1/src/test/java/org/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/multimodule/massembly-298/child2/pom.xml b/src/it/projects/multimodule/massembly-298/child2/pom.xml index 4f7c295c9..988c49c2e 100644 --- a/src/it/projects/multimodule/massembly-298/child2/pom.xml +++ b/src/it/projects/multimodule/massembly-298/child2/pom.xml @@ -32,9 +32,8 @@ http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/multimodule/massembly-298/child2/src/test/java/org/test/AppTest.java b/src/it/projects/multimodule/massembly-298/child2/src/test/java/org/test/AppTest.java index 35ee6177e..a4dfd2142 100644 --- a/src/it/projects/multimodule/massembly-298/child2/src/test/java/org/test/AppTest.java +++ b/src/it/projects/multimodule/massembly-298/child2/src/test/java/org/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/multimodule/massembly-317/assembly.xml b/src/it/projects/multimodule/massembly-317/assembly.xml index e29809830..0855dfd85 100644 --- a/src/it/projects/multimodule/massembly-317/assembly.xml +++ b/src/it/projects/multimodule/massembly-317/assembly.xml @@ -33,7 +33,7 @@ under the License. true - *:junit + *:junit-jupiter-api diff --git a/src/it/projects/multimodule/massembly-317/child1/pom.xml b/src/it/projects/multimodule/massembly-317/child1/pom.xml index 11a0de713..08bc341cd 100644 --- a/src/it/projects/multimodule/massembly-317/child1/pom.xml +++ b/src/it/projects/multimodule/massembly-317/child1/pom.xml @@ -24,10 +24,10 @@ under the License. my-app-module1 1.0-SNAPSHOT - + + org.junit.jupiter + junit-jupiter-api + @versions.junit5@ + diff --git a/src/it/projects/multimodule/massembly-317/child2/pom.xml b/src/it/projects/multimodule/massembly-317/child2/pom.xml index 0813a532c..91ca72804 100644 --- a/src/it/projects/multimodule/massembly-317/child2/pom.xml +++ b/src/it/projects/multimodule/massembly-317/child2/pom.xml @@ -26,9 +26,9 @@ under the License. 1.0-SNAPSHOT - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api + @versions.junit5@ diff --git a/src/it/projects/multimodule/massembly-317/pom.xml b/src/it/projects/multimodule/massembly-317/pom.xml index cf6983d04..502a816dd 100644 --- a/src/it/projects/multimodule/massembly-317/pom.xml +++ b/src/it/projects/multimodule/massembly-317/pom.xml @@ -34,9 +34,8 @@ under the License. my-app - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/multimodule/multimodule-binariesNotSource/child1/pom.xml b/src/it/projects/multimodule/multimodule-binariesNotSource/child1/pom.xml index 30048c9c1..671c33d29 100644 --- a/src/it/projects/multimodule/multimodule-binariesNotSource/child1/pom.xml +++ b/src/it/projects/multimodule/multimodule-binariesNotSource/child1/pom.xml @@ -31,9 +31,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/multimodule/multimodule-binariesNotSource/child1/src/test/java/org/test/AppTest.java b/src/it/projects/multimodule/multimodule-binariesNotSource/child1/src/test/java/org/test/AppTest.java index 35ee6177e..a4dfd2142 100644 --- a/src/it/projects/multimodule/multimodule-binariesNotSource/child1/src/test/java/org/test/AppTest.java +++ b/src/it/projects/multimodule/multimodule-binariesNotSource/child1/src/test/java/org/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/multimodule/multimodule-binariesNotSource/child2/pom.xml b/src/it/projects/multimodule/multimodule-binariesNotSource/child2/pom.xml index 31463e0c0..93b08ce81 100644 --- a/src/it/projects/multimodule/multimodule-binariesNotSource/child2/pom.xml +++ b/src/it/projects/multimodule/multimodule-binariesNotSource/child2/pom.xml @@ -31,9 +31,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/multimodule/multimodule-binariesNotSource/child2/src/test/java/org/test/AppTest.java b/src/it/projects/multimodule/multimodule-binariesNotSource/child2/src/test/java/org/test/AppTest.java index 35ee6177e..a4dfd2142 100644 --- a/src/it/projects/multimodule/multimodule-binariesNotSource/child2/src/test/java/org/test/AppTest.java +++ b/src/it/projects/multimodule/multimodule-binariesNotSource/child2/src/test/java/org/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/multimodule/multimodule-binariesNotSource/child3/pom.xml b/src/it/projects/multimodule/multimodule-binariesNotSource/child3/pom.xml index 3c32af128..ec131ab3b 100644 --- a/src/it/projects/multimodule/multimodule-binariesNotSource/child3/pom.xml +++ b/src/it/projects/multimodule/multimodule-binariesNotSource/child3/pom.xml @@ -31,9 +31,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/multimodule/multimodule-binariesNotSource/child3/src/test/java/org/test/AppTest.java b/src/it/projects/multimodule/multimodule-binariesNotSource/child3/src/test/java/org/test/AppTest.java index 35ee6177e..a4dfd2142 100644 --- a/src/it/projects/multimodule/multimodule-binariesNotSource/child3/src/test/java/org/test/AppTest.java +++ b/src/it/projects/multimodule/multimodule-binariesNotSource/child3/src/test/java/org/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/multimodule/multimodule-siblingParent/child1/pom.xml b/src/it/projects/multimodule/multimodule-siblingParent/child1/pom.xml index 509966bc0..856eb1b6f 100644 --- a/src/it/projects/multimodule/multimodule-siblingParent/child1/pom.xml +++ b/src/it/projects/multimodule/multimodule-siblingParent/child1/pom.xml @@ -30,9 +30,8 @@ under the License. - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/multimodule/multimodule-siblingParent/child1/src/test/java/org/test/AppTest.java b/src/it/projects/multimodule/multimodule-siblingParent/child1/src/test/java/org/test/AppTest.java index 35ee6177e..a4dfd2142 100644 --- a/src/it/projects/multimodule/multimodule-siblingParent/child1/src/test/java/org/test/AppTest.java +++ b/src/it/projects/multimodule/multimodule-siblingParent/child1/src/test/java/org/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/multimodule/multimodule-siblingParent/child2/pom.xml b/src/it/projects/multimodule/multimodule-siblingParent/child2/pom.xml index 2684487a2..abf98c3f5 100644 --- a/src/it/projects/multimodule/multimodule-siblingParent/child2/pom.xml +++ b/src/it/projects/multimodule/multimodule-siblingParent/child2/pom.xml @@ -30,9 +30,8 @@ under the License. - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/multimodule/multimodule-siblingParent/child2/src/test/java/org/test/AppTest.java b/src/it/projects/multimodule/multimodule-siblingParent/child2/src/test/java/org/test/AppTest.java index 35ee6177e..a4dfd2142 100644 --- a/src/it/projects/multimodule/multimodule-siblingParent/child2/src/test/java/org/test/AppTest.java +++ b/src/it/projects/multimodule/multimodule-siblingParent/child2/src/test/java/org/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/multimodule/multimodule-sourceNotBinaries/child1/pom.xml b/src/it/projects/multimodule/multimodule-sourceNotBinaries/child1/pom.xml index 30048c9c1..671c33d29 100644 --- a/src/it/projects/multimodule/multimodule-sourceNotBinaries/child1/pom.xml +++ b/src/it/projects/multimodule/multimodule-sourceNotBinaries/child1/pom.xml @@ -31,9 +31,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/multimodule/multimodule-sourceNotBinaries/child1/src/test/java/org/test/AppTest.java b/src/it/projects/multimodule/multimodule-sourceNotBinaries/child1/src/test/java/org/test/AppTest.java index 35ee6177e..a4dfd2142 100644 --- a/src/it/projects/multimodule/multimodule-sourceNotBinaries/child1/src/test/java/org/test/AppTest.java +++ b/src/it/projects/multimodule/multimodule-sourceNotBinaries/child1/src/test/java/org/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/multimodule/multimodule-sourceNotBinaries/child2/pom.xml b/src/it/projects/multimodule/multimodule-sourceNotBinaries/child2/pom.xml index 31463e0c0..93b08ce81 100644 --- a/src/it/projects/multimodule/multimodule-sourceNotBinaries/child2/pom.xml +++ b/src/it/projects/multimodule/multimodule-sourceNotBinaries/child2/pom.xml @@ -31,9 +31,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/multimodule/multimodule-sourceNotBinaries/child2/src/test/java/org/test/AppTest.java b/src/it/projects/multimodule/multimodule-sourceNotBinaries/child2/src/test/java/org/test/AppTest.java index 35ee6177e..a4dfd2142 100644 --- a/src/it/projects/multimodule/multimodule-sourceNotBinaries/child2/src/test/java/org/test/AppTest.java +++ b/src/it/projects/multimodule/multimodule-sourceNotBinaries/child2/src/test/java/org/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/multimodule/multimodule-sourceNotBinaries/child3/pom.xml b/src/it/projects/multimodule/multimodule-sourceNotBinaries/child3/pom.xml index 3c32af128..cf8067c2c 100644 --- a/src/it/projects/multimodule/multimodule-sourceNotBinaries/child3/pom.xml +++ b/src/it/projects/multimodule/multimodule-sourceNotBinaries/child3/pom.xml @@ -31,10 +31,9 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 - test + org.junit.jupiter + junit-jupiter-api + test diff --git a/src/it/projects/multimodule/multimodule-sourceNotBinaries/child3/src/test/java/org/test/AppTest.java b/src/it/projects/multimodule/multimodule-sourceNotBinaries/child3/src/test/java/org/test/AppTest.java index 35ee6177e..a4dfd2142 100644 --- a/src/it/projects/multimodule/multimodule-sourceNotBinaries/child3/src/test/java/org/test/AppTest.java +++ b/src/it/projects/multimodule/multimodule-sourceNotBinaries/child3/src/test/java/org/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child1/pom.xml b/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child1/pom.xml index 30048c9c1..671c33d29 100644 --- a/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child1/pom.xml +++ b/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child1/pom.xml @@ -31,9 +31,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child1/src/test/java/org/test/AppTest.java b/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child1/src/test/java/org/test/AppTest.java index 35ee6177e..a4dfd2142 100644 --- a/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child1/src/test/java/org/test/AppTest.java +++ b/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child1/src/test/java/org/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child2/pom.xml b/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child2/pom.xml index 31463e0c0..93b08ce81 100644 --- a/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child2/pom.xml +++ b/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child2/pom.xml @@ -31,9 +31,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child2/src/test/java/org/test/AppTest.java b/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child2/src/test/java/org/test/AppTest.java index 35ee6177e..a4dfd2142 100644 --- a/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child2/src/test/java/org/test/AppTest.java +++ b/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child2/src/test/java/org/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child3/pom.xml b/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child3/pom.xml index 3c32af128..ec131ab3b 100644 --- a/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child3/pom.xml +++ b/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child3/pom.xml @@ -31,9 +31,8 @@ under the License. http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child3/src/test/java/org/test/AppTest.java b/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child3/src/test/java/org/test/AppTest.java index 35ee6177e..a4dfd2142 100644 --- a/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child3/src/test/java/org/test/AppTest.java +++ b/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child3/src/test/java/org/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/multimodule/two-level-multimodule/child-level1-project1/pom.xml b/src/it/projects/multimodule/two-level-multimodule/child-level1-project1/pom.xml index fc9ab3874..a0417867f 100644 --- a/src/it/projects/multimodule/two-level-multimodule/child-level1-project1/pom.xml +++ b/src/it/projects/multimodule/two-level-multimodule/child-level1-project1/pom.xml @@ -29,9 +29,8 @@ under the License. 1.0-SNAPSHOT - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/multimodule/two-level-multimodule/child-level1-project1/src/test/java/test/AppTest.java b/src/it/projects/multimodule/two-level-multimodule/child-level1-project1/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/multimodule/two-level-multimodule/child-level1-project1/src/test/java/test/AppTest.java +++ b/src/it/projects/multimodule/two-level-multimodule/child-level1-project1/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/child-level2-project1/pom.xml b/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/child-level2-project1/pom.xml index 89b4e5359..237b251f0 100644 --- a/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/child-level2-project1/pom.xml +++ b/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/child-level2-project1/pom.xml @@ -30,9 +30,8 @@ 1.0-SNAPSHOT - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/child-level2-project1/src/test/java/test/AppTest.java b/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/child-level2-project1/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/child-level2-project1/src/test/java/test/AppTest.java +++ b/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/child-level2-project1/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/pom.xml b/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/pom.xml index a2f357485..c062d7e8d 100644 --- a/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/pom.xml +++ b/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/pom.xml @@ -29,9 +29,8 @@ under the License. 1.0-SNAPSHOT - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/src/test/java/test/AppTest.java b/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/src/test/java/test/AppTest.java +++ b/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/child-level2-project1/pom.xml b/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/child-level2-project1/pom.xml index ea19ccf5b..8e0298582 100644 --- a/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/child-level2-project1/pom.xml +++ b/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/child-level2-project1/pom.xml @@ -29,9 +29,8 @@ under the License. 1.0-SNAPSHOT - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/child-level2-project1/src/test/java/test/AppTest.java b/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/child-level2-project1/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/child-level2-project1/src/test/java/test/AppTest.java +++ b/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/child-level2-project1/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project1/pom.xml b/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project1/pom.xml index 1eff5c8a7..dd0a80041 100644 --- a/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project1/pom.xml +++ b/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project1/pom.xml @@ -29,9 +29,8 @@ under the License. 1.0-SNAPSHOT - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project1/src/test/java/test/AppTest.java b/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project1/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project1/src/test/java/test/AppTest.java +++ b/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project1/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/pom.xml b/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/pom.xml index 3d659ba6d..729d4bc4d 100644 --- a/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/pom.xml +++ b/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/pom.xml @@ -29,9 +29,8 @@ under the License. 1.0-SNAPSHOT - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api test diff --git a/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/src/test/java/test/AppTest.java b/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/src/test/java/test/AppTest.java index d5c12059c..8b760291b 100644 --- a/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/src/test/java/test/AppTest.java +++ b/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/src/test/java/test/AppTest.java @@ -20,37 +20,17 @@ */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue( true ); diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiverTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiverTest.java index e893a1d01..5dfdaaca3 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiverTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiverTest.java @@ -46,18 +46,20 @@ import org.codehaus.plexus.archiver.zip.ZipArchiver; import org.codehaus.plexus.component.configurator.BasicComponentConfigurator; import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.io.TempDir; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atLeastOnce; @@ -66,10 +68,11 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings(strictness = Strictness.WARN) +@ExtendWith(MockitoExtension.class) public class DefaultAssemblyArchiverTest { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + private File temporaryFolder; private ArchiverManager archiverManager; @@ -90,17 +93,19 @@ public static void setupInterpolators(AssemblerConfigurationSource configSource, .thenReturn(AbstractAssemblyMojo.mainProjectInterpolator(mavenProject)); } - @Before + @BeforeEach public void setup() throws PlexusContainerException { this.archiverManager = mock(ArchiverManager.class); this.container = new DefaultPlexusContainer(); this.configurator = new BasicComponentConfigurator(); } - @Test(expected = InvalidAssemblerConfigurationException.class) + @Test public void failWhenAssemblyIdIsNull() throws Exception { - final DefaultAssemblyArchiver archiver = createSubject(Collections.emptyList()); - archiver.createArchive(new Assembly(), "full-name", "zip", null, null); + assertThrows(InvalidAssemblerConfigurationException.class, () -> { + final DefaultAssemblyArchiver archiver = createSubject(Collections.emptyList()); + archiver.createArchive(new Assembly(), "full-name", "zip", null, null); + }); } @Test @@ -111,10 +116,10 @@ public void testCreateArchive() throws Exception { final AssemblyArchiverPhase phase = mock(AssemblyArchiverPhase.class); - final File outDir = temporaryFolder.newFolder("out"); + final File outDir = newFolder(temporaryFolder, "out"); final AssemblerConfigurationSource configSource = mock(AssemblerConfigurationSource.class); - when(configSource.getTemporaryRootDirectory()).thenReturn(new File(temporaryFolder.getRoot(), "temp")); + when(configSource.getTemporaryRootDirectory()).thenReturn(new File(temporaryFolder, "temp")); when(configSource.getOverrideUid()).thenReturn(0); when(configSource.getOverrideUserName()).thenReturn("root"); when(configSource.getOverrideGid()).thenReturn(0); @@ -397,4 +402,13 @@ public String getDuplicateBehavior() { return Archiver.DUPLICATES_ADD; } } + + private static File newFolder(File root, String... subDirs) throws IOException { + String subFolder = String.join("/", subDirs); + File result = new File(root, subFolder); + if (!result.mkdirs()) { + throw new IOException("Couldn't create folders " + root); + } + return result; + } } diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizerTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizerTest.java index 7ac378a05..09826c0a7 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizerTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizerTest.java @@ -34,19 +34,21 @@ import org.apache.maven.model.Model; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.archiver.jar.JarArchiver; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.io.TempDir; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings(strictness = Strictness.WARN) +@ExtendWith(MockitoExtension.class) public class ManifestCreationFinalizerTest { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + private File temporaryFolder; @Test public void testShouldDoNothingWhenArchiveConfigIsNull() throws Exception { @@ -66,7 +68,7 @@ public void testShouldAddManifestWhenArchiverIsJarArchiver() throws Exception { MavenProject project = new MavenProject(new Model()); MavenArchiveConfiguration config = new MavenArchiveConfiguration(); - File tempDir = temporaryFolder.getRoot(); + File tempDir = temporaryFolder; Path manifestFile = tempDir.toPath().resolve("MANIFEST.MF"); @@ -78,7 +80,7 @@ public void testShouldAddManifestWhenArchiverIsJarArchiver() throws Exception { archiver.setArchiveFinalizers(Collections.singletonList(new ManifestCreationFinalizer(null, project, config))); - File file = temporaryFolder.newFile(); + File file = File.createTempFile("junit", null, temporaryFolder); archiver.setDestFile(file); @@ -112,7 +114,7 @@ public void testShouldAddManifestEntriesWhenArchiverIsJarArchiver() throws Excep archiver.setArchiveFinalizers(Collections.singletonList(new ManifestCreationFinalizer(null, project, config))); - File file = temporaryFolder.newFile(); + File file = File.createTempFile("junit", null, temporaryFolder); archiver.setDestFile(file); diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java index a89fec674..28b780a30 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java @@ -25,6 +25,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.concurrent.TimeUnit; import org.codehaus.plexus.archiver.Archiver; import org.codehaus.plexus.archiver.ArchiverException; @@ -35,30 +36,34 @@ import org.codehaus.plexus.components.io.fileselectors.FileInfo; import org.codehaus.plexus.components.io.fileselectors.FileSelector; import org.codehaus.plexus.components.io.functions.InputStreamTransformer; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.io.TempDir; import org.mockito.ArgumentCaptor; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings(strictness = Strictness.WARN) +@ExtendWith(MockitoExtension.class) public class AssemblyProxyArchiverTest { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + private File temporaryFolder; - @Test(timeout = 5000) + @Test + @Timeout(value = 5000, unit = TimeUnit.MILLISECONDS) public void addFileSetSkipWhenSourceIsAssemblyWorkDir() throws IOException, ArchiverException { - final File sources = temporaryFolder.getRoot(); + final File sources = temporaryFolder; final File workdir = new File(sources, "workdir"); @@ -75,9 +80,10 @@ public void addFileSetSkipWhenSourceIsAssemblyWorkDir() throws IOException, Arch assertTrue(tracker.added.isEmpty()); } - @Test(timeout = 5000) + @Test + @Timeout(value = 5000, unit = TimeUnit.MILLISECONDS) public void addFileSetAddExcludeWhenSourceContainsAssemblyWorkDir() throws IOException, ArchiverException { - final File sources = temporaryFolder.getRoot(); + final File sources = temporaryFolder; final File workdir = new File(sources, "workdir"); workdir.mkdir(); @@ -121,7 +127,7 @@ public void addFileNoPermsCallAcceptFilesOnlyOnce() throws IOException, Archiver new AssemblyProxyArchiver("", delegate, null, selectors, null, new File(".")); archiver.setForced(true); - final File inputFile = temporaryFolder.newFile(); + final File inputFile = File.createTempFile("junit", null, temporaryFolder); archiver.addFile(inputFile, "file.txt"); assertEquals(1, counter.getCount()); @@ -134,7 +140,7 @@ public void addFileNoPermsCallAcceptFilesOnlyOnce() throws IOException, Archiver public void addDirectoryNoPermsCallAcceptFilesOnlyOnce() throws IOException, ArchiverException { final Archiver delegate = new JarArchiver(); - final File output = temporaryFolder.newFile(); + final File output = File.createTempFile("junit", null, temporaryFolder); delegate.setDestFile(output); @@ -147,7 +153,7 @@ public void addDirectoryNoPermsCallAcceptFilesOnlyOnce() throws IOException, Arc archiver.setForced(true); - final File dir = temporaryFolder.newFolder(); + final File dir = newFolder(temporaryFolder, "junit"); Files.write( dir.toPath().resolve("file.txt"), Collections.singletonList("This is a test."), StandardCharsets.UTF_8); @@ -164,10 +170,10 @@ public void assemblyWorkDir() { final List selectors = new ArrayList<>(); final AssemblyProxyArchiver archiver = new AssemblyProxyArchiver( - "prefix", delegate, null, selectors, null, new File(temporaryFolder.getRoot(), "module1")); + "prefix", delegate, null, selectors, null, new File(temporaryFolder, "module1")); FileSet fileSet = mock(FileSet.class); - when(fileSet.getDirectory()).thenReturn(temporaryFolder.getRoot()); + when(fileSet.getDirectory()).thenReturn(temporaryFolder); when(fileSet.getStreamTransformer()).thenReturn(mock(InputStreamTransformer.class)); archiver.addFileSet(fileSet); @@ -207,4 +213,13 @@ public boolean isSelected(final FileInfo fileInfo) throws IOException { return answer; } } + + private static File newFolder(File root, String... subDirs) throws IOException { + String subFolder = String.join("/", subDirs); + File result = new File(root, subFolder); + if (!result.mkdirs()) { + throw new IOException("Couldn't create folders " + root); + } + return result; + } } diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparatorTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparatorTest.java index 0925f15a7..55cfeac15 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparatorTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparatorTest.java @@ -28,9 +28,9 @@ import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; import org.apache.maven.plugins.assembly.model.Assembly; import org.codehaus.plexus.archiver.Archiver; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertSame; public class AssemblyArchiverPhaseComparatorTest { diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java index f6b50d1d0..93841a872 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java @@ -33,10 +33,12 @@ import org.apache.maven.plugins.assembly.model.DependencySet; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuilder; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.ArgumentMatchers.eq; @@ -45,13 +47,14 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings(strictness = Strictness.WARN) +@ExtendWith(MockitoExtension.class) public class DependencySetAssemblyPhaseTest { private DependencySetAssemblyPhase phase; private DependencyResolver dependencyResolver; - @Before + @BeforeEach public void setUp() { this.dependencyResolver = mock(DependencyResolver.class); diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java index cfaa9f096..17b6af513 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java @@ -19,6 +19,7 @@ package org.apache.maven.plugins.assembly.archive.phase; import java.io.File; +import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.util.Collections; @@ -32,11 +33,12 @@ import org.codehaus.plexus.archiver.Archiver; import org.codehaus.plexus.components.io.resources.PlexusIoResource; import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.io.TempDir; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,18 +48,19 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings(strictness = Strictness.WARN) +@ExtendWith(MockitoExtension.class) public class FileItemAssemblyPhaseTest { private final Logger logger = LoggerFactory.getLogger(getClass()); - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + private File temporaryFolder; @Test public void testExecuteShouldAddNothingWhenNoFileItemsArePresent() throws Exception { final AssemblerConfigurationSource macCS = mock(AssemblerConfigurationSource.class); - final File basedir = temporaryFolder.getRoot(); + final File basedir = temporaryFolder; when(macCS.getBasedir()).thenReturn(basedir); @@ -73,9 +76,9 @@ public void testExecuteShouldAddNothingWhenNoFileItemsArePresent() throws Except public void testExecuteShouldAddAbsoluteFileNoFilterNoLineEndingConversion() throws Exception { final AssemblerConfigurationSource macCS = mock(AssemblerConfigurationSource.class); - final File basedir = temporaryFolder.getRoot(); + final File basedir = temporaryFolder; - final File file = temporaryFolder.newFile("file.txt"); + final File file = newFile(temporaryFolder, "file.txt"); Files.write(file.toPath(), Collections.singletonList("This is a test file."), StandardCharsets.UTF_8); when(macCS.getBasedir()).thenReturn(basedir); @@ -107,9 +110,9 @@ public void testExecuteShouldAddAbsoluteFileNoFilterNoLineEndingConversion() thr public void testExecuteShouldAddRelativeFileNoFilterNoLineEndingConversion() throws Exception { final AssemblerConfigurationSource macCS = mock(AssemblerConfigurationSource.class); - final File basedir = temporaryFolder.getRoot(); + final File basedir = temporaryFolder; - final File file = temporaryFolder.newFile("file.txt"); + final File file = newFile(temporaryFolder, "file.txt"); Files.write(file.toPath(), Collections.singletonList("This is a test file."), StandardCharsets.UTF_8); when(macCS.getBasedir()).thenReturn(basedir); @@ -141,21 +144,21 @@ public void testExecuteShouldAddRelativeFileNoFilterNoLineEndingConversion() thr public void testExecuteWithOutputDirectory() throws Exception { final AssemblerConfigurationSource macCS = mock(AssemblerConfigurationSource.class); - final File basedir = temporaryFolder.getRoot(); + final File basedir = temporaryFolder; - final File readmeFile = temporaryFolder.newFile("README.txt"); + final File readmeFile = newFile(temporaryFolder, "README.txt"); Files.write( readmeFile.toPath(), Collections.singletonList("This is a test file for README.txt."), StandardCharsets.UTF_8); - final File licenseFile = temporaryFolder.newFile("LICENSE.txt"); + final File licenseFile = newFile(temporaryFolder, "LICENSE.txt"); Files.write( licenseFile.toPath(), Collections.singletonList("This is a test file for LICENSE.txt."), StandardCharsets.UTF_8); - final File configFile = new File(temporaryFolder.newFolder("config"), "config.txt"); + final File configFile = new File(newFolder(temporaryFolder, "config"), "config.txt"); Files.write( configFile.toPath(), Collections.singletonList("This is a test file for config/config.txt"), @@ -220,21 +223,21 @@ public void testExecuteWithOutputDirectory() throws Exception { public void testExecuteWithOutputDirectoryAndDestName() throws Exception { final AssemblerConfigurationSource macCS = mock(AssemblerConfigurationSource.class); - final File basedir = temporaryFolder.getRoot(); + final File basedir = temporaryFolder; - final File readmeFile = temporaryFolder.newFile("README.txt"); + final File readmeFile = newFile(temporaryFolder, "README.txt"); Files.write( readmeFile.toPath(), Collections.singletonList("This is a test file for README.txt."), StandardCharsets.UTF_8); - final File licenseFile = temporaryFolder.newFile("LICENSE.txt"); + final File licenseFile = newFile(temporaryFolder, "LICENSE.txt"); Files.write( licenseFile.toPath(), Collections.singletonList("This is a test file for LICENSE.txt."), StandardCharsets.UTF_8); - final File configFile = new File(temporaryFolder.newFolder("config"), "config.txt"); + final File configFile = new File(newFolder(temporaryFolder, "config"), "config.txt"); Files.write( configFile.toPath(), Collections.singletonList("This is a test file for config/config.txt"), @@ -302,21 +305,21 @@ public void testExecuteWithOutputDirectoryAndDestName() throws Exception { public void testExecuteWithOutputDirectoryAndDestNameAndIncludeBaseDirectoryFalse() throws Exception { final AssemblerConfigurationSource macCS = mock(AssemblerConfigurationSource.class); - final File basedir = temporaryFolder.getRoot(); + final File basedir = temporaryFolder; - final File readmeFile = temporaryFolder.newFile("README.txt"); + final File readmeFile = newFile(temporaryFolder, "README.txt"); Files.write( readmeFile.toPath(), Collections.singletonList("This is a test file for README.txt."), StandardCharsets.UTF_8); - final File licenseFile = temporaryFolder.newFile("LICENSE.txt"); + final File licenseFile = newFile(temporaryFolder, "LICENSE.txt"); Files.write( licenseFile.toPath(), Collections.singletonList("This is a test file for LICENSE.txt."), StandardCharsets.UTF_8); - final File configFile = new File(temporaryFolder.newFolder("config"), "config.txt"); + final File configFile = new File(newFolder(temporaryFolder, "config"), "config.txt"); Files.write( configFile.toPath(), Collections.singletonList("This is a test file for config/config.txt"), @@ -383,4 +386,19 @@ private void prepareInterpolators(AssemblerConfigurationSource configSource) { when(configSource.getEnvInterpolator()).thenReturn(FixedStringSearchInterpolator.empty()); when(configSource.getMainProjectInterpolator()).thenReturn(FixedStringSearchInterpolator.empty()); } + + private static File newFile(File parent, String child) throws IOException { + File result = new File(parent, child); + result.createNewFile(); + return result; + } + + private static File newFolder(File root, String... subDirs) throws IOException { + String subFolder = String.join("/", subDirs); + File result = new File(root, subFolder); + if (!result.mkdirs()) { + throw new IOException("Couldn't create folders " + root); + } + return result; + } } diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java index dff759288..72852a65e 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java @@ -25,21 +25,24 @@ import org.apache.maven.plugins.assembly.model.FileSet; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.archiver.Archiver; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings(strictness = Strictness.WARN) +@ExtendWith(MockitoExtension.class) public class FileSetAssemblyPhaseTest { private FileSetAssemblyPhase phase; - @Before + @BeforeEach public void setUp() { this.phase = new FileSetAssemblyPhase(); } diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java index 010879524..a702b0e35 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java @@ -42,20 +42,21 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuilder; import org.codehaus.plexus.archiver.Archiver; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.io.TempDir; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static java.util.Collections.singleton; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.ArgumentMatchers.eq; @@ -67,18 +68,19 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings(strictness = Strictness.WARN) +@ExtendWith(MockitoExtension.class) public class ModuleSetAssemblyPhaseTest { private final Logger logger = LoggerFactory.getLogger(getClass()); - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + private File temporaryFolder; private ModuleSetAssemblyPhase phase; private DependencyResolver dependencyResolver; - @Before + @BeforeEach public void setUp() { ProjectBuilder projectBuilder = mock(ProjectBuilder.class); this.dependencyResolver = mock(DependencyResolver.class); @@ -141,7 +143,7 @@ public void testCreateFileSetShouldUseModuleDirOnlyWhenOutDirIsNull() throws Exc final ModuleSources sources = new ModuleSources(); sources.setIncludeModuleDirectory(true); - final File basedir = temporaryFolder.getRoot(); + final File basedir = temporaryFolder; final MavenProject artifactProject = new MavenProject(new Model()); artifactProject.setGroupId("GROUPID"); @@ -184,7 +186,7 @@ public void testCreateFileSetShouldPrependModuleDirWhenOutDirIsProvided() throws final MavenProject artifactProject = new MavenProject(new Model()); artifactProject.setGroupId("GROUPID"); - final File basedir = temporaryFolder.getRoot(); + final File basedir = temporaryFolder; artifactProject.setFile(new File(basedir, "pom.xml")); @@ -221,7 +223,7 @@ public void testCreateFileSetShouldAddExcludesForSubModulesWhenExcludeSubModDirs final MavenProject project = new MavenProject(model); - final File basedir = temporaryFolder.getRoot(); + final File basedir = temporaryFolder; project.setGroupId("GROUPID"); project.setFile(new File(basedir, "pom.xml")); @@ -257,7 +259,7 @@ public void testExecuteShouldAddOneModuleSetWithOneModuleInIt() throws Exception final MavenProject module = createProject("group", "module", "version", project); Artifact artifact = mock(Artifact.class); - final File moduleArtifactFile = temporaryFolder.newFile(); + final File moduleArtifactFile = File.createTempFile("junit", null, temporaryFolder); when(artifact.getGroupId()).thenReturn("GROUPID"); when(artifact.getFile()).thenReturn(moduleArtifactFile); module.setArtifact(artifact); @@ -343,7 +345,7 @@ public void testAddModuleBinariesShouldAddOneModuleAttachmentArtifactAndNoDeps() Artifact artifact = mock(Artifact.class); when(artifact.getGroupId()).thenReturn("GROUPID"); when(artifact.getClassifier()).thenReturn("test"); - final File artifactFile = temporaryFolder.newFile(); + final File artifactFile = File.createTempFile("junit", null, temporaryFolder); when(artifact.getFile()).thenReturn(artifactFile); final Archiver archiver = mock(Archiver.class); @@ -421,7 +423,7 @@ public void testAddModuleBinariesShouldFailWhenOneModuleDoesntHaveAttachmentWith @Test public void testAddModuleBinariesShouldAddOneModuleArtifactAndNoDeps() throws Exception { Artifact artifact = mock(Artifact.class); - final File artifactFile = temporaryFolder.newFile(); + final File artifactFile = File.createTempFile("junit", null, temporaryFolder); when(artifact.getGroupId()).thenReturn("GROUPID"); when(artifact.getFile()).thenReturn(artifactFile); @@ -485,7 +487,7 @@ public void testAddModuleArtifactShouldThrowExceptionWhenArtifactFileIsNull() th public void testAddModuleArtifactShouldAddOneArtifact() throws Exception { Artifact artifact = mock(Artifact.class); when(artifact.getGroupId()).thenReturn("GROUPID"); - final File artifactFile = temporaryFolder.newFile(); + final File artifactFile = File.createTempFile("junit", null, temporaryFolder); when(artifact.getFile()).thenReturn(artifactFile); final MavenProject project = createProject("group", "artifact", "version", null); @@ -772,7 +774,7 @@ private MavenProject createProject( File pomFile; if (parentProject == null) { - final File basedir = temporaryFolder.getRoot(); + final File basedir = temporaryFolder; pomFile = new File(basedir, "pom.xml"); } else { final File parentBase = parentProject.getBasedir(); diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java index a35ff22df..7a362a666 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java @@ -32,13 +32,14 @@ import org.apache.maven.project.MavenProject; import org.codehaus.plexus.archiver.ArchivedFileSet; import org.codehaus.plexus.archiver.Archiver; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.io.TempDir; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,18 +50,19 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings(strictness = Strictness.WARN) +@ExtendWith(MockitoExtension.class) public class AddArtifactTaskTest { private final Logger logger = LoggerFactory.getLogger(getClass()); - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + private File temporaryFolder; private MavenProject mainProject; private AssemblerConfigurationSource configSource; - @Before + @BeforeEach public void setUp() throws IOException { Model model = new Model(); model.setGroupId("group"); @@ -73,7 +75,7 @@ public void setUp() throws IOException { when(configSource.getFinalName()).thenReturn("final-name"); } - @After + @AfterEach public void tearDown() { // result of easymock migration, should be assert of expected result instead of verifying methodcalls verify(configSource, atLeastOnce()).getFinalName(); @@ -86,7 +88,7 @@ public void testShouldAddArchiveFileWithoutUnpacking() throws Exception { Artifact artifact = mock(Artifact.class); when(artifact.getGroupId()).thenReturn("GROUPID"); - File artifactFile = temporaryFolder.newFile(); + File artifactFile = File.createTempFile("junit", null, temporaryFolder); when(artifact.getFile()).thenReturn(artifactFile); final Archiver archiver = mock(Archiver.class); @@ -122,7 +124,7 @@ public void testShouldAddArchiveFileWithDefaultOutputLocation() throws Exception when(artifact.getGroupId()).thenReturn("GROUPID"); when(artifactHandler.getExtension()).thenReturn(ext); when(artifact.getArtifactHandler()).thenReturn(artifactHandler); - File artifactFile = temporaryFolder.newFile(); + File artifactFile = File.createTempFile("junit", null, temporaryFolder); when(artifact.getFile()).thenReturn(artifactFile); final Archiver archiver = mock(Archiver.class); @@ -178,7 +180,7 @@ public void testShouldAddArchiveFileWithUnpack() throws Exception { DefaultAssemblyArchiverTest.setupInterpolators(configSource, mainProject); Artifact artifact = mock(Artifact.class); - when(artifact.getFile()).thenReturn(temporaryFolder.newFile()); + when(artifact.getFile()).thenReturn(File.createTempFile("junit", null, temporaryFolder)); AddArtifactTask task = createTask(artifact); task.setUnpack(true); @@ -207,7 +209,7 @@ public void testShouldAddArchiveFileWithUnpackAndModes() throws Exception { DefaultAssemblyArchiverTest.setupInterpolators(configSource, mainProject); Artifact artifact = mock(Artifact.class); - when(artifact.getFile()).thenReturn(temporaryFolder.newFile()); + when(artifact.getFile()).thenReturn(File.createTempFile("junit", null, temporaryFolder)); AddArtifactTask task = createTask(artifact); task.setUnpack(true); @@ -241,7 +243,7 @@ public void testShouldAddArchiveFileWithUnpackIncludesAndExcludes() throws Excep String[] excludes = {"**/README.txt"}; Artifact artifact = mock(Artifact.class); - when(artifact.getFile()).thenReturn(temporaryFolder.newFile()); + when(artifact.getFile()).thenReturn(File.createTempFile("junit", null, temporaryFolder)); DefaultAssemblyArchiverTest.setupInterpolators(configSource, mainProject); diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java index fd75678cc..eccd2d331 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java @@ -47,18 +47,19 @@ import org.codehaus.plexus.archiver.Archiver; import org.codehaus.plexus.archiver.ArchiverException; import org.codehaus.plexus.archiver.FileSet; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.io.TempDir; import org.mockito.ArgumentCaptor; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.atLeastOnce; @@ -67,10 +68,11 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings(strictness = Strictness.WARN) +@ExtendWith(MockitoExtension.class) public class AddDependencySetsTaskTest { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + private File temporaryFolder; @Test public void testAddDependencySetShouldInterpolateDefaultOutputFileNameMapping() throws Exception { @@ -110,7 +112,7 @@ public void testAddDependencySetShouldInterpolateDefaultOutputFileNameMapping() ArtifactHandler artifactHandler = mock(ArtifactHandler.class); when(artifactHandler.getExtension()).thenReturn(depExt); when(depArtifact.getArtifactHandler()).thenReturn(artifactHandler); - final File newFile = temporaryFolder.newFile(); + final File newFile = File.createTempFile("junit", null, temporaryFolder); when(depArtifact.getFile()).thenReturn(newFile); when(depArtifact.getGroupId()).thenReturn("GROUPID"); @@ -282,7 +284,7 @@ private void verifyOneDependencyAdded(final String outputLocation, final boolean when(configSource.getFinalName()).thenReturn("final-name"); Artifact artifact = mock(Artifact.class); - final File artifactFile = temporaryFolder.newFile(); + final File artifactFile = File.createTempFile("junit", null, temporaryFolder); when(artifact.getFile()).thenReturn(artifactFile); when(artifact.getGroupId()).thenReturn("GROUPID"); @@ -426,13 +428,13 @@ public void useDefaultExcludes() throws Exception { when(zipArtifact.getGroupId()).thenReturn("some-artifact"); when(zipArtifact.getArtifactId()).thenReturn("of-type-zip"); when(zipArtifact.getId()).thenReturn("some-artifact:of-type-zip:1.0:zip"); - when(zipArtifact.getFile()).thenReturn(temporaryFolder.newFile("of-type-zip.zip")); + when(zipArtifact.getFile()).thenReturn(newFile(temporaryFolder, "of-type-zip.zip")); Artifact dirArtifact = mock(Artifact.class); when(dirArtifact.getGroupId()).thenReturn("some-artifact"); when(dirArtifact.getArtifactId()).thenReturn("of-type-zip"); when(dirArtifact.getId()).thenReturn("some-artifact:of-type-zip:1.0:dir"); - when(dirArtifact.getFile()).thenReturn(temporaryFolder.newFolder("of-type-zip")); + when(dirArtifact.getFile()).thenReturn(newFolder(temporaryFolder, "of-type-zip")); final Set artifacts = new HashSet<>(Arrays.asList(zipArtifact, dirArtifact)); @@ -478,4 +480,19 @@ public void useDefaultExcludes() throws Exception { verify(archiver).addFileSet(fileSet.capture()); assertThat(fileSet.getValue().isUsingDefaultExcludes(), is(false)); } + + private static File newFile(File parent, String child) throws IOException { + File result = new File(parent, child); + result.createNewFile(); + return result; + } + + private static File newFolder(File root, String... subDirs) throws IOException { + String subFolder = String.join("/", subDirs); + File result = new File(root, subFolder); + if (!result.mkdirs()) { + throw new IOException("Couldn't create folders " + root); + } + return result; + } } diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTaskTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTaskTest.java index af0de22b4..aec61d38a 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTaskTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTaskTest.java @@ -23,26 +23,28 @@ import org.codehaus.plexus.archiver.Archiver; import org.codehaus.plexus.archiver.FileSet; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.io.TempDir; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings(strictness = Strictness.WARN) +@ExtendWith(MockitoExtension.class) public class AddDirectoryTaskTest { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + private File temporaryFolder; private Archiver archiver; - @Before + @BeforeEach public void setUp() { this.archiver = mock(Archiver.class); } @@ -55,7 +57,7 @@ public void testAddDirectoryShouldNotAddDirectoryIfNonExistent() throws Exceptio when(archiver.getOverrideDirectoryMode()).thenReturn(defaultDirMode); when(archiver.getOverrideFileMode()).thenReturn(defaultFileMode); - AddDirectoryTask task = new AddDirectoryTask(new File(temporaryFolder.getRoot(), "non-existent")); + AddDirectoryTask task = new AddDirectoryTask(new File(temporaryFolder, "non-existent")); task.execute(archiver); @@ -72,7 +74,7 @@ public void testAddDirectoryShouldAddDirectory() throws Exception { when(archiver.getOverrideDirectoryMode()).thenReturn(defaultDirMode); when(archiver.getOverrideFileMode()).thenReturn(defaultFileMode); - AddDirectoryTask task = new AddDirectoryTask(temporaryFolder.getRoot()); + AddDirectoryTask task = new AddDirectoryTask(temporaryFolder); task.setOutputDirectory("dir"); task.execute(archiver); @@ -93,7 +95,7 @@ public void testAddDirectoryShouldAddDirectoryWithDirMode() throws Exception { when(archiver.getOverrideDirectoryMode()).thenReturn(defaultDirMode); when(archiver.getOverrideFileMode()).thenReturn(defaultFileMode); - AddDirectoryTask task = new AddDirectoryTask(temporaryFolder.getRoot()); + AddDirectoryTask task = new AddDirectoryTask(temporaryFolder); task.setDirectoryMode(dirMode); task.setFileMode(fileMode); task.setOutputDirectory("dir"); @@ -115,7 +117,7 @@ public void testAddDirectoryShouldAddDirectoryWithIncludesAndExcludes() throws E when(archiver.getOverrideDirectoryMode()).thenReturn(-1); when(archiver.getOverrideFileMode()).thenReturn(-1); - AddDirectoryTask task = new AddDirectoryTask(temporaryFolder.getRoot()); + AddDirectoryTask task = new AddDirectoryTask(temporaryFolder); task.setIncludes(Collections.singletonList("**/*.txt")); task.setExcludes(Collections.singletonList("**/README.txt")); task.setOutputDirectory("dir"); diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java index 185b01fe4..92156bfac 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java @@ -19,6 +19,7 @@ package org.apache.maven.plugins.assembly.archive.task; import java.io.File; +import java.io.IOException; import java.util.ArrayList; import org.apache.maven.model.Model; @@ -28,14 +29,15 @@ import org.apache.maven.plugins.assembly.model.FileSet; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.archiver.Archiver; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.io.TempDir; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.any; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; @@ -43,14 +45,15 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings(strictness = Strictness.WARN) +@ExtendWith(MockitoExtension.class) public class AddFileSetsTaskTest { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + private File temporaryFolder; @Test public void testGetFileSetDirectoryShouldReturnAbsoluteSourceDir() throws Exception { - final File dir = temporaryFolder.newFolder(); + final File dir = newFolder(temporaryFolder, "junit"); final FileSet fs = new FileSet(); @@ -63,7 +66,7 @@ public void testGetFileSetDirectoryShouldReturnAbsoluteSourceDir() throws Except @Test public void testGetFileSetDirectoryShouldReturnBasedir() throws Exception { - final File dir = temporaryFolder.newFolder(); + final File dir = newFolder(temporaryFolder, "junit"); final FileSet fs = new FileSet(); @@ -74,7 +77,7 @@ public void testGetFileSetDirectoryShouldReturnBasedir() throws Exception { @Test public void testGetFileSetDirectoryShouldReturnDirFromBasedirAndSourceDir() throws Exception { - final File dir = temporaryFolder.newFolder(); + final File dir = newFolder(temporaryFolder, "junit"); final String srcPath = "source"; @@ -91,7 +94,7 @@ public void testGetFileSetDirectoryShouldReturnDirFromBasedirAndSourceDir() thro @Test public void testGetFileSetDirectoryShouldReturnDirFromArchiveBasedirAndSourceDir() throws Exception { - final File dir = temporaryFolder.newFolder(); + final File dir = newFolder(temporaryFolder, "junit"); final String srcPath = "source"; @@ -108,10 +111,10 @@ public void testGetFileSetDirectoryShouldReturnDirFromArchiveBasedirAndSourceDir @Test public void testAddFileSetShouldAddDirectory() throws Exception { - File basedir = temporaryFolder.getRoot(); + File basedir = temporaryFolder; final FileSet fs = new FileSet(); - fs.setDirectory(temporaryFolder.newFolder("dir").getName()); + fs.setDirectory(newFolder(temporaryFolder, "dir").getName()); fs.setOutputDirectory("dir2"); // the logger sends a debug message with this info inside the addFileSet(..) method.. @@ -148,7 +151,7 @@ public void testAddFileSetShouldAddDirectoryUsingSourceDirNameForDestDir() throw final String dirname = "dir"; fs.setDirectory(dirname); - final File archiveBaseDir = temporaryFolder.newFolder(); + final File archiveBaseDir = newFolder(temporaryFolder, "junit"); // ensure this exists, so the directory addition will proceed. final File srcDir = new File(archiveBaseDir, dirname); @@ -184,7 +187,7 @@ public void testAddFileSetShouldNotAddDirectoryWhenSourceDirNonExistent() throws final FileSet fs = new FileSet(); fs.setDirectory("dir"); - final File archiveBaseDir = temporaryFolder.newFolder(); + final File archiveBaseDir = newFolder(temporaryFolder, "junit"); final AssemblerConfigurationSource configSource = mock(AssemblerConfigurationSource.class); when(configSource.getFinalName()).thenReturn("finalName"); @@ -213,7 +216,7 @@ public void testAddFileSetShouldNotAddDirectoryWhenSourceDirNonExistent() throws @Test public void testExecuteShouldThrowExceptionIfArchiveBasedirProvidedIsNonExistent() throws Exception { - File archiveBaseDir = new File(temporaryFolder.getRoot(), "archive"); + File archiveBaseDir = new File(temporaryFolder, "archive"); final AssemblerConfigurationSource configSource = mock(AssemblerConfigurationSource.class); when(configSource.getArchiveBaseDirectory()).thenReturn(archiveBaseDir); @@ -233,7 +236,7 @@ public void testExecuteShouldThrowExceptionIfArchiveBasedirProvidedIsNonExistent @Test public void testExecuteShouldThrowExceptionIfArchiveBasedirProvidedIsNotADirectory() throws Exception { - File archiveBaseDir = temporaryFolder.newFile(); + File archiveBaseDir = File.createTempFile("junit", null, temporaryFolder); final AssemblerConfigurationSource configSource = mock(AssemblerConfigurationSource.class); when(configSource.getArchiveBaseDirectory()).thenReturn(archiveBaseDir); @@ -249,4 +252,13 @@ public void testExecuteShouldThrowExceptionIfArchiveBasedirProvidedIsNotADirecto verify(configSource).getArchiveBaseDirectory(); } + + private static File newFolder(File root, String... subDirs) throws IOException { + String subFolder = String.join("/", subDirs); + File result = new File(root, subFolder); + if (!result.mkdirs()) { + throw new IOException("Couldn't create folders " + root); + } + return result; + } } diff --git a/src/test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java b/src/test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java index 364dc7b8e..1d68808d4 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java @@ -42,21 +42,24 @@ import org.eclipse.aether.graph.Dependency; import org.eclipse.aether.resolution.DependencyRequest; import org.eclipse.aether.resolution.DependencyResult; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings(strictness = Strictness.WARN) +@ExtendWith(MockitoExtension.class) public class DefaultDependencyResolverTest { @Mock diff --git a/src/test/java/org/apache/maven/plugins/assembly/artifact/ResolutionManagementInfoTest.java b/src/test/java/org/apache/maven/plugins/assembly/artifact/ResolutionManagementInfoTest.java index de7ffe3d0..26e9c10a0 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/artifact/ResolutionManagementInfoTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/artifact/ResolutionManagementInfoTest.java @@ -26,9 +26,9 @@ import org.apache.maven.artifact.DefaultArtifact; import org.apache.maven.artifact.handler.DefaultArtifactHandler; import org.apache.maven.artifact.versioning.VersionRange; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ResolutionManagementInfoTest { diff --git a/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java b/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java index 2fb7c82a3..e25cc4333 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java @@ -52,24 +52,23 @@ import org.jdom2.input.sax.XMLReaders; import org.jdom2.xpath.XPathExpression; import org.jdom2.xpath.XPathFactory; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class ComponentsXmlArchiverFileFilterTest { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + private File temporaryFolder; private ComponentsXmlArchiverFileFilter filter; - @Before + @BeforeEach public void setUp() { filter = new ComponentsXmlArchiverFileFilter(); } @@ -250,11 +249,11 @@ public void testAddToArchiveShouldWriteTwoComponentToArchivedFile() throws Excep final ZipArchiver archiver = new ZipArchiver(); - final File archiveFile = temporaryFolder.newFile("archive"); + final File archiveFile = newFile(temporaryFolder, "archive"); archiver.setDestFile(archiveFile); - final File descriptorFile = new File(temporaryFolder.getRoot(), "descriptor.xml"); + final File descriptorFile = new File(temporaryFolder, "descriptor.xml"); archiver.setArchiveFinalizers(Collections.singletonList(filter)); @@ -551,4 +550,10 @@ public int getOverrideFileMode() { throw new UnsupportedOperationException("not supported"); } } + + private static File newFile(File parent, String child) throws IOException { + File result = new File(parent, child); + result.createNewFile(); + return result; + } } diff --git a/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java b/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java index c1d45971e..1cf71a7b4 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java @@ -39,13 +39,13 @@ import org.codehaus.plexus.archiver.resources.PlexusIoVirtualFileResource; import org.codehaus.plexus.components.io.functions.InputStreamTransformer; import org.codehaus.plexus.components.io.resources.PlexusIoResource; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.sameInstance; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/src/test/java/org/apache/maven/plugins/assembly/interpolation/AssemblyExpressionEvaluatorTest.java b/src/test/java/org/apache/maven/plugins/assembly/interpolation/AssemblyExpressionEvaluatorTest.java index 020bcd176..1af5ba82c 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/interpolation/AssemblyExpressionEvaluatorTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/interpolation/AssemblyExpressionEvaluatorTest.java @@ -28,16 +28,19 @@ import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator; import org.codehaus.plexus.interpolation.fixed.PropertiesBasedValueSource; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings(strictness = Strictness.WARN) +@ExtendWith(MockitoExtension.class) public class AssemblyExpressionEvaluatorTest { private final PojoConfigSource configSourceStub = new PojoConfigSource(); diff --git a/src/test/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolatorTest.java b/src/test/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolatorTest.java index a06d64d7d..26a6911ba 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolatorTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolatorTest.java @@ -36,15 +36,18 @@ import org.apache.maven.project.MavenProject; import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator; import org.codehaus.plexus.interpolation.fixed.PropertiesBasedValueSource; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings(strictness = Strictness.WARN) +@ExtendWith(MockitoExtension.class) public class AssemblyInterpolatorTest { @Test public void testDependencySetOutputFileNameMappingsAreNotInterpolated() diff --git a/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java b/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java index 0b898fe79..796a6f503 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java @@ -49,25 +49,27 @@ import org.apache.maven.project.MavenProject; import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator; import org.codehaus.plexus.interpolation.fixed.InterpolationState; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.io.TempDir; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings(strictness = Strictness.WARN) +@ExtendWith(MockitoExtension.class) public class DefaultAssemblyReaderTest { - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + private File temporaryFolder; @Mock private AssemblerConfigurationSource configSource; @@ -101,7 +103,7 @@ public void testIncludeSiteInAssemblyShouldFailIfSiteDirectoryNonExistent() thro @Test public void testIncludeSiteInAssemblyShouldAddSiteDirFileSetWhenDirExists() throws Exception { - final File siteDir = temporaryFolder.getRoot(); + final File siteDir = temporaryFolder; when(configSource.getSiteDirectory()).thenReturn(siteDir); @@ -270,7 +272,7 @@ public void testMergeComponentsWithMainAssemblyShouldAddOneFileSetToAssembly() t component.addFileSet(fileSet); - final File componentFile = temporaryFolder.newFile(); + final File componentFile = File.createTempFile("junit", null, temporaryFolder); try (Writer writer = new OutputStreamWriter(Files.newOutputStream(componentFile.toPath()), StandardCharsets.UTF_8)) { @@ -327,11 +329,11 @@ public void testReadAssemblyShouldReadAssemblyWithSiteDirInclusionFromAssemblyWi final StringReader sr = writeToStringReader(assembly); - final File siteDir = temporaryFolder.newFolder("site"); + final File siteDir = newFolder(temporaryFolder, "site"); when(configSource.getSiteDirectory()).thenReturn(siteDir); - final File basedir = temporaryFolder.getRoot(); + final File basedir = temporaryFolder; when(configSource.getBasedir()).thenReturn(basedir); @@ -360,7 +362,7 @@ public void testReadAssemblyShouldReadAssemblyWithSiteDirInclusionFromAssemblyWi @Test public void testReadAssemblyShouldReadAssemblyWithComponentWithoutSiteDirInclusionOrInterpolation() throws Exception { - final File componentsFile = temporaryFolder.newFile(); + final File componentsFile = File.createTempFile("junit", null, temporaryFolder); final File basedir = componentsFile.getParentFile(); final String componentsFilename = componentsFile.getName(); @@ -411,7 +413,7 @@ public void testReadAssemblyShouldReadAssemblyWithComponentWithoutSiteDirInclusi public void testReadAssemblyShouldReadAssemblyWithComponentInterpolationWithoutSiteDirInclusionOrAssemblyInterpolation() throws Exception { - final File componentsFile = temporaryFolder.newFile(); + final File componentsFile = File.createTempFile("junit", null, temporaryFolder); final File basedir = componentsFile.getParentFile(); final String componentsFilename = componentsFile.getName(); @@ -474,7 +476,7 @@ private Assembly doReadAssembly(Assembly assembly) throws IOException, AssemblyReadException, InvalidAssemblerConfigurationException { final StringReader sr = writeToStringReader(assembly); - final File basedir = temporaryFolder.getRoot(); + final File basedir = temporaryFolder; when(configSource.getBasedir()).thenReturn(basedir); @@ -502,7 +504,7 @@ public void testGetAssemblyFromDescriptorFileShouldReadAssembly() throws Excepti assembly.addFileSet(fs); - final File assemblyFile = temporaryFolder.newFile(); + final File assemblyFile = File.createTempFile("junit", null, temporaryFolder); final File basedir = assemblyFile.getParentFile(); @@ -524,7 +526,7 @@ public void testGetAssemblyFromDescriptorFileShouldReadAssembly() throws Excepti @Test public void testGetAssemblyForDescriptorReferenceShouldReadBinaryAssemblyRef() throws Exception { - final File basedir = temporaryFolder.getRoot(); + final File basedir = temporaryFolder; when(configSource.getBasedir()).thenReturn(basedir); @@ -547,7 +549,7 @@ public void testReadAssembliesShouldGetAssemblyDescriptorFromSingleFile() throws assembly.addFileSet(fs); - final File basedir = temporaryFolder.getRoot(); + final File basedir = temporaryFolder; final List files = writeAssembliesToFile(Collections.singletonList(assembly), basedir); @@ -565,7 +567,7 @@ public void testReadAssembliesShouldGetAssemblyDescriptorFromSingleFile() throws @Test public void testReadAssembliesShouldFailWhenSingleDescriptorFileMissing() throws Exception { - final File basedir = temporaryFolder.getRoot(); + final File basedir = temporaryFolder; try { performReadAssemblies(basedir, null, null, null, false); @@ -578,7 +580,7 @@ public void testReadAssembliesShouldFailWhenSingleDescriptorFileMissing() throws @Test public void testReadAssembliesShouldIgnoreMissingSingleDescriptorFileWhenIgnoreIsConfigured() throws Exception { - final File basedir = temporaryFolder.getRoot(); + final File basedir = temporaryFolder; try { performReadAssemblies(basedir, null, null, null, true); @@ -600,7 +602,7 @@ public void testReadAssembliesShouldGetAssemblyDescriptorFromFileArray() throws assemblies.add(assembly1); assemblies.add(assembly2); - final File basedir = temporaryFolder.getRoot(); + final File basedir = temporaryFolder; final List files = writeAssembliesToFile(assemblies, basedir); @@ -620,7 +622,7 @@ public void testReadAssembliesShouldGetAssemblyDescriptorFromFileArray() throws @Test public void testReadAssembliesShouldGetAssemblyDescriptorFromMultipleRefs() throws Exception { - final File basedir = temporaryFolder.getRoot(); + final File basedir = temporaryFolder; final List assemblies = performReadAssemblies(basedir, null, new String[] {"bin", "src"}, null); @@ -648,7 +650,7 @@ public void testReadAssembliesShouldGetAssemblyDescriptorFromDirectory() throws assemblies.add(assembly1); assemblies.add(assembly2); - final File basedir = temporaryFolder.getRoot(); + final File basedir = temporaryFolder; writeAssembliesToFile(assemblies, basedir); @@ -678,7 +680,7 @@ public void testReadAssembliesShouldGetTwoAssemblyDescriptorsFromDirectoryWithTh assemblies.add(assembly1); assemblies.add(assembly2); - final File basedir = temporaryFolder.getRoot(); + final File basedir = temporaryFolder; writeAssembliesToFile(assemblies, basedir); @@ -766,4 +768,13 @@ private List performReadAssemblies( return new DefaultAssemblyReader().readAssemblies(configSource); } + + private static File newFolder(File root, String... subDirs) throws IOException { + String subFolder = String.join("/", subDirs); + File result = new File(root, subFolder); + if (!result.mkdirs()) { + throw new IOException("Couldn't create folders " + root); + } + return result; + } } diff --git a/src/test/java/org/apache/maven/plugins/assembly/io/PrefixedClasspathLocatorStrategyTest.java b/src/test/java/org/apache/maven/plugins/assembly/io/PrefixedClasspathLocatorStrategyTest.java index 25844c78e..5fd1919d2 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/io/PrefixedClasspathLocatorStrategyTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/io/PrefixedClasspathLocatorStrategyTest.java @@ -18,10 +18,10 @@ */ package org.apache.maven.plugins.assembly.io; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @author Benjamin Bentmann diff --git a/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java b/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java index a4cc6c643..62255849b 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java @@ -32,18 +32,21 @@ import org.apache.maven.plugins.assembly.model.Assembly; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings(strictness = Strictness.WARN) +@ExtendWith(MockitoExtension.class) public class AssemblyFormatUtilsTest { @Test public void testFixRelativePathRefsShouldRemoveRelativeRefToCurrentDir() { diff --git a/src/test/java/org/apache/maven/plugins/assembly/utils/FilterUtilsTest.java b/src/test/java/org/apache/maven/plugins/assembly/utils/FilterUtilsTest.java index fe8f57099..1107cf775 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/utils/FilterUtilsTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/utils/FilterUtilsTest.java @@ -30,20 +30,23 @@ import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException; import org.apache.maven.project.MavenProject; import org.hamcrest.Matchers; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings(strictness = Strictness.WARN) +@ExtendWith(MockitoExtension.class) public class FilterUtilsTest { @Test diff --git a/src/test/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtilsTest.java b/src/test/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtilsTest.java index bada093e3..f21486d30 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtilsTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtilsTest.java @@ -28,10 +28,11 @@ import org.apache.commons.io.IOUtils; import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; public class LineEndingsUtilsTest { @@ -81,10 +82,9 @@ public void testGetLineEndingCharsShouldReturnNullLineEnding() throws AssemblyFo assertNull(LineEndingsUtils.getLineEndingCharacters("keep")); } - @Test(expected = AssemblyFormattingException.class) - public void testGetLineEndingCharsShouldThrowFormattingExceptionWithInvalidHint() - throws AssemblyFormattingException { - LineEndingsUtils.getLineEndingCharacters("invalid"); + @Test + public void testGetLineEndingCharsShouldThrowFormattingExceptionWithInvalidHint() { + assertThrows(AssemblyFormattingException.class, () -> LineEndingsUtils.getLineEndingCharacters("invalid")); } @Test diff --git a/src/test/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStreamTest.java b/src/test/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStreamTest.java index 3630a2a9e..849d287cc 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStreamTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStreamTest.java @@ -21,9 +21,9 @@ import java.io.ByteArrayInputStream; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class LinuxLineFeedInputStreamTest { diff --git a/src/test/java/org/apache/maven/plugins/assembly/utils/ProjectUtilsTest.java b/src/test/java/org/apache/maven/plugins/assembly/utils/ProjectUtilsTest.java index f74334e43..7633eea8a 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/utils/ProjectUtilsTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/utils/ProjectUtilsTest.java @@ -28,14 +28,14 @@ import org.apache.maven.model.Model; import org.apache.maven.project.MavenProject; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class ProjectUtilsTest { private final Logger logger = LoggerFactory.getLogger(getClass()); diff --git a/src/test/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtilsTest.java b/src/test/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtilsTest.java index f5792d1f4..342aab0c3 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtilsTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtilsTest.java @@ -22,14 +22,14 @@ import java.util.List; import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -89,9 +89,9 @@ private void checkFileModeSanity( final String mode, final boolean isSane, final List messagesToCheckIfInsane) { Logger logger = mock(Logger.class); assertEquals( - "Mode sanity should be: " + isSane, isSane, - TypeConversionUtils.verifyModeSanity(Integer.parseInt(mode, 8), logger)); + TypeConversionUtils.verifyModeSanity(Integer.parseInt(mode, 8), logger), + "Mode sanity should be: " + isSane); if (!isSane && messagesToCheckIfInsane != null && !messagesToCheckIfInsane.isEmpty()) { ArgumentCaptor warnings = ArgumentCaptor.forClass(String.class); @@ -100,7 +100,7 @@ private void checkFileModeSanity( final String message = warnings.getAllValues().toString(); for (final String checkMessage : messagesToCheckIfInsane) { - assertTrue("\'" + checkMessage + "\' is not present in output.", message.contains(checkMessage)); + assertTrue(message.contains(checkMessage), "\'" + checkMessage + "\' is not present in output."); } } } diff --git a/src/test/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStreamTest.java b/src/test/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStreamTest.java index 55ab114e7..da8b02131 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStreamTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStreamTest.java @@ -21,9 +21,9 @@ import java.io.ByteArrayInputStream; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class WindowsLineFeedInputStreamTest {