Author: brianf Date: Tue Aug 5 17:30:49 2008 New Revision: 683063 URL: http://svn.apache.org/viewvc?rev=683063&view=rev Log: couple of test fixes
Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/MockProject.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestNoSnapshots.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseVersion.java Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/MockProject.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/MockProject.java?rev=683063&r1=683062&r2=683063&view=diff ============================================================================== --- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/MockProject.java (original) +++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/MockProject.java Tue Aug 5 17:30:49 2008 @@ -1490,7 +1490,13 @@ */ public Artifact getParentArtifact() { - return null; + if (parent !=null) + { + return parent.getArtifact(); + } + else + return null; + } /* Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestNoSnapshots.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestNoSnapshots.java?rev=683063&r1=683062&r2=683063&view=diff ============================================================================== --- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestNoSnapshots.java (original) +++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestNoSnapshots.java Tue Aug 5 17:30:49 2008 @@ -76,6 +76,8 @@ MockProject parent = new MockProject(); parent.setArtifact( factory.getSnapshotArtifact() ); project.setParent( parent ); + project.setArtifacts( null ); + project.setDependencyArtifacts( null ); helper = EnforcerTestUtils.getHelper(project); rule.setFailWhenParentIsSnapshot( true ); Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseVersion.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseVersion.java?rev=683063&r1=683062&r2=683063&view=diff ============================================================================== --- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseVersion.java (original) +++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseVersion.java Tue Aug 5 17:30:49 2008 @@ -58,6 +58,8 @@ project.setArtifact( factory.getSnapshotArtifact() ); TestEnforcerRuleUtils.execute( rule, helper, true ); + + project.setArtifact( factory.getReleaseArtifact() ); MockProject parent = new MockProject(); parent.setArtifact( factory.getSnapshotArtifact() );