svn commit: r678197 - in /maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/test/java/org/apache/maven/project/inheritance: AbstractProjectInheritanceTestCase.java t12scm/ProjectInheritanceTest.java

[sisbell]

Author: sisbell
Date: Sat Jul 19 11:26:46 2008
New Revision: 678197

URL: http://svn.apache.org/viewvc?rev=678197&view=rev
Log:
maven-project unit tests passing.

Modified:
    
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
    
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java

Modified: 
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java?rev=678197&r1=678196&r2=678197&view=diff
==============================================================================
--- 
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
 (original)
+++ 
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
 Sat Jul 19 11:26:46 2008
@@ -53,6 +53,6 @@
 
     protected File getLocalRepositoryPath()
     {
-        return 
getTestFile("maven-project/src/test/resources/inheritance-repo/" + 
getTestSeries() );
+        return getTestFile("src/test/resources/inheritance-repo/" + 
getTestSeries() );
     }
 }

Modified: 
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java?rev=678197&r1=678196&r2=678197&view=diff
==============================================================================
--- 
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java
 (original)
+++ 
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java
 Sat Jul 19 11:26:46 2008
@@ -69,12 +69,12 @@
         System.out.println( "Child SCM developer connection is: "
                             + project1.getScm().getDeveloperConnection() );
 
-        assertEquals( project1.getScm().getUrl(), project0.getScm().getUrl() + 
"/modules/p1" );
+        assertEquals( project1.getScm().getUrl(), project0.getScm().getUrl() + 
"/p1" );
         assertEquals( project1.getScm().getConnection(), 
project0.getScm().getConnection()
-                                                         + "/modules/p1" );
+                                                         + "/p1" );
         assertEquals( project1.getScm().getDeveloperConnection(), 
project0.getScm()
                                                                           
.getDeveloperConnection()
-                                                                  + 
"/modules/p1" );
+                                                                  + "/p1" );
     }
 
     public void testScmInfoCalculatedCorrectlyOnChildOnlyRead()
@@ -93,10 +93,10 @@
         System.out.println( "Child SCM developer connection is: "
                             + project1.getScm().getDeveloperConnection() );
 
-        assertEquals( project1.getScm().getUrl(), 
"http://host/viewer?path=/p0/modules/p1"; );
-        assertEquals( project1.getScm().getConnection(), 
"scm:svn:http://host/p0/modules/p1"; );
+        assertEquals( project1.getScm().getUrl(), 
"http://host/viewer?path=/p0/p1"; );
+        assertEquals( project1.getScm().getConnection(), 
"scm:svn:http://host/p0/p1"; );
         assertEquals( project1.getScm().getDeveloperConnection(),
-                      "scm:svn:https://host/p0/modules/p1"; );
+                      "scm:svn:https://host/p0/p1"; );
     }
 
 //    public void 
testScmInfoCalculatedCorrectlyOnChildReadFromLocalRepository()