Author: jdcasey
Date: Wed Feb 20 14:06:14 2008
New Revision: 629632

URL: http://svn.apache.org/viewvc?rev=629632&view=rev
Log:
Adding resources and [commented out] new test method to apply scm inheritance 
checks to POMs read from a local repository...this is currently broken, as 
noted in MavenProject, line 291 or thereabouts, which is why the test is 
commented out.

Added:
    
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t12scm/maven/
    
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t12scm/maven/p0/
    
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/
    
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom
   (with props)
    
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t12scm/maven/p1/
    
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/
    
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom
   (with props)
Modified:
    
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
    
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java

Modified: 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java?rev=629632&r1=629631&r2=629632&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
 (original)
+++ 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
 Wed Feb 20 14:06:14 2008
@@ -59,6 +59,11 @@
         }
     }
 
+    protected MavenProjectBuilder getProjectBuilder()
+    {
+        return projectBuilder;
+    }
+
     // ----------------------------------------------------------------------
     // Local repository
     // ----------------------------------------------------------------------

Modified: 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java?rev=629632&r1=629631&r2=629632&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java
 (original)
+++ 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java
 Wed Feb 20 14:06:14 2008
@@ -95,6 +95,33 @@
 
         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().getDeveloperConnection(), 
"scm:svn:https://host/p0/modules/p1"; );
+        assertEquals( project1.getScm().getDeveloperConnection(),
+                      "scm:svn:https://host/p0/modules/p1"; );
     }
+
+//    public void 
testScmInfoCalculatedCorrectlyOnChildReadFromLocalRepository()
+//        throws Exception
+//    {
+//        File localRepo = getLocalRepositoryPath();
+//
+//        ArtifactFactory factory = (ArtifactFactory) lookup( 
ArtifactFactory.class );
+//        Artifact artifact = factory.createProjectArtifact( "maven", "p1", 
"1.0" );
+//
+//        ArtifactRepositoryFactory repoFactory = (ArtifactRepositoryFactory) 
lookup( ArtifactRepositoryFactory.class );
+//        ArtifactRepository localArtifactRepo = 
repoFactory.createLocalRepository( localRepo );
+//
+//        MavenProject project1 = getProjectBuilder().buildFromRepository( 
artifact, Collections.EMPTY_LIST, localArtifactRepo );
+//
+//        System.out.println( "\n\n" );
+//        System.out.println( "Child SCM URL is: " + 
project1.getScm().getUrl() );
+//        System.out.println( "Child SCM connection is: " + 
project1.getScm().getConnection() );
+//        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().getDeveloperConnection(),
+//                      "scm:svn:https://host/p0/modules/p1"; );
+//    }
+
 }

Added: 
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom?rev=629632&view=auto
==============================================================================
--- 
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom
 (added)
+++ 
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom
 Wed Feb 20 14:06:14 2008
@@ -0,0 +1,18 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>maven</groupId>
+  <artifactId>p0</artifactId>
+  <packaging>pom</packaging>
+  <version>1.0</version>
+  
+  <scm>
+    <connection>scm:svn:http://host/p0</connection>
+    <developerConnection>scm:svn:https://host/p0</developerConnection>
+    <url>http://host/viewer?path=/p0</url>
+  </scm>
+  
+  <modules>
+    <module>modules/p1</module>
+  </modules>
+
+</project>

Propchange: 
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: 
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom?rev=629632&view=auto
==============================================================================
--- 
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom
 (added)
+++ 
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom
 Wed Feb 20 14:06:14 2008
@@ -0,0 +1,11 @@
+<project>
+  <parent>
+    <artifactId>p0</artifactId>
+    <groupId>maven</groupId>
+    <version>1.0</version>
+    <relativePath>../../pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>p1</artifactId>
+  
+</project>

Propchange: 
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"


Reply via email to