commit 5c25b861cc294d6b88ab305403a0afea65801804
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Thu Oct 3 11:03:25 2013 +0200
Add testcase for rhbz#1012980
test/depmaps/require_skipped/fragment.xml | 29 ++++++++++++++++++++++++++
test/depmaps/require_skipped/fragment3.xml | 19 +++++++++++++++++
test/depmaps/require_skipped/require.xml | 31 ++++++++++++++++++++++++++++
test/maven_req_test.py | 10 +++++++++
4 files changed, 89 insertions(+), 0 deletions(-)
---
diff --git a/test/depmaps/require_skipped/fragment.xml
b/test/depmaps/require_skipped/fragment.xml
new file mode 100644
index 0000000..671d978
--- /dev/null
+++ b/test/depmaps/require_skipped/fragment.xml
@@ -0,0 +1,29 @@
+<dependencies>
+<skippedArtifact>
+<groupId>org.codehaus.plexus</groupId>
+<artifactId>plexus-ant-factory</artifactId>
+<version>1.0</version>
+<namespace>ns</namespace>
+<!--<jpp>
+<groupId>JPP/plexus</groupId>
+<artifactId>ant-factory</artifactId>
+<version>1.0</version>
+<namespace>ns</namespace>
+</jpp>-->
+</skippedArtifact>
+<dependency>
+<maven>
+<groupId>org.apache.maven.plugins</groupId>
+<artifactId>maven-idea-plugin</artifactId>
+<version>1.4</version>
+<namespace>ns</namespace>
+</maven>
+<jpp>
+<groupId>JPP/maven-idea-plugin</groupId>
+<artifactId>maven-idea-plugin</artifactId>
+<version>1.5</version>
+<namespace>ns</namespace>
+</jpp>
+</dependency>
+
+</dependencies>
diff --git a/test/depmaps/require_skipped/fragment3.xml
b/test/depmaps/require_skipped/fragment3.xml
new file mode 100644
index 0000000..1b82647
--- /dev/null
+++ b/test/depmaps/require_skipped/fragment3.xml
@@ -0,0 +1,19 @@
+<depset>
+<dependency>
+<maven>
+<groupId>codehaus</groupId>
+<artifactId>plexus-utils</artifactId>
+<version>1.2</version>
+<namespace>ns</namespace>
+</maven>
+<jpp>
+<groupId>JPP/plexus-utils</groupId>
+<artifactId>plexus-utils</artifactId>
+<namespace>ns</namespace>
+</jpp>
+</dependency>
+<autoRequires>
+<groupId>org.apache.maven</groupId>
+<artifactId>maven-project</artifactId>
+</autoRequires>
+</depset>
diff --git a/test/depmaps/require_skipped/require.xml
b/test/depmaps/require_skipped/require.xml
new file mode 100644
index 0000000..b3c0813
--- /dev/null
+++ b/test/depmaps/require_skipped/require.xml
@@ -0,0 +1,31 @@
+<dependencies>
+<dependency>
+<maven>
+<groupId>org.mortbay.jetty</groupId>
+<artifactId>jsp-2.1-glassfish</artifactId>
+<version>9.1.1.B60.25.p2</version>
+<namespace>ns</namespace>
+</maven>
+<jpp>
+<groupId>JPP</groupId>
+<artifactId>tomcat6-jsp-2.1-api</artifactId>
+<version>6.0.18</version>
+<namespace>ns</namespace>
+</jpp>
+</dependency>
+<autoRequires>
+<groupId>org.codehaus.plexus</groupId>
+<artifactId>plexus-ant-factory</artifactId>
+<namespace>ns</namespace>
+</autoRequires>
+<autoRequires>
+<groupId>codehaus</groupId>
+<artifactId>plexus-utils</artifactId>
+<namespace>ns</namespace>
+</autoRequires>
+<autoRequires>
+<groupId>org.apache.maven.wagon</groupId>
+<artifactId>wagon-provider-api</artifactId>
+<classifier>test-jar</classifier>
+</autoRequires>
+</dependencies>
diff --git a/test/maven_req_test.py b/test/maven_req_test.py
index 4cec8b7..c75f7af 100644
--- a/test/maven_req_test.py
+++ b/test/maven_req_test.py
@@ -42,3 +42,13 @@ class TestMavenReq(unittest.TestCase):
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")
+
+ #test for rhbz#1012980
+ @mavenreq(["require_skipped/require.xml"])
+ def test_require_skipped(self, stdout, stderr, return_value):
+ self.assertNotEqual(return_value, 0)
+ self.assertNotEqual(stderr, '')
+ lines = stderr.split('\n');
+ self.assertGreater(len(lines), 1)
+ self.assertEquals(lines[-2], '%mvn_package
org.codehaus.plexus:plexus-ant-factory:::1.0 <package_name>')
+
Show replies by date