You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2008/07/26 04:48:47 UTC

svn commit: r679949 - in /maven/core-integration-testing/branches/embedder/core-integration-tests: ./ src/test/java/org/apache/maven/integrationtests/

Author: jvanzyl
Date: Fri Jul 25 19:48:46 2008
New Revision: 679949

URL: http://svn.apache.org/viewvc?rev=679949&view=rev
Log: (empty)

Modified:
    maven/core-integration-testing/branches/embedder/core-integration-tests/pom.xml
    maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0018Test.java
    maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0118AttachedArtifactsInReactor.java
    maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2883LegacyRepoOfflineTest.java
    maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3099SettingsProfilesWithNoPOM.java
    maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3394POMPluginVersionDominanceTest.java
    maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3535SelfReferentialProperties.java
    maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.java
    maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3671PluginLevelDepInterpolationTest.java
    maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3679PluginExecIdInterpolationTest.java
    maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3680InvalidDependencyPOMTest.java

Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/pom.xml?rev=679949&r1=679948&r2=679949&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/pom.xml (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/pom.xml Fri Jul 25 19:48:46 2008
@@ -1,26 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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.
+  <!--
+    ~ 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.
   -->
-
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -34,7 +27,7 @@
     <connection>scm:svn:http://svn.apache.org/repos/asf/maven/core-integration-testing/trunk/core-integration-tests</connection>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk/core-integration-tests</developerConnection>
     <url>http://svn.apache.org/viewcvs.cgi/maven/core-integration-testing/trunk/core-integration-tests</url>
-  </scm>     
+  </scm>
   <build>
     <plugins>
       <plugin>
@@ -71,8 +64,24 @@
             <configuration>
               <skip>true</skip>
             </configuration>
-          </plugin>  
-        </plugins>  
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>test</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <includes>
+                <include>**/MavenIT0102Test.java</include>
+              </includes>
+            </configuration>
+          </plugin>
+        </plugins>
       </build>
     </profile>
   </profiles>
@@ -83,9 +92,9 @@
       <version>1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
-    	<groupId>org.codehaus.plexus</groupId>
-    	<artifactId>plexus-utils</artifactId>
-    	<version>1.5.4</version>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>1.5.4</version>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file

Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0018Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0018Test.java?rev=679949&r1=679948&r2=679949&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0018Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0018Test.java Fri Jul 25 19:48:46 2008
@@ -21,11 +21,9 @@
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
         verifier.deleteArtifact( "commons-logging", "commons-logging", "1.0.3", "jar" );
         verifier.executeGoal( "package" );
-// TODO: I would like to build some small core-it artifacts for this purpose instead
         verifier.assertArtifactPresent( "commons-logging", "commons-logging", "1.0.3", "jar" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
-
     }
 }
 

Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0118AttachedArtifactsInReactor.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0118AttachedArtifactsInReactor.java?rev=679949&r1=679948&r2=679949&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0118AttachedArtifactsInReactor.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0118AttachedArtifactsInReactor.java Fri Jul 25 19:48:46 2008
@@ -13,17 +13,11 @@
     public void testit0118()
         throws Exception
     {
-        File testDir =
-            ResourceExtractor.simpleExtractResources( getClass(), "/it0118-attachedartifactinreactor" );
-
-        Verifier verifier;
-
-        // Install the parent POM
-        verifier = new Verifier( testDir.getAbsolutePath() );
-        verifier.deleteArtifact( "org.apache.maven.its.it0118", "parent", "1.0", "pom" );                
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0118-attachedartifactinreactor" );
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        verifier.deleteArtifact( "org.apache.maven.its.it0118", "parent", "1.0", "pom" );
         verifier.deleteArtifact( "org.apache.maven.its.it0118", "one", "1.0", "jar" );
         verifier.deleteArtifact( "org.apache.maven.its.it0118", "two", "1.0", "pom" );
-        List cliOptions = new ArrayList();
         verifier.executeGoal( "package" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2883LegacyRepoOfflineTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2883LegacyRepoOfflineTest.java?rev=679949&r1=679948&r2=679949&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2883LegacyRepoOfflineTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2883LegacyRepoOfflineTest.java Fri Jul 25 19:48:46 2008
@@ -1,6 +1,8 @@
 package org.apache.maven.integrationtests;
 
 import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.it.DefaultInvocationRequest;
+import org.apache.maven.it.InvocationRequest;
 import org.apache.maven.it.VerificationException;
 import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.IOUtil;
@@ -70,15 +72,20 @@
 
         // the centerpiece of these tests!
         cliOptions.add( "-o" );
-        verifier.setAutoclean( false );
 
+        
         // clear out the parent POM if it's in the local repository.
         verifier.deleteArtifact( "org.apache.maven.its.mng2883", "parent", "1.0-SNAPSHOT", "pom" );
 
         try
         {
-            verifier.executeGoal( "initialize", cliOptions );
+            InvocationRequest r = new DefaultInvocationRequest()
+                .setGoals( "initialize" )
+                .setCliOptions( cliOptions )
+                .setAutoclean( false );
 
+            verifier.invoke( r );
+            
             fail( "Build should fail with unresolvable parent POM." );
         }
         catch ( VerificationException e )

Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3099SettingsProfilesWithNoPOM.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3099SettingsProfilesWithNoPOM.java?rev=679949&r1=679948&r2=679949&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3099SettingsProfilesWithNoPOM.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3099SettingsProfilesWithNoPOM.java Fri Jul 25 19:48:46 2008
@@ -1,6 +1,8 @@
 package org.apache.maven.integrationtests;
 
 import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.it.DefaultInvocationRequest;
+import org.apache.maven.it.InvocationRequest;
 import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
@@ -10,17 +12,14 @@
 import java.util.List;
 
 /**
- * This is a sample integration test. The IT tests typically
- * operate by having a sample project in the
- * /src/test/resources folder along with a junit test like
- * this one. The junit test uses the verifier (which uses
- * the invoker) to invoke a new instance of Maven on the
- * project in the resources folder. It then checks the
- * results. This is a non-trivial example that shows two
+ * This is a sample integration test. The IT tests typically operate by having a sample project in
+ * the /src/test/resources folder along with a junit test like this one. The junit test uses the
+ * verifier (which uses the invoker) to invoke a new instance of Maven on the project in the
+ * resources folder. It then checks the results. This is a non-trivial example that shows two
  * phases. See more information inline in the code.
- *
+ * 
  * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
- *
+ * 
  */
 public class MavenITmng3099SettingsProfilesWithNoPOM
     extends AbstractMavenIntegrationTestCase
@@ -31,7 +30,7 @@
         super( "(2.0.8,)" ); // 2.0.9+
     }
 
-    public void testitMNG3099 ()
+    public void testitMNG3099()
         throws Exception
     {
         // The testdir is computed from the location of this
@@ -61,9 +60,12 @@
         cliOptions.add( "-s" );
         cliOptions.add( "\"" + new File( testDir, "settings.xml" ).getAbsolutePath() + "\"" );
 
-        verifier.setAutoclean( false );
-        verifier.executeGoal( "org.apache.maven.its.mng3099:maven-mng3099-plugin:1:profile-props", cliOptions );
+        InvocationRequest r = new DefaultInvocationRequest()
+            .setGoals( "org.apache.maven.its.mng3099:maven-mng3099-plugin:1:profile-props" )
+            .setCliOptions( cliOptions )
+            .setAutoclean( false );
 
+        verifier.invoke( r );
 
         List lines = verifier.loadFile( new File( testDir, "log.txt" ), false );
         boolean found = false;

Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3394POMPluginVersionDominanceTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3394POMPluginVersionDominanceTest.java?rev=679949&r1=679948&r2=679949&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3394POMPluginVersionDominanceTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3394POMPluginVersionDominanceTest.java Fri Jul 25 19:48:46 2008
@@ -1,6 +1,8 @@
 package org.apache.maven.integrationtests;
 
 import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.it.DefaultInvocationRequest;
+import org.apache.maven.it.InvocationRequest;
 import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
@@ -10,17 +12,16 @@
 import java.util.List;
 
 /**
- * Check that plugin versions in the POM obey the correct order
- * of precedence. Specifically, that mojos in the default lifecycle
- * bindings can find plugin versions in the pluginManagement section
- * when the build/plugins section is missing that plugin, and that
- * plugin versions in build/plugins override those in build/pluginManagement.
+ * Check that plugin versions in the POM obey the correct order of precedence. Specifically, that
+ * mojos in the default lifecycle bindings can find plugin versions in the pluginManagement section
+ * when the build/plugins section is missing that plugin, and that plugin versions in build/plugins
+ * override those in build/pluginManagement.
  */
 public class MavenITmng3394POMPluginVersionDominanceTest
     extends AbstractMavenIntegrationTestCase
 {
 
-	private static final String BASEDIR_PREFIX = "/mng-3394-pomPluginVersionDominance/";
+    private static final String BASEDIR_PREFIX = "/mng-3394-pomPluginVersionDominance/";
 
     public MavenITmng3394POMPluginVersionDominanceTest()
         throws InvalidVersionSpecificationException
@@ -28,7 +29,7 @@
         super( "(2.0.8,)" ); // only test in 2.0.9+
     }
 
-    public void testitMNG3394a ()
+    public void testitMNG3394a()
         throws Exception
     {
         //testShouldUsePluginVersionFromPluginMgmtForLifecycleMojoWhenNotInBuildPlugins 
@@ -73,7 +74,7 @@
         assertTrue( "No reference to maven-site-plugin, version 2.0-beta-5 found in build log.", foundSiteBeta5 );
     }
 
-    public void testitMNG3394b ()
+    public void testitMNG3394b()
         throws Exception
     {
         //testShouldPreferPluginVersionFromBuildPluginsOverThatInPluginMgmt
@@ -83,8 +84,11 @@
 
         verifier = new Verifier( testDir.getAbsolutePath() );
 
-        verifier.setAutoclean( false );
-        verifier.executeGoal( "clean" );
+        InvocationRequest r = new DefaultInvocationRequest()
+            .setGoals( "clean" )
+            .setAutoclean( false );
+
+        verifier.invoke( r );
 
         /*
          * This is the simplest way to check a build

Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3535SelfReferentialProperties.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3535SelfReferentialProperties.java?rev=679949&r1=679948&r2=679949&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3535SelfReferentialProperties.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3535SelfReferentialProperties.java Fri Jul 25 19:48:46 2008
@@ -1,6 +1,8 @@
 package org.apache.maven.integrationtests;
 
 import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.it.DefaultInvocationRequest;
+import org.apache.maven.it.InvocationRequest;
 import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
@@ -21,8 +23,13 @@
         Verifier verifier = new Verifier(testDir.getAbsolutePath());
         List opts = new ArrayList();
         opts.add( "-X" );
-        verifier.setAutoclean( false );
-        verifier.executeGoal("verify", opts );
+        
+        InvocationRequest r = new DefaultInvocationRequest()
+            .setGoals( "verify" )
+            .setCliOptions( opts )
+            .setAutoclean( false );
+        
+        verifier.invoke( r );        
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
     }

Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.java?rev=679949&r1=679948&r2=679949&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.java Fri Jul 25 19:48:46 2008
@@ -55,9 +55,8 @@
         
         List cliOptions = new ArrayList();
         cliOptions.add( "-DtestPort=" + port );
-        verifier.setCliOptions( cliOptions );
         
-        verifier.executeGoal( "validate" );
+        verifier.executeGoal( "validate", cliOptions );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
         
@@ -83,9 +82,8 @@
         cliOptions = new ArrayList();
         cliOptions.add( "-DtestPort=" + port );
         cliOptions.add( "-DtestProtocol=dav:http" );
-        verifier.setCliOptions( cliOptions );
         
-        verifier.executeGoal( "validate" );
+        verifier.executeGoal( "validate", cliOptions );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
         
@@ -99,9 +97,8 @@
         cliOptions.add( "-DtestPort=" + port );
         cliOptions.add( "--settings" );
         cliOptions.add( "settings-no-config.xml" );
-        verifier.setCliOptions( cliOptions );
         
-        verifier.executeGoal( "validate" );
+        verifier.executeGoal( "validate", cliOptions );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
         
@@ -115,9 +112,8 @@
         cliOptions.add( "-DtestPort=" + port );
         cliOptions.add( "--settings" );
         cliOptions.add( "settings.xml" );
-        verifier.setCliOptions( cliOptions );
         
-        verifier.executeGoal( "validate" );
+        verifier.executeGoal( "validate", cliOptions );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
         

Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3671PluginLevelDepInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3671PluginLevelDepInterpolationTest.java?rev=679949&r1=679948&r2=679949&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3671PluginLevelDepInterpolationTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3671PluginLevelDepInterpolationTest.java Fri Jul 25 19:48:46 2008
@@ -54,9 +54,7 @@
         // The testdir is computed from the location of this
         // file.
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3671-pluginLevelDepInterpolation" );
-
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-
         verifier.executeGoal( "compile" );
 
         /*

Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3679PluginExecIdInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3679PluginExecIdInterpolationTest.java?rev=679949&r1=679948&r2=679949&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3679PluginExecIdInterpolationTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3679PluginExecIdInterpolationTest.java Fri Jul 25 19:48:46 2008
@@ -18,14 +18,10 @@
         throws Exception
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3679-pluginExecIdInterpolation" );
-
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-
         verifier.executeGoal( "validate" );
-
         verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-        
+        verifier.resetStreams();       
         assertTrue( new File( testDir, "target/check.txt" ).exists() );
     }
 }

Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3680InvalidDependencyPOMTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3680InvalidDependencyPOMTest.java?rev=679949&r1=679948&r2=679949&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3680InvalidDependencyPOMTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3680InvalidDependencyPOMTest.java Fri Jul 25 19:48:46 2008
@@ -25,9 +25,7 @@
         throws Exception
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3680-invalidDependencyPOM" );
-
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-
         verifier.executeGoal( "compile" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();