svn commit: r775488 - /maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java

[bentmann]

Author: bentmann
Date: Sat May 16 15:56:03 2009
New Revision: 775488

URL: http://svn.apache.org/viewvc?rev=775488&view=rev
Log:
o Re-enabled fixed tests

Modified:
    
maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java

Modified: 
maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java?rev=775488&r1=775487&r2=775488&view=diff
==============================================================================
--- 
maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
 (original)
+++ 
maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
 Sat May 16 15:56:03 2009
@@ -389,7 +389,6 @@
         artifacts.iterator().next();
     }
 
-    /**TODO - FIX
     public void testProjectReading_FromChildLevel_ScmInheritanceCalculations()
         throws Exception
     {
@@ -397,11 +396,11 @@
 
         MavenProject project = mavenEmbedder.readProject( pomFile );
         assertNotNull(project.getScm());
-        assertEquals( "http://host/viewer?path=/trunk/parent/child1";, 
project.getScm().getUrl() );
-        assertEquals( "scm:svn:http://host/trunk/parent/child1";, 
project.getScm().getConnection() );
-        assertEquals( "scm:svn:https://host/trunk/parent/child1";, 
project.getScm().getDeveloperConnection() );
+        assertEquals( "http://host/viewer?path=/trunk/parent/modules/child1";, 
project.getScm().getUrl() );
+        assertEquals( "scm:svn:http://host/trunk/parent/modules/child1";, 
project.getScm().getConnection() );
+        assertEquals( "scm:svn:https://host/trunk/parent/modules/child1";, 
project.getScm().getDeveloperConnection() );
     }
-*/
+
     public void testProjectReading_SkipMissingModuleSilently()
         throws Exception
     {
@@ -411,19 +410,18 @@
         mavenEmbedder.readProject( pomFile );
     }
 
-    /*
     public void testProjectReadingWithDistributionStatus()
         throws Exception
     {
         File pom = new File( basedir, 
"src/test/resources/pom-with-distribution-status.xml" );
         MavenExecutionRequest request = new 
DefaultMavenExecutionRequest().setShowErrors( true )
-            .setPomFile( pom.getAbsolutePath() );
+            .setPom( pom );
 
-        MavenProject project = maven.readProject( pom );
+        MavenProject project = mavenEmbedder.readProject( pom );
 
         assertEquals( "deployed", 
project.getDistributionManagement().getStatus() );
 
-        MavenExecutionResult result = maven.readProjectWithDependencies( 
request );
+        MavenExecutionResult result = 
mavenEmbedder.readProjectWithDependencies( request );
 
         assertNoExceptions( result );
 
@@ -431,7 +429,6 @@
 
         assertEquals( "deployed", 
result.getProject().getDistributionManagement().getStatus() );
     }
-    */
 
     // 
----------------------------------------------------------------------------
     // Model Writing