commit 4793972c203320cce50112206d7bd376d05f493f Author: Michal Srb <msrb(a)redhat.com&gt; Date: Mon Apr 28 15:32:04 2014 +0200 [test] More tests for maven_depmap .../test_packaging_pom_no_jar-want.xml | 19 ++++++++++++ test/maven_depmap_test.py | 30 ++++++++++---------- 2 files changed, 34 insertions(+), 15 deletions(-) --- diff --git a/test/data/maven_depmap/test_packaging_pom_no_jar-want.xml b/test/data/maven_depmap/test_packaging_pom_no_jar-want.xml new file mode 100644 index 0000000..a0cc0cb --- /dev/null +++ b/test/data/maven_depmap/test_packaging_pom_no_jar-want.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" ?> +<ns1:metadata xmlns:ns1="http://fedorahosted.org/xmvn/CONFIG/2.0.0"> + <ns1:artifacts> + <ns1:artifact> + <ns1:groupId>commons-io</ns1:groupId> + <ns1:artifactId>commons-io</ns1:artifactId> + <ns1:extension>pom</ns1:extension> + <ns1:version>2</ns1:version> + <ns1:path>%s/JPP-apache-commons-io.pom</ns1:path> + <ns1:dependencies> + <ns1:dependency> + <ns1:groupId>G</ns1:groupId> + <ns1:artifactId>G</ns1:artifactId> + <ns1:requestedVersion>1000</ns1:requestedVersion> + </ns1:dependency> + </ns1:dependencies> + </ns1:artifact> + </ns1:artifacts> +</ns1:metadata> diff --git a/test/maven_depmap_test.py b/test/maven_depmap_test.py index c839fd1..6025afb 100644 --- a/test/maven_depmap_test.py +++ b/test/maven_depmap_test.py @@ -100,16 +100,16 @@ class TestMavenDepmap(unittest.TestCase): # depmap) # self.assertEqual(report, '', report) - #(a)mvn_depmap(&#39;JPP-commons-io.pom&#39;) - #def test_missing_jar_arg(self, stdout, stderr, return_value, depmap): - # self.assertNotEqual(return_value, 0) + @mvn_depmap('JPP-commons-io.pom') + def test_missing_jar_arg(self, stdout, stderr, return_value, depmap): + self.assertNotEqual(return_value, 0) - #(a)mvn_depmap(&#39;JPP-apache-commons-io.pom&#39;) - #def test_packaging_pom_no_jar(self, stdout, stderr, return_value, depmap): - # self.assertEqual(return_value, 0, stderr) - # report = self.check_result(inspect.currentframe().f_code.co_name, - # depmap) - # self.assertEqual(report, '', report) + @mvn_depmap('JPP-apache-commons-io.pom') + def test_packaging_pom_no_jar(self, stdout, stderr, return_value, depmap): + self.assertEqual(return_value, 0, stderr) + report = self.check_result(inspect.currentframe().f_code.co_name, + depmap) + self.assertEqual(report, '', report) #(a)mvn_depmap(&#39;JPP-noversion.pom&#39;) #def test_missing_version(self, stdout, stderr, return_value, depmap): @@ -122,12 +122,12 @@ class TestMavenDepmap(unittest.TestCase): # depmap) # self.assertEqual(report, '', report) - #(a)mvn_depmap(&#39;JPP-commons-war.pom&#39;, 'usr/share/java/commons-war.war') - #def test_war(self, stdout, stderr, return_value, depmap): - # self.assertEqual(return_value, 0, stderr) - # report = self.check_result(inspect.currentframe().f_code.co_name, - # depmap) - # self.assertEqual(report, '', report) + @mvn_depmap('JPP-commons-war.pom', 'usr/share/java/commons-war.war') + def test_war(self, stdout, stderr, return_value, depmap): + self.assertEqual(return_value, 0, stderr) + report = self.check_result(inspect.currentframe().f_code.co_name, + depmap) + self.assertEqual(report, '', report) #(a)mvn_depmap(&#39;JPP-commons-weird.pom&#39;, 'usr/share/java/commons-weird.war') #def test_weird_packaging(self, stdout, stderr, return_value, depmap):