commit e8180c6f0f642862e4a4481a535da59065b55b15 Author: Michal Srb msrb@redhat.com Date: Wed Jan 14 18:13:49 2015 +0100
[test] Add tests for ebb2fbd
test/maven_prov_test.py | 8 +++++ test/maven_req_test.py | 9 ++++++ .../usr/share/maven-metadata/fragment.xml | 28 ++++++++++++++++++++ .../buildroot/usr/share/maven-metadata/require.xml | 27 +++++++++++++++++++ 4 files changed, 72 insertions(+), 0 deletions(-) --- diff --git a/test/maven_prov_test.py b/test/maven_prov_test.py index 5445312..08cf7e2 100644 --- a/test/maven_prov_test.py +++ b/test/maven_prov_test.py @@ -142,5 +142,13 @@ class TestMavenProv(unittest.TestCase): assertIn(self, "mvn(args4j:args4j:pom:) = 2.0.16", sout) assertIn(self, "mvn(args4j:args4j) = 2.0.16", sout)
+ @mavenprov(["dashes/buildroot/usr/share/maven-metadata/require.xml"]) + def test_dashes(self, stdout, stderr, return_value): + self.assertEqual(return_value, 0, stderr) + sout = [x for x in stdout.split('\n') if x] + self.assertEqual(len(sout), 2) + assertIn(self, "mvn(org.apache.maven:maven-model) = 1.alpha.2", sout) + assertIn(self, "osgi(osgi1) = 1.5.101.SNAPSHOT", sout) + if __name__ == '__main__': unittest.main() diff --git a/test/maven_req_test.py b/test/maven_req_test.py index 6367b79..e45d343 100644 --- a/test/maven_req_test.py +++ b/test/maven_req_test.py @@ -265,5 +265,14 @@ class TestMavenReq(unittest.TestCase): want = ("devtoolset-3-osgi(osgi.req1) = 1.0", "jpackage-utils", "java-headless") self.assertEqual(set(want), set(sout))
+ @mavenreq(["dashes/buildroot/usr/share/maven-metadata/require.xml"]) + def test_dashes(self, stdout, stderr, return_value): + self.assertEqual(return_value, 0, stderr) + sout = [x for x in stdout.split('\n') if x] + want = ("mvn(org.apache.maven:maven-plugin-api) = 1.alpha.2", + "osgi(osgi2) = 1.5.1.SNAPSHOT", + "java-headless", "jpackage-utils") + self.assertEqual(set(want), set(sout)) + if __name__ == '__main__': unittest.main() diff --git a/test/metadata/dashes/buildroot/usr/share/maven-metadata/fragment.xml b/test/metadata/dashes/buildroot/usr/share/maven-metadata/fragment.xml new file mode 100644 index 0000000..a7fedad --- /dev/null +++ b/test/metadata/dashes/buildroot/usr/share/maven-metadata/fragment.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/2.0.0"> + <artifacts> + <artifact> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>1-alpha-2</version> + <path>/usr/share/java/maven/maven-plugin-api.jar</path> + <dependencies> + <dependency> + <groupId>org.sonatype.sisu</groupId> + <artifactId>sisu-guice</artifactId> + <requestedVersion>3.1.6</requestedVersion> + <exclusions> + <exclusion> + <groupId>aopalliance</groupId> + <artifactId>aopalliance</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + <properties> + <osgi.version>1.5.1-SNAPSHOT</osgi.version> + <osgi.id>osgi2</osgi.id> + </properties> + </artifact> + </artifacts> +</metadata> diff --git a/test/metadata/dashes/buildroot/usr/share/maven-metadata/require.xml b/test/metadata/dashes/buildroot/usr/share/maven-metadata/require.xml new file mode 100644 index 0000000..d8c3810 --- /dev/null +++ b/test/metadata/dashes/buildroot/usr/share/maven-metadata/require.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/2.0.0"> + <artifacts> + <artifact> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + <version>1-alpha-2</version> + <path>/usr/share/java/maven/maven-model.jar</path> + <dependencies> + <dependency> + <!-- this is a dependency on subpackage --> + <!-- mvn(org.apache.maven:maven-plugin-api) = 1.alpha.2 --> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <requestedVersion>1-alpha-2</requestedVersion> + </dependency> + </dependencies> + <properties> + <osgi.version>1.5.101-SNAPSHOT</osgi.version> + <osgi.id>osgi1</osgi.id> + <osgi.requires>osgi2</osgi.requires> + </properties> + </artifact> + </artifacts> + <skippedArtifacts> + </skippedArtifacts> +</metadata>
java-sig-commits@lists.fedoraproject.org