[java-sig-commits] [javapackages] Add tests for compat/noncompat packages and skipProvides

[Michael Šimáček]

commit 78b8217910502dc95d6f5e8947e92c93b0ddfc2b
Author: Michael Simacek <msimacek at redhat.com>
Date:   Thu Sep 19 10:09:01 2013 +0200

    Add tests for compat/noncompat packages and skipProvides

 .../{require2/fragment.xml => non_compat.xml}      |    1 -
 .../{require2 => require_mixed}/fragment.xml       |    0
 .../{require3 => require_mixed}/fragment2.xml      |    1 -
 .../{require3 => require_mixed}/fragment3.xml      |    0
 .../{require3 => require_mixed}/require.xml        |    4 ++++
 .../{require3 => require_multi}/fragment.xml       |    0
 .../{require3 => require_multi}/fragment2.xml      |    0
 .../{require3 => require_multi}/fragment3.xml      |    0
 .../{require3 => require_multi}/require.xml        |    0
 .../{require2 => require_parent}/fragment.xml      |    0
 .../{require2 => require_parent}/require.xml       |    0
 .../{require2/fragment.xml => skip_provides.xml}   |    2 +-
 test/maven_prov_test.py                            |   11 +++++++++++
 test/maven_req_test.py                             |    9 +++++++--
 14 files changed, 23 insertions(+), 5 deletions(-)
---
diff --git a/test/depmaps/require2/fragment.xml b/test/depmaps/non_compat.xml
similarity index 93%
copy from test/depmaps/require2/fragment.xml
copy to test/depmaps/non_compat.xml
index 12d8c5c..5cc352b 100644
--- a/test/depmaps/require2/fragment.xml
+++ b/test/depmaps/non_compat.xml
@@ -9,7 +9,6 @@
 <jpp>
 <groupId>JPP/plexus</groupId>
 <artifactId>ant-factory</artifactId>
-<version>1.0</version>
 <namespace>ns</namespace>
 </jpp>
 </dependency>
diff --git a/test/depmaps/require2/fragment.xml b/test/depmaps/require_mixed/fragment.xml
similarity index 100%
copy from test/depmaps/require2/fragment.xml
copy to test/depmaps/require_mixed/fragment.xml
diff --git a/test/depmaps/require3/fragment2.xml b/test/depmaps/require_mixed/fragment2.xml
similarity index 93%
copy from test/depmaps/require3/fragment2.xml
copy to test/depmaps/require_mixed/fragment2.xml
index 3eb0a1d..c14c5a5 100644
--- a/test/depmaps/require3/fragment2.xml
+++ b/test/depmaps/require_mixed/fragment2.xml
@@ -9,7 +9,6 @@
 <jpp>
 <groupId>JPP/maven-idea-plugin</groupId>
 <artifactId>maven-idea-plugin</artifactId>
-<version>1.5</version>
 <namespace>ns</namespace>
 </jpp>
 </dependency>
diff --git a/test/depmaps/require3/fragment3.xml b/test/depmaps/require_mixed/fragment3.xml
similarity index 100%
copy from test/depmaps/require3/fragment3.xml
copy to test/depmaps/require_mixed/fragment3.xml
diff --git a/test/depmaps/require3/require.xml b/test/depmaps/require_mixed/require.xml
similarity index 86%
copy from test/depmaps/require3/require.xml
copy to test/depmaps/require_mixed/require.xml
index b3c0813..1528e57 100644
--- a/test/depmaps/require3/require.xml
+++ b/test/depmaps/require_mixed/require.xml
@@ -28,4 +28,8 @@
 <artifactId>wagon-provider-api</artifactId>
 <classifier>test-jar</classifier>
 </autoRequires>
+<autoRequires>
+<groupId>org.apache.maven.plugins</groupId>
+<artifactId>maven-idea-plugin</artifactId>
+</autoRequires>
 </dependencies>
