You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2021/05/27 19:31:34 UTC
[maven-enforcer] branch master updated: Clean up tests
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git
The following commit(s) were added to refs/heads/master by this push:
new 1534b59 Clean up tests
1534b59 is described below
commit 1534b59d12fa1de3d92f64227d75dda8dd77e35e
Author: rfscholte <rf...@apache.org>
AuthorDate: Thu May 27 21:31:21 2021 +0200
Clean up tests
---
.../maven/plugins/enforcer/EnforcerTestUtils.java | 2 -
.../plugins/enforcer/MockRuntimeInformation.java | 45 ----------------------
.../enforcer/ReactorModuleConvergenceTest.java | 1 -
.../enforcer/TestAbstractVersionEnforcer.java | 8 +++-
.../maven/plugins/enforcer/TestAlwaysFail.java | 8 ++--
.../maven/plugins/enforcer/TestAlwaysPass.java | 8 ++--
.../plugins/enforcer/TestBannedRepositories.java | 41 +++++++++++---------
.../enforcer/TestRequireEnvironmentVariable.java | 7 +++-
.../enforcer/TestRequireFilesDontExist.java | 29 ++++++++++----
.../plugins/enforcer/TestRequireFilesExist.java | 32 ++++++++++-----
.../plugins/enforcer/TestRequireFilesSize.java | 43 +++++++++++++--------
.../enforcer/TestRequirePluginVersions.java | 24 +++++++++++-
.../plugins/enforcer/TestRequireProperty.java | 7 +++-
.../enforcer/TestRequireReleaseVersion.java | 9 +++--
14 files changed, 145 insertions(+), 119 deletions(-)
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java
index 5a4f086..1f8637b 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java
@@ -49,8 +49,6 @@ import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.mockito.ArgumentMatchers;
-import org.mockito.Matchers;
import org.mockito.Mockito;
/**
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/MockRuntimeInformation.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/MockRuntimeInformation.java
deleted file mode 100644
index b62dec5..0000000
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/MockRuntimeInformation.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.apache.maven.plugins.enforcer;
-
-/*
- * 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.versioning.ArtifactVersion;
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
-import org.apache.maven.execution.RuntimeInformation;
-
-/**
- * Just a mock object hard coded to return version 2.0.5
- *
- * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
- */
-public class MockRuntimeInformation
- implements RuntimeInformation
-{
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.maven.execution.RuntimeInformation#getApplicationVersion()
- */
- public ArtifactVersion getApplicationVersion()
- {
- return new DefaultArtifactVersion( "2.0.5" );
- }
-
-}
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergenceTest.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergenceTest.java
index 06e3539..4b4d1cb 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergenceTest.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergenceTest.java
@@ -30,7 +30,6 @@ import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluatio
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java
index 0cbb827..7c19d1a 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java
@@ -19,7 +19,9 @@ package org.apache.maven.plugins.enforcer;
* under the License.
*/
-import junit.framework.TestCase;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
@@ -28,6 +30,7 @@ import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugin.logging.SystemStreamLog;
+import org.junit.Test;
/**
* The Class TestAbstractVersionEnforcer.
@@ -35,7 +38,6 @@ import org.apache.maven.plugin.logging.SystemStreamLog;
* @author <a href="mailto:brianf@apache.org">Brian Fox</a>
*/
public class TestAbstractVersionEnforcer
- extends TestCase
{
/**
@@ -43,6 +45,7 @@ public class TestAbstractVersionEnforcer
*
* @throws InvalidVersionSpecificationException the invalid version specification exception
*/
+ @Test
public void testContainsVersion()
throws InvalidVersionSpecificationException
{
@@ -119,6 +122,7 @@ public class TestAbstractVersionEnforcer
/**
* Test enforce version.
*/
+ @Test
public void testEnforceVersion()
{
RequireMavenVersion rule = new RequireMavenVersion();
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAlwaysFail.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAlwaysFail.java
index f024432..158c079 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAlwaysFail.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAlwaysFail.java
@@ -19,18 +19,20 @@ package org.apache.maven.plugins.enforcer;
* under the License.
*/
-import junit.framework.TestCase;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
+import org.junit.Test;
/**
* Test AlwaysFail rule.
* @author Ben Lidgey
* @see AlwaysFail
*/
-public class TestAlwaysFail extends TestCase
+public class TestAlwaysFail
{
-
+ @Test
public void testExecute()
{
final AlwaysFail rule = new AlwaysFail();
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAlwaysPass.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAlwaysPass.java
index a983873..93ef038 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAlwaysPass.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAlwaysPass.java
@@ -19,22 +19,20 @@ package org.apache.maven.plugins.enforcer;
* under the License.
*/
-import junit.framework.TestCase;
-
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
+import org.junit.Test;
/**
* Test AlwaysPass rule.
* @author Ben Lidgey
* @see AlwaysPass
*/
-public class TestAlwaysPass extends TestCase
+public class TestAlwaysPass
{
-
+ @Test
public void testExecute() throws EnforcerRuleException
{
AlwaysPass rule = new AlwaysPass();
rule.execute( EnforcerTestUtils.getHelper() );
}
-
}
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestBannedRepositories.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestBannedRepositories.java
index e27ee86..7dcca42 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestBannedRepositories.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestBannedRepositories.java
@@ -23,18 +23,19 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.DefaultArtifactRepository;
+import org.apache.maven.artifact.repository.MavenArtifactRepository;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
-import org.codehaus.plexus.PlexusTestCase;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.fail;
/**
* Test the "banned repositories" rule.
*
* @author <a href="mailto:wangyf2010@gmail.com">Simon Wang</a>
*/
public class TestBannedRepositories
- extends PlexusTestCase
{
private EnforcerRuleHelper helper;
@@ -42,11 +43,10 @@ public class TestBannedRepositories
private MockProject project;
+ @Before
public void setUp()
throws Exception
{
- super.setUp();
-
rule = new BannedRepositories();
rule.setMessage( "my message" );
@@ -57,11 +57,12 @@ public class TestBannedRepositories
helper = EnforcerTestUtils.getHelper( project );
}
+ @Test
public void testNoCheckRules()
throws EnforcerRuleException
{
- DefaultArtifactRepository repo1 = new DefaultArtifactRepository( "repo1", "http://repo1/", null );
- List<ArtifactRepository> repos = new ArrayList<ArtifactRepository>();
+ ArtifactRepository repo1 = new MavenArtifactRepository( "repo1", "http://repo1/", null, null, null );
+ List<ArtifactRepository> repos = new ArrayList<>();
repos.add( repo1 );
project.setRemoteArtifactRepositories( repos );
@@ -70,12 +71,13 @@ public class TestBannedRepositories
rule.execute( helper );
}
+ @Test
public void testBannedRepositories()
{
- DefaultArtifactRepository repo1 = new DefaultArtifactRepository( "repo1", "http://repo1/", null );
- DefaultArtifactRepository repo2 = new DefaultArtifactRepository( "repo1", "http://repo1/test", null );
- DefaultArtifactRepository repo3 = new DefaultArtifactRepository( "repo1", "http://repo2/test", null );
- List<ArtifactRepository> repos = new ArrayList<ArtifactRepository>();
+ ArtifactRepository repo1 = new MavenArtifactRepository( "repo1", "http://repo1/", null, null, null );
+ ArtifactRepository repo2 = new MavenArtifactRepository( "repo1", "http://repo1/test", null, null, null );
+ ArtifactRepository repo3 = new MavenArtifactRepository( "repo1", "http://repo2/test", null, null, null );
+ List<ArtifactRepository> repos = new ArrayList<>();
repos.add( repo1 );
repos.add( repo2 );
repos.add( repo3 );
@@ -101,13 +103,14 @@ public class TestBannedRepositories
}
+ @Test
public void testAllowedRepositoriesAllOK()
throws EnforcerRuleException
{
- DefaultArtifactRepository repo1 = new DefaultArtifactRepository( "repo1", "http://repo1/", null );
- DefaultArtifactRepository repo2 = new DefaultArtifactRepository( "repo1", "http://repo1/test", null );
+ ArtifactRepository repo1 = new MavenArtifactRepository( "repo1", "http://repo1/", null, null, null );
+ ArtifactRepository repo2 = new MavenArtifactRepository( "repo1", "http://repo1/test", null, null, null );
- List<ArtifactRepository> repos = new ArrayList<ArtifactRepository>();
+ List<ArtifactRepository> repos = new ArrayList<>();
repos.add( repo1 );
repos.add( repo2 );
@@ -125,12 +128,13 @@ public class TestBannedRepositories
rule.execute( helper );
}
+ @Test
public void testAllowedRepositoriesException()
{
- DefaultArtifactRepository repo1 = new DefaultArtifactRepository( "repo1", "http://repo1/", null );
- DefaultArtifactRepository repo2 = new DefaultArtifactRepository( "repo1", "http://repo1/test", null );
- DefaultArtifactRepository repo3 = new DefaultArtifactRepository( "repo1", "http://repo2/test", null );
- List<ArtifactRepository> repos = new ArrayList<ArtifactRepository>();
+ ArtifactRepository repo1 = new MavenArtifactRepository( "repo1", "http://repo1/", null, null, null );
+ ArtifactRepository repo2 = new MavenArtifactRepository( "repo1", "http://repo1/test", null, null, null );
+ ArtifactRepository repo3 = new MavenArtifactRepository( "repo1", "http://repo2/test", null, null, null );
+ List<ArtifactRepository> repos = new ArrayList<>();
repos.add( repo1 );
repos.add( repo2 );
repos.add( repo3 );
@@ -154,6 +158,5 @@ public class TestBannedRepositories
catch ( EnforcerRuleException e )
{
}
-
}
}
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireEnvironmentVariable.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireEnvironmentVariable.java
index 27ba381..1dc73a5 100755
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireEnvironmentVariable.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireEnvironmentVariable.java
@@ -19,9 +19,11 @@ package org.apache.maven.plugins.enforcer;
* under the License.
*/
-import junit.framework.TestCase;
+import static org.junit.Assert.fail;
+
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
+import org.junit.Test;
/**
* Unit test for {@link RequireEnvironmentVariable}}
@@ -29,7 +31,6 @@ import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
* @author <a href='mailto:marvin[at]marvinformatics[dot]com'>Marvin Froeder</a>
*/
public class TestRequireEnvironmentVariable
- extends TestCase
{
/**
@@ -37,6 +38,7 @@ public class TestRequireEnvironmentVariable
*
* @throws EnforcerRuleException the enforcer rule exception
*/
+ @Test
public void testRule()
throws EnforcerRuleException
{
@@ -75,6 +77,7 @@ public class TestRequireEnvironmentVariable
*
* @throws EnforcerRuleException the enforcer rule exception
*/
+ @Test
public void testRuleWithRegex()
throws EnforcerRuleException
{
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesDontExist.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesDontExist.java
index 684a6ad..55d06a2 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesDontExist.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesDontExist.java
@@ -19,12 +19,18 @@ package org.apache.maven.plugins.enforcer;
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
import java.io.File;
import java.io.IOException;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
-
-import junit.framework.TestCase;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
/**
* Test the "require files don't exist" rule.
@@ -32,15 +38,17 @@ import junit.framework.TestCase;
* @author <a href="brianf@apache.org">Brian Fox</a>
*/
public class TestRequireFilesDontExist
- extends TestCase
{
- RequireFilesDontExist rule = new RequireFilesDontExist();
+ @Rule
+ public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+ private RequireFilesDontExist rule = new RequireFilesDontExist();
+ @Test
public void testFileExists()
throws EnforcerRuleException, IOException
{
- File f = File.createTempFile( "enforcer", "tmp" );
- f.deleteOnExit();
+ File f = temporaryFolder.newFile();
rule.setFiles( new File[] { f } );
@@ -56,6 +64,7 @@ public class TestRequireFilesDontExist
f.delete();
}
+ @Test
public void testEmptyFile()
throws EnforcerRuleException, IOException
{
@@ -71,6 +80,7 @@ public class TestRequireFilesDontExist
}
}
+ @Test
public void testEmptyFileAllowNull()
throws EnforcerRuleException, IOException
{
@@ -86,6 +96,7 @@ public class TestRequireFilesDontExist
}
}
+ @Test
public void testEmptyFileList()
throws EnforcerRuleException, IOException
{
@@ -102,6 +113,7 @@ public class TestRequireFilesDontExist
}
}
+ @Test
public void testEmptyFileListAllowNull()
throws EnforcerRuleException, IOException
{
@@ -118,10 +130,11 @@ public class TestRequireFilesDontExist
}
}
+ @Test
public void testFileDoesNotExist()
throws EnforcerRuleException, IOException
{
- File f = File.createTempFile( "enforcer", "tmp" );
+ File f = temporaryFolder.newFile();
f.delete();
assertFalse( f.exists() );
@@ -134,9 +147,9 @@ public class TestRequireFilesDontExist
/**
* Test id.
*/
+ @Test
public void testId()
{
rule.getCacheId();
}
-
}
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesExist.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesExist.java
index efb7195..b254175 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesExist.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesExist.java
@@ -19,12 +19,18 @@ package org.apache.maven.plugins.enforcer;
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
import java.io.File;
import java.io.IOException;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
-
-import junit.framework.TestCase;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
/**
* Test the "require files exist" rule.
@@ -32,23 +38,24 @@ import junit.framework.TestCase;
* @author <a href="brett@apache.org">Brett Porter</a>
*/
public class TestRequireFilesExist
- extends TestCase
{
- RequireFilesExist rule = new RequireFilesExist();
+ @Rule
+ public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+ private RequireFilesExist rule = new RequireFilesExist();
+ @Test
public void testFileExists()
throws EnforcerRuleException, IOException
{
- File f = File.createTempFile( "enforcer", "tmp" );
- f.deleteOnExit();
+ File f = temporaryFolder.newFile();
rule.setFiles( new File[] { f } );
rule.execute( EnforcerTestUtils.getHelper() );
-
- f.delete();
}
+ @Test
public void testEmptyFile()
throws EnforcerRuleException, IOException
{
@@ -64,6 +71,7 @@ public class TestRequireFilesExist
}
}
+ @Test
public void testEmptyFileAllowNull()
throws EnforcerRuleException, IOException
{
@@ -72,6 +80,7 @@ public class TestRequireFilesExist
rule.execute( EnforcerTestUtils.getHelper() );
}
+ @Test
public void testEmptyFileList()
throws EnforcerRuleException, IOException
{
@@ -88,6 +97,7 @@ public class TestRequireFilesExist
}
}
+ @Test
public void testEmptyFileListAllowNull()
throws EnforcerRuleException, IOException
{
@@ -97,11 +107,13 @@ public class TestRequireFilesExist
rule.execute( EnforcerTestUtils.getHelper() );
}
+ @Test
public void testFileDoesNotExist()
throws EnforcerRuleException, IOException
{
- File f = File.createTempFile( "enforcer", "tmp" );
+ File f = temporaryFolder.newFile();
f.delete();
+
assertFalse( f.exists() );
rule.setFiles( new File[] { f } );
@@ -119,9 +131,9 @@ public class TestRequireFilesExist
/**
* Test id.
*/
+ @Test
public void testId()
{
rule.getCacheId();
}
-
}
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesSize.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesSize.java
index 23e1b95..8e7ac39 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesSize.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesSize.java
@@ -19,6 +19,13 @@ package org.apache.maven.plugins.enforcer;
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
@@ -27,8 +34,9 @@ import java.io.IOException;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.plugin.testing.ArtifactStubFactory;
-
-import junit.framework.TestCase;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
/**
* Test the "require files exist" rule.
@@ -36,23 +44,24 @@ import junit.framework.TestCase;
* @author <a href="brianf@apache.org">Brian Fox</a>
*/
public class TestRequireFilesSize
- extends TestCase
{
- RequireFilesSize rule = new RequireFilesSize();
+ @Rule
+ public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+ private RequireFilesSize rule = new RequireFilesSize();
+ @Test
public void testFileExists()
throws EnforcerRuleException, IOException
{
- File f = File.createTempFile( "enforcer", "tmp" );
- f.deleteOnExit();
+ File f = temporaryFolder.newFile();
rule.setFiles( new File[] { f } );
rule.execute( EnforcerTestUtils.getHelper() );
-
- f.delete();
}
+ @Test
public void testEmptyFile()
throws EnforcerRuleException, IOException
{
@@ -68,6 +77,7 @@ public class TestRequireFilesSize
}
}
+ @Test
public void testEmptyFileAllowNull()
throws EnforcerRuleException, IOException
{
@@ -76,6 +86,7 @@ public class TestRequireFilesSize
rule.execute( EnforcerTestUtils.getHelper() );
}
+ @Test
public void testEmptyFileList()
throws EnforcerRuleException, IOException
{
@@ -84,8 +95,8 @@ public class TestRequireFilesSize
assertEquals( 0, rule.getFiles().length );
MockProject project = new MockProject();
- File f = File.createTempFile( "enforcer", "tmp" );
- f.deleteOnExit();
+ File f = temporaryFolder.newFile();
+
ArtifactStubFactory factory = new ArtifactStubFactory();
Artifact a = factory.getReleaseArtifact();
a.setFile( f );
@@ -99,10 +110,11 @@ public class TestRequireFilesSize
}
+ @Test
public void testFileDoesNotExist()
throws EnforcerRuleException, IOException
{
- File f = File.createTempFile( "enforcer", "tmp" );
+ File f = temporaryFolder.newFile();
f.delete();
assertFalse( f.exists() );
rule.setFiles( new File[] { f } );
@@ -118,11 +130,11 @@ public class TestRequireFilesSize
}
}
+ @Test
public void testFileTooSmall()
throws EnforcerRuleException, IOException
{
- File f = File.createTempFile( "enforcer", "tmp" );
- f.deleteOnExit();
+ File f = temporaryFolder.newFile();
rule.setFiles( new File[] { f } );
rule.setMinsize( 10 );
try
@@ -136,11 +148,11 @@ public class TestRequireFilesSize
}
}
+ @Test
public void testFileTooBig()
throws IOException
{
- File f = File.createTempFile( "enforcer", "tmp" );
- f.deleteOnExit();
+ File f = temporaryFolder.newFile();
try ( BufferedWriter out = new BufferedWriter( new FileWriter( f ) ) )
{
out.write( "123456789101112131415" );
@@ -163,6 +175,7 @@ public class TestRequireFilesSize
/**
* Test id.
*/
+ @Test
public void testId()
{
rule.getCacheId();
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequirePluginVersions.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequirePluginVersions.java
index 48974cd..41f5494 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequirePluginVersions.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequirePluginVersions.java
@@ -19,6 +19,13 @@ package org.apache.maven.plugins.enforcer;
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@@ -28,8 +35,8 @@ import java.util.Set;
import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.apache.maven.plugins.enforcer.utils.PluginWrapper;
+import org.junit.Test;
/**
* The Class TestRequirePluginVersions.
@@ -37,12 +44,12 @@ import org.apache.maven.plugins.enforcer.utils.PluginWrapper;
* @author <a href="mailto:brianf@apache.org">Brian Fox</a>
*/
public class TestRequirePluginVersions
- extends AbstractMojoTestCase
{
/**
* Test has version specified.
*/
+ @Test
public void testHasVersionSpecified()
{
Plugin source = new Plugin();
@@ -123,6 +130,7 @@ public class TestRequirePluginVersions
/**
* Test has version specified with properties.
*/
+ @Test
public void testHasVersionSpecifiedWithProperties()
{
Plugin source = new Plugin();
@@ -188,6 +196,7 @@ public class TestRequirePluginVersions
*
* @throws MojoExecutionException the mojo execution exception
*/
+ @Test
public void testGetAdditionalPluginsNull()
throws MojoExecutionException
{
@@ -198,6 +207,7 @@ public class TestRequirePluginVersions
/**
* Test get additional plugins invalid format.
*/
+ @Test
public void testGetAdditionalPluginsInvalidFormat()
{
RequirePluginVersions rule = new RequirePluginVersions();
@@ -236,6 +246,7 @@ public class TestRequirePluginVersions
*
* @throws MojoExecutionException the mojo execution exception
*/
+ @Test
public void testGetAdditionalPluginsEmptySet()
throws MojoExecutionException
{
@@ -264,6 +275,7 @@ public class TestRequirePluginVersions
*
* @throws MojoExecutionException the mojo execution exception
*/
+ @Test
public void testGetAdditionalPlugins()
throws MojoExecutionException
{
@@ -293,6 +305,7 @@ public class TestRequirePluginVersions
*
* @throws MojoExecutionException the mojo execution exception
*/
+ @Test
public void testGetUncheckedPlugins()
throws MojoExecutionException
{
@@ -322,6 +335,7 @@ public class TestRequirePluginVersions
/**
* Test combining values from both lists
*/
+ @Test
public void testCombinePlugins()
{
RequirePluginVersions rule = new RequirePluginVersions();
@@ -346,6 +360,7 @@ public class TestRequirePluginVersions
/**
* Test combining with an empty list
*/
+ @Test
public void testCombinePlugins1()
{
RequirePluginVersions rule = new RequirePluginVersions();
@@ -364,6 +379,7 @@ public class TestRequirePluginVersions
/**
* Test combining with a null list
*/
+ @Test
public void testCombinePlugins2()
{
RequirePluginVersions rule = new RequirePluginVersions();
@@ -381,6 +397,7 @@ public class TestRequirePluginVersions
/**
* Test combining with an empty string
*/
+ @Test
public void testCombinePlugins3()
{
RequirePluginVersions rule = new RequirePluginVersions();
@@ -401,6 +418,7 @@ public class TestRequirePluginVersions
/**
* Test combining with a null string
*/
+ @Test
public void testCombinePlugins4()
{
RequirePluginVersions rule = new RequirePluginVersions();
@@ -421,6 +439,7 @@ public class TestRequirePluginVersions
/**
* Test combining with an invalid plugin string
*/
+ @Test
public void testCombinePlugins5()
{
RequirePluginVersions rule = new RequirePluginVersions();
@@ -473,6 +492,7 @@ public class TestRequirePluginVersions
/**
* Test id.
*/
+ @Test
public void testId()
{
RequirePluginVersions rule = new RequirePluginVersions();
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireProperty.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireProperty.java
index 2685277..30fd83b 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireProperty.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireProperty.java
@@ -19,10 +19,11 @@ package org.apache.maven.plugins.enforcer;
* under the License.
*/
-import junit.framework.TestCase;
+import static org.junit.Assert.fail;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
+import org.junit.Test;
/**
* The Class TestRequireProperty.
@@ -30,7 +31,6 @@ import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
* @author Paul Gier
*/
public class TestRequireProperty
- extends TestCase
{
/**
@@ -38,6 +38,7 @@ public class TestRequireProperty
*
* @throws EnforcerRuleException the enforcer rule exception
*/
+ @Test
public void testRule()
throws EnforcerRuleException
{
@@ -77,6 +78,7 @@ public class TestRequireProperty
*
* @throws EnforcerRuleException the enforcer rule exception
*/
+ @Test
public void testRuleWithRegex()
throws EnforcerRuleException
{
@@ -115,6 +117,7 @@ public class TestRequireProperty
/**
* Test id.
*/
+ @Test
public void testId()
{
RequireProperty rule = new RequireProperty();
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseVersion.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseVersion.java
index 286008e..426f9e4 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseVersion.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseVersion.java
@@ -19,14 +19,16 @@ package org.apache.maven.plugins.enforcer;
* under the License.
*/
-import java.io.IOException;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
-import junit.framework.TestCase;
+import java.io.IOException;
import org.apache.maven.enforcer.rule.api.EnforcerRule;
import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
import org.apache.maven.plugin.testing.ArtifactStubFactory;
import org.apache.maven.plugins.enforcer.utils.EnforcerRuleUtilsHelper;
+import org.junit.Test;
/**
* The Class TestRequireReleaseVersion.
@@ -34,7 +36,6 @@ import org.apache.maven.plugins.enforcer.utils.EnforcerRuleUtilsHelper;
* @author <a href="mailto:brianf@apache.org">Brian Fox</a>
*/
public class TestRequireReleaseVersion
- extends TestCase
{
/**
@@ -42,6 +43,7 @@ public class TestRequireReleaseVersion
*
* @throws IOException Signals that an I/O exception has occurred.
*/
+ @Test
public void testMojo()
throws IOException
{
@@ -77,6 +79,7 @@ public class TestRequireReleaseVersion
/**
* Test cache.
*/
+ @Test
public void testCache()
{
EnforcerRule rule = new RequireReleaseVersion();