You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2017/04/20 19:45:14 UTC
svn commit: r1792138 - in /maven/enforcer/trunk: ./ enforcer-rules/
enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/
enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/
Author: khmarbaise
Date: Thu Apr 20 19:45:13 2017
New Revision: 1792138
URL: http://svn.apache.org/viewvc?rev=1792138&view=rev
Log:
[MENFORCER-267]�Upgrade to make Maven 3+
o Improved/migrated the unit test to have a separate
test for each assert/condition.
o Currently a single test which is ignored by
@Ignore
Modified:
maven/enforcer/trunk/enforcer-rules/pom.xml
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireJavaVersion.java
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVersion.java
maven/enforcer/trunk/pom.xml
Modified: maven/enforcer/trunk/enforcer-rules/pom.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=1792138&r1=1792137&r2=1792138&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-rules/pom.xml Thu Apr 20 19:45:13 2017
@@ -54,7 +54,7 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<scope>test</scope>
@@ -100,6 +100,11 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireJavaVersion.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireJavaVersion.java?rev=1792138&r1=1792137&r2=1792138&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireJavaVersion.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireJavaVersion.java Thu Apr 20 19:45:13 2017
@@ -52,9 +52,9 @@ public class RequireJavaVersion
String javaVersion = SystemUtils.JAVA_VERSION;
Log log = helper.getLog();
- log.debug( "Detected Java String: " + javaVersion );
+ log.debug( "Detected Java String: '" + javaVersion + "'" );
javaVersion = normalizeJDKVersion( javaVersion );
- log.debug( "Normalized Java String: " + javaVersion );
+ log.debug( "Normalized Java String: '" + javaVersion + "'" );
ArtifactVersion detectedJdkVersion = new DefaultArtifactVersion( javaVersion );
Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVersion.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVersion.java?rev=1792138&r1=1792137&r2=1792138&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVersion.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVersion.java Thu Apr 20 19:45:13 2017
@@ -19,11 +19,13 @@ package org.apache.maven.plugins.enforce
* under the License.
*/
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.commons.lang3.SystemUtils;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
-
-import junit.framework.TestCase;
+import org.junit.Ignore;
+import org.junit.Test;
/**
* The Class TestRequireJavaVersion.
@@ -31,32 +33,34 @@ import junit.framework.TestCase;
* @author <a href="mailto:brianf@apache.org">Brian Fox</a>
*/
public class TestRequireJavaVersion
- extends TestCase
{
/**
* Test fix jdk version.
*/
+ @Test
public void testFixJDKVersion()
{
// test that we only take the first 3 versions for
- // comparision
- assertEquals( "1.5.0-11", RequireJavaVersion.normalizeJDKVersion( "1.5.0_11" ) );
- assertEquals( "1.5.1", RequireJavaVersion.normalizeJDKVersion( "1.5.1" ) );
- assertEquals( "1.5.2-1", RequireJavaVersion.normalizeJDKVersion( "1.5.2-1.b11" ) );
- assertEquals( "1.5.3-11", RequireJavaVersion.normalizeJDKVersion( "1.5.3_11" ) );
- assertEquals( "1.5.4-5", RequireJavaVersion.normalizeJDKVersion( "1.5.4.5_11" ) );
- assertEquals( "1.5.5-6", RequireJavaVersion.normalizeJDKVersion( "1.5.5.6_11.2" ) );
+ // comparison
+ assertThat( RequireJavaVersion.normalizeJDKVersion( "1.5.0_11" ) ).isEqualTo( "1.5.0-11" );
+ assertThat( RequireJavaVersion.normalizeJDKVersion( "1.5.1" ) ).isEqualTo( "1.5.1" );
+ assertThat( RequireJavaVersion.normalizeJDKVersion( "1.5.2-1.b11" ) ).isEqualTo( "1.5.2-1" );
+ assertThat( RequireJavaVersion.normalizeJDKVersion( "1.5.3_11" ) ).isEqualTo( "1.5.3-11" );
+ assertThat( RequireJavaVersion.normalizeJDKVersion( "1.5.4.5_11" ) ).isEqualTo( "1.5.4-5" );
+ assertThat( RequireJavaVersion.normalizeJDKVersion( "1.5.5.6_11.2" ) ).isEqualTo( "1.5.5-6" );
// test for non-standard versions
- assertEquals( "1.5.0-11", RequireJavaVersion.normalizeJDKVersion( "1-5-0-11" ) );
- assertEquals( "1.5.0-11", RequireJavaVersion.normalizeJDKVersion( "1-_5-_0-_11" ) );
- assertEquals( "1.5.0-11", RequireJavaVersion.normalizeJDKVersion( "1_5_0_11" ) );
- assertEquals( "1.5.0-7", RequireJavaVersion.normalizeJDKVersion( "1.5.0-07" ) );
- assertEquals( "1.5.0-7", RequireJavaVersion.normalizeJDKVersion( "1.5.0-b7" ) );
- assertEquals( "1.5.0-7", RequireJavaVersion.normalizeJDKVersion( "1.5.0-;7" ) );
- assertEquals( "1.6.0", RequireJavaVersion.normalizeJDKVersion( "1.6.0-dp" ) );
- assertEquals( "1.6.0-2", RequireJavaVersion.normalizeJDKVersion( "1.6.0-dp2" ) );
+ assertThat( RequireJavaVersion.normalizeJDKVersion( "1-5-0-11" ) ).isEqualTo( "1.5.0-11" );
+ assertThat( RequireJavaVersion.normalizeJDKVersion( "1-_5-_0-_11" ) ).isEqualTo( "1.5.0-11" );
+ assertThat( RequireJavaVersion.normalizeJDKVersion( "1_5_0_11" ) ).isEqualTo( "1.5.0-11" );
+ assertThat( RequireJavaVersion.normalizeJDKVersion( "1.5.0-07" ) ).isEqualTo( "1.5.0-7" );
+ assertThat( RequireJavaVersion.normalizeJDKVersion( "1.5.0-b7" ) ).isEqualTo( "1.5.0-7" );
+ assertThat( RequireJavaVersion.normalizeJDKVersion( "1.5.0-;7" ) ).isEqualTo( "1.5.0-7" );
+ assertThat( RequireJavaVersion.normalizeJDKVersion( "1.6.0-dp" ) ).isEqualTo( "1.6.0" );
+ assertThat( RequireJavaVersion.normalizeJDKVersion( "1.6.0-dp2" ) ).isEqualTo( "1.6.0-2" );
+ assertThat( RequireJavaVersion.normalizeJDKVersion( "1.8.0_73" ) ).isEqualTo( "1.8.0-73" );
+
}
/**
@@ -64,44 +68,58 @@ public class TestRequireJavaVersion
*
* @throws EnforcerRuleException the enforcer rule exception
*/
- public void testRule()
+ @Test
+ public void settingsTheJavaVersionAsNormalizedVersionShouldNotFail()
throws EnforcerRuleException
{
- String thisVersion = RequireJavaVersion.normalizeJDKVersion( SystemUtils.JAVA_VERSION);
+ String normalizedJDKVersion = RequireJavaVersion.normalizeJDKVersion( SystemUtils.JAVA_VERSION );
RequireJavaVersion rule = new RequireJavaVersion();
- rule.setVersion( thisVersion );
+ rule.setVersion( normalizedJDKVersion );
EnforcerRuleHelper helper = EnforcerTestUtils.getHelper();
// test the singular version
rule.execute( helper );
+ // intentionally no assertThat(...) because we don't expect and exception.
+ }
+ @Test( expected = EnforcerRuleException.class )
+ public void excludingTheCurrentJavaVersionViaRangeThisShouldFailWithException()
+ throws EnforcerRuleException
+ {
+ String thisVersion = RequireJavaVersion.normalizeJDKVersion( SystemUtils.JAVA_VERSION );
+
+ RequireJavaVersion rule = new RequireJavaVersion();
// exclude this version
rule.setVersion( "(" + thisVersion );
- try
- {
- rule.execute( helper );
- fail( "Expected an exception." );
- }
- catch ( EnforcerRuleException e )
- {
- // expected to catch this.
- }
+ EnforcerRuleHelper helper = EnforcerTestUtils.getHelper();
+ rule.execute( helper );
+ // intentionally no assertThat(...) because we expect and exception.
+ }
- // this shouldn't crash
+ @Test
+ @Ignore
+ // TODO: Think about the intention of this test? What should it prove?
+ public void thisShouldNotCrash()
+ throws EnforcerRuleException
+ {
+ RequireJavaVersion rule = new RequireJavaVersion();
rule.setVersion( SystemUtils.JAVA_VERSION );
- rule.execute( helper );
+ EnforcerRuleHelper helper = EnforcerTestUtils.getHelper();
+ rule.execute( helper );
+ // intentionally no assertThat(...) because we don't expect and exception.
}
/**
* Test id.
*/
+ @Test
public void testId()
{
RequireJavaVersion rule = new RequireJavaVersion();
- rule.getCacheId();
+ assertThat( rule.getCacheId() ).isEqualTo( "0" );
}
}
Modified: maven/enforcer/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=1792138&r1=1792137&r2=1792138&view=diff
==============================================================================
--- maven/enforcer/trunk/pom.xml (original)
+++ maven/enforcer/trunk/pom.xml Thu Apr 20 19:45:13 2017
@@ -18,8 +18,7 @@
~ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
->
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -108,7 +107,7 @@
<artifactId>maven-compat</artifactId>
<version>${maven.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-common-artifact-filters</artifactId>
@@ -151,6 +150,11 @@
<artifactId>maven-dependency-tree</artifactId>
<version>2.2</version>
</dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>1.7.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>