diff --git a/test/depmaps/require3/fragment.xml b/test/depmaps/require_multi/fragment.xml
similarity index 100%
rename from test/depmaps/require3/fragment.xml
rename to test/depmaps/require_multi/fragment.xml
diff --git a/test/depmaps/require3/fragment2.xml b/test/depmaps/require_multi/fragment2.xml
similarity index 100%
rename from test/depmaps/require3/fragment2.xml
rename to test/depmaps/require_multi/fragment2.xml
diff --git a/test/depmaps/require3/fragment3.xml b/test/depmaps/require_multi/fragment3.xml
similarity index 100%
rename from test/depmaps/require3/fragment3.xml
rename to test/depmaps/require_multi/fragment3.xml
diff --git a/test/depmaps/require3/require.xml b/test/depmaps/require_multi/require.xml
similarity index 100%
rename from test/depmaps/require3/require.xml
rename to test/depmaps/require_multi/require.xml
diff --git a/test/depmaps/require2/fragment.xml b/test/depmaps/require_parent/fragment.xml
similarity index 100%
copy from test/depmaps/require2/fragment.xml
copy to test/depmaps/require_parent/fragment.xml
diff --git a/test/depmaps/require2/require.xml b/test/depmaps/require_parent/require.xml
similarity index 100%
rename from test/depmaps/require2/require.xml
rename to test/depmaps/require_parent/require.xml
diff --git a/test/depmaps/require2/fragment.xml b/test/depmaps/skip_provides.xml
similarity index 93%
rename from test/depmaps/require2/fragment.xml
rename to test/depmaps/skip_provides.xml
index 12d8c5c..253fba8 100644
--- a/test/depmaps/require2/fragment.xml
+++ b/test/depmaps/skip_provides.xml
@@ -1,5 +1,6 @@
 <dependencies>
 <dependency>
+<skipProvides/>
 <maven>
 <groupId>org.codehaus.plexus</groupId>
 <artifactId>plexus-ant-factory</artifactId>
@@ -9,7 +10,6 @@
 <jpp>
 <groupId>JPP/plexus</groupId>
 <artifactId>ant-factory</artifactId>
-<version>1.0</version>
 <namespace>ns</namespace>
 </jpp>
 </dependency>
diff --git a/test/maven_prov_test.py b/test/maven_prov_test.py
index 85d76e3..3df338b 100644
--- a/test/maven_prov_test.py
+++ b/test/maven_prov_test.py
@@ -45,3 +45,14 @@ class TestMavenProv(unittest.TestCase):
     @mavenprov(["two_in_one.xml"])
     def test_two_in_one(self, stdout, stderr, return_value):
         self.assertNotEqual(return_value, 0)
+
+    @mavenprov(["skip_provides.xml"])
+    def test_skip_provides(self, stdout, stderr, return_value):
+        self.assertEquals(return_value, 0)
+        self.assertEquals(stdout, "ns-mvn(org.codehaus.plexus:plexus-ant-factory:1.0) = 1.0\n")
+
+    @mavenprov(["non_compat.xml"])
+    def test_non_compat(self, stdout, stderr, return_value):
+        self.assertEquals(return_value, 0)
+        self.assertEquals(stdout, "ns-mvn(org.codehaus.plexus:plexus-ant-factory) = 1.0\n")
+
diff --git a/test/maven_req_test.py b/test/maven_req_test.py
index c03ed50..4cec8b7 100644
--- a/test/maven_req_test.py
+++ b/test/maven_req_test.py
@@ -28,12 +28,17 @@ class TestMavenReq(unittest.TestCase):
         self.assertEquals(return_value, 0)
         self.assertEquals(stdout, "jpackage-utils\nmvn(org.apache.maven:maven-project)\njava >= 1:1.6\n")
 
-    @mavenreq(["require2/require.xml"])
+    @mavenreq(["require_parent/require.xml"])
     def test_require_parent(self, stdout, stderr, return_value):
         self.assertEquals(return_value, 0)
         self.assertEquals(stdout, "jpackage-utils\nns-mvn(org.codehaus.plexus:plexus-ant-factory) = 1.0\n")
 
-    @mavenreq(["require3/require.xml"])
+    @mavenreq(["require_multi/require.xml"])
     def test_require_multi(self, stdout, stderr, return_value):
         self.assertEquals(return_value, 0)
         self.assertEquals(stdout, "jpackage-utils\nns-mvn(org.codehaus.plexus:plexus-ant-factory) = 1.0\nns-mvn(codehaus:plexus-utils) = 1.2\nmvn(org.apache.maven.wagon:wagon-provider-api::test-jar:)\n")
+
+    @mavenreq(["require_mixed/require.xml"])
+    def test_mixed(self, stdout, stderr, return_value):
+        self.assertEquals(return_value, 0)
+        self.assertEquals(stdout, "jpackage-utils\nns-mvn(org.codehaus.plexus:plexus-ant-factory) = 1.0\nns-mvn(codehaus:plexus-utils) = 1.2\nmvn(org.apache.maven.wagon:wagon-provider-api::test-jar:)\nmvn(org.apache.maven.plugins:maven-idea-plugin) = 1.4\n")