Attachment 218407 Details for Bug 384510 – Patch to m2e tests

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Patch to m2e tests

test_patch.txt (text/plain), 5.43 KB, created by Mike Youngstrom

on 2012-07-06 19:19:27 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mike Youngstrom

Created: 2012-07-06 19:19:27 EDT

Size: 5.43 KB

patch

obsolete

>ï»¿commit 93947a89fabbe79190882b44764bc821e982c34d
>Author: Mike Youngstrom <youngm@gmail.com> 2012-07-06 17:16:27
>Committer: Mike Youngstrom <youngm@gmail.com> 2012-07-06 17:16:27
>Parent: 1655f57a5bebecb1eda4684f2e5a23b04eca3300 (380096 fixed NPE during project clean in some cases)
>Branches: master
>
>Test to ensure we only rename the base project and not any of the sub
>projects.  384510
>org.eclipse.m2e.tests/projects/localprojectscanner/341038_projectsOutsideWorkspaceNotRenamed/384510_subNotRenamed/pom.xml
>diff --git a/org.eclipse.m2e.tests/projects/localprojectscanner/341038_projectsOutsideWorkspaceNotRenamed/384510_subNotRenamed/pom.xml b/org.eclipse.m2e.tests/projects/localprojectscanner/341038_projectsOutsideWorkspaceNotRenamed/384510_subNotRenamed/pom.xml
>new file mode 100644
>index 0000000..4476ca6
>--- /dev/null
>+++ b/org.eclipse.m2e.tests/projects/localprojectscanner/341038_projectsOutsideWorkspaceNotRenamed/384510_subNotRenamed/pom.xml
>@@ -0,0 +1,10 @@
>+<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>
>+	  <groupId>org.eclipse.m2e.tests.project.localprojectscanner</groupId>
>+	  <artifactId>renameOutsideWorkspace</artifactId>
>+	  <version>0.0.1-SNAPSHOT</version>
>+  </parent>
>+  <artifactId>subNotRenamed</artifactId>
>+</project>
>\ No newline at end of file
>org.eclipse.m2e.tests/projects/localprojectscanner/341038_projectsOutsideWorkspaceNotRenamed/pom.xml
>diff --git a/org.eclipse.m2e.tests/projects/localprojectscanner/341038_projectsOutsideWorkspaceNotRenamed/pom.xml b/org.eclipse.m2e.tests/projects/localprojectscanner/341038_projectsOutsideWorkspaceNotRenamed/pom.xml
>index 21ef83f..d74eb58 100644
>--- a/org.eclipse.m2e.tests/projects/localprojectscanner/341038_projectsOutsideWorkspaceNotRenamed/pom.xml
>+++ b/org.eclipse.m2e.tests/projects/localprojectscanner/341038_projectsOutsideWorkspaceNotRenamed/pom.xml
>@@ -10,4 +10,7 @@
>     <artifactId>m2e-test-parent</artifactId>
>     <version>1.0.0</version>
>   </parent>
>+  <modules>
>+  	<module>384510_subNotRenamed</module>
>+  </modules>
> </project>
>\ No newline at end of file
>org.eclipse.m2e.tests/projects/localprojectscanner/rename/mavenNNNNNNNN/384510_subNotRenamed/pom.xml
>diff --git a/org.eclipse.m2e.tests/projects/localprojectscanner/rename/mavenNNNNNNNN/384510_subNotRenamed/pom.xml b/org.eclipse.m2e.tests/projects/localprojectscanner/rename/mavenNNNNNNNN/384510_subNotRenamed/pom.xml
>new file mode 100644
>index 0000000..7f92a5e
>--- /dev/null
>+++ b/org.eclipse.m2e.tests/projects/localprojectscanner/rename/mavenNNNNNNNN/384510_subNotRenamed/pom.xml
>@@ -0,0 +1,10 @@
>+<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>
>+	  <groupId>rename</groupId>
>+	  <artifactId>maven-project</artifactId>
>+	  <version>0.0.1-SNAPSHOT</version>
>+  </parent>
>+  <artifactId>subNotRenamed</artifactId>
>+</project>
>\ No newline at end of file
>org.eclipse.m2e.tests/projects/localprojectscanner/rename/mavenNNNNNNNN/pom.xml
>diff --git a/org.eclipse.m2e.tests/projects/localprojectscanner/rename/mavenNNNNNNNN/pom.xml b/org.eclipse.m2e.tests/projects/localprojectscanner/rename/mavenNNNNNNNN/pom.xml
>index d0388ca..afccef3 100644
>--- a/org.eclipse.m2e.tests/projects/localprojectscanner/rename/mavenNNNNNNNN/pom.xml
>+++ b/org.eclipse.m2e.tests/projects/localprojectscanner/rename/mavenNNNNNNNN/pom.xml
>@@ -4,4 +4,7 @@
>   <groupId>rename</groupId>
>   <artifactId>maven-project</artifactId>
>   <version>0.0.1-SNAPSHOT</version>
>+  <modules>
>+  	<module>384510_subNotRenamed</module>
>+  </modules>
> </project>
>- org.eclipse.m2e.tests/src/org/eclipse/m2e/tests/LocalProjectScannerTest.java 
>diff --git a/org.eclipse.m2e.tests/src/org/eclipse/m2e/tests/LocalProjectScannerTest.java b/org.eclipse.m2e.tests/src/org/eclipse/m2e/tests/LocalProjectScannerTest.java
>index 4f66f81..c46ae59 100644
>--- a/org.eclipse.m2e.tests/src/org/eclipse/m2e/tests/LocalProjectScannerTest.java
>+++ b/org.eclipse.m2e.tests/src/org/eclipse/m2e/tests/LocalProjectScannerTest.java
>@@ -23,6 +23,7 @@
> 
> import junit.framework.TestCase;
> 
>+import org.eclipse.core.internal.resources.ProjectInfo;
> import org.eclipse.core.runtime.NullProgressMonitor;
> 
> import org.eclipse.m2e.core.MavenPlugin;
>@@ -244,6 +245,12 @@
> 
>     MavenProjectInfo project = projects.get(0);
>     assertEquals(MavenProjectInfo.RENAME_REQUIRED, project.getBasedirRename());
>+    
>+    //Non of the sub modules should be renamed
>+    for(MavenProjectInfo subProject : project.getProjects()) {
>+      assertEquals(MavenProjectInfo.RENAME_NO, subProject.getBasedirRename());  
>+    }
>+
>   }
> 
>   public void testNoMetadata() throws Exception {
>@@ -271,7 +278,14 @@
>     List<MavenProjectInfo> projects = scanner.getProjects();
>     MavenProjectInfo project = projects.get(0);
> 
>+    //The base directory should be renamed
>     assertEquals(MavenProjectInfo.RENAME_REQUIRED, project.getBasedirRename());
>+    
>+    //Non of the sub modules should be renamed
>+    for(MavenProjectInfo subProject : project.getProjects()) {
>+      assertEquals(MavenProjectInfo.RENAME_NO, subProject.getBasedirRename());  
>+    }
>+    
>   }
> 
> }

Actions: View

Attachments on bug 384510: 218403 | 218406 | 218407 | 218937 | 218938