Author: bentmann
Date: Sun Jun 28 18:05:54 2009
New Revision: 789132
URL: http://svn.apache.org/viewvc?rev=789132&view=rev
Log:
o Decoupled test from details of the Maven core (the interaction between
interpolation and plugin configuration is not Surefire's concern, the core IT
for MNG-3530 covers this)
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/pom.xml
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/pom.xml?rev=789132&r1=789131&r2=789132&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/pom.xml
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/pom.xml
Sun Jun 28 18:05:54 2009
@@ -66,7 +66,6 @@
<buildDirectory>${project.build.directory}</buildDirectory>
<reservedPort1>${reservedPort1}</reservedPort1>
<reservedPort2>${reservedPort2}</reservedPort2>
- <reservedPort3>${reservedPort3}</reservedPort3>
<nullProperty></nullProperty>
<blankProperty> </blankProperty>
<!-- this is a work around for SUREFIRE-121 -->
@@ -89,7 +88,6 @@
</dependencies>
<properties>
- <reservedPort3>1</reservedPort3>
<setOnArgLineWorkAround>fool</setOnArgLineWorkAround>
</properties>
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java?rev=789132&r1=789131&r2=789132&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java
Sun Jun 28 18:05:54 2009
@@ -33,24 +33,18 @@
public void testSystemPropertyGenerateByOtherPlugin()
throws Exception
{
- int reservedPort1 = Integer.parseInt( System.getProperty(
"reservedPort1" ) );
- int reservedPort2 = Integer.parseInt( System.getProperty(
"reservedPort2" ) );
- int reservedPort3 = Integer.parseInt( System.getProperty(
"reservedPort3" ) );
+ int reservedPort1 = Integer.parseInt( System.getProperty(
"reservedPort1" ) );
+ int reservedPort2 = Integer.parseInt( System.getProperty(
"reservedPort2" ) );
System.out.println( "reservedPort1: " + reservedPort1 );
System.out.println( "reservedPort2: " + reservedPort2 );
- System.out.println( "reservedPort3: " + reservedPort3 );
assertTrue( reservedPort1 != reservedPort2 );
-
- //plugin cannot overwrite the default value set in the pom, this is
maven bug but fixed at 2.1-M1
- assertEquals( 1, reservedPort3 );
-
}
public void testEmptySystemProperties()
{
- assertNull( "Null property is not null", System.getProperty(
"nullProperty" ) );
- assertNull( "Blank property is not null", System.getProperty(
"blankProperty" ) );
+ assertNull( "Null property is not null", System.getProperty(
"nullProperty" ) );
+ assertNull( "Blank property is not null", System.getProperty(
"blankProperty" ) );
}
/**
