commit a0dcdec14f19cdab9284141fcc8a06d812d9d685
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Apr 29 09:15:29 2014 +0200
[test] More tests for maven_depmap
test/data/maven_depmap/test_mvn_spec-want.xml | 11 +++
test/data/maven_depmap/test_mvn_spec_war-want.xml | 12 +++
.../data/maven_depmap/test_parent_version-want.xml | 12 +++
test/maven_depmap_test.py | 74 ++++++++++----------
4 files changed, 72 insertions(+), 37 deletions(-)
---
diff --git a/test/data/maven_depmap/test_mvn_spec-want.xml
b/test/data/maven_depmap/test_mvn_spec-want.xml
new file mode 100644
index 0000000..6a89619
--- /dev/null
+++ b/test/data/maven_depmap/test_mvn_spec-want.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<ns1:metadata
xmlns:ns1="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
+ <ns1:artifacts>
+ <ns1:artifact>
+ <ns1:groupId>a</ns1:groupId>
+ <ns1:artifactId>b</ns1:artifactId>
+ <ns1:version>12</ns1:version>
+ <ns1:path>%s/usr/share/java/commons-io.jar</ns1:path>
+ </ns1:artifact>
+ </ns1:artifacts>
+</ns1:metadata>
diff --git a/test/data/maven_depmap/test_mvn_spec_war-want.xml
b/test/data/maven_depmap/test_mvn_spec_war-want.xml
new file mode 100644
index 0000000..32c85bc
--- /dev/null
+++ b/test/data/maven_depmap/test_mvn_spec_war-want.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<ns1:metadata
xmlns:ns1="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
+ <ns1:artifacts>
+ <ns1:artifact>
+ <ns1:groupId>a</ns1:groupId>
+ <ns1:artifactId>b</ns1:artifactId>
+ <ns1:extension>war</ns1:extension>
+ <ns1:version>1</ns1:version>
+ <ns1:path>%s/usr/share/java/commons-war.war</ns1:path>
+ </ns1:artifact>
+ </ns1:artifacts>
+</ns1:metadata>
diff --git a/test/data/maven_depmap/test_parent_version-want.xml
b/test/data/maven_depmap/test_parent_version-want.xml
new file mode 100644
index 0000000..908b8eb
--- /dev/null
+++ b/test/data/maven_depmap/test_parent_version-want.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<ns1:metadata
xmlns:ns1="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
+ <ns1:artifacts>
+ <ns1:artifact>
+ <ns1:groupId>g</ns1:groupId>
+ <ns1:artifactId>a</ns1:artifactId>
+ <ns1:extension>pom</ns1:extension>
+ <ns1:version>1</ns1:version>
+ <ns1:path>%s/JPP-parent-version.pom</ns1:path>
+ </ns1:artifact>
+ </ns1:artifacts>
+</ns1:metadata>
diff --git a/test/maven_depmap_test.py b/test/maven_depmap_test.py
index 6025afb..41cd052 100644
--- a/test/maven_depmap_test.py
+++ b/test/maven_depmap_test.py
@@ -111,16 +111,16 @@ class TestMavenDepmap(unittest.TestCase):
depmap)
self.assertEqual(report, '', report)
- #(a)mvn_depmap('JPP-noversion.pom')
- #def test_missing_version(self, stdout, stderr, return_value, depmap):
- # self.assertNotEqual(return_value, 0)
+ @mvn_depmap('JPP-noversion.pom')
+ def test_missing_version(self, stdout, stderr, return_value, depmap):
+ self.assertNotEqual(return_value, 0)
- #(a)mvn_depmap('JPP-parent-version.pom')
- #def test_parent_version(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-parent-version.pom')
+ def test_parent_version(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):
@@ -163,38 +163,38 @@ class TestMavenDepmap(unittest.TestCase):
#def test_not_JPP(self, stdout, stderr, return_value, depmap):
# self.assertNotEqual(return_value, 0)
- #def test_not_pom(self):
- # stdout, stderr, return_value = call_script(os.path.join(DIRPATH, '..',
- # 'java-utils', 'maven_depmap.py'),
- # ['.out', 'usr/share/java/commons-io.jar',
- # 'usr/share/java/commons-io.jar'])
- # self.assertNotEqual(return_value, 0)
+ def test_not_pom(self):
+ stdout, stderr, return_value = call_script(os.path.join(DIRPATH, '..',
+ 'java-utils', 'maven_depmap.py'),
+ ['.out', 'usr/share/java/commons-io.jar',
+ 'usr/share/java/commons-io.jar'])
+ self.assertNotEqual(return_value, 0)
- #def test_no_pom(self):
- # stdout, stderr, return_value = call_script(os.path.join(DIRPATH, '..',
- # 'java-utils', 'maven_depmap.py'),
- # ['.out'])
- # self.assertNotEqual(return_value, 0)
+ def test_no_pom(self):
+ stdout, stderr, return_value = call_script(os.path.join(DIRPATH, '..',
+ 'java-utils', 'maven_depmap.py'),
+ ['.out'])
+ self.assertNotEqual(return_value, 0)
- #def test_no_args(self):
- # stdout, stderr, return_value = call_script(os.path.join(DIRPATH, '..',
- # 'java-utils', 'maven_depmap.py'),
- # [])
- # self.assertNotEqual(return_value, 0)
+ def test_no_args(self):
+ stdout, stderr, return_value = call_script(os.path.join(DIRPATH, '..',
+ 'java-utils', 'maven_depmap.py'),
+ [])
+ self.assertNotEqual(return_value, 0)
- #@mvn_depmap('a:b:12', 'usr/share/java/commons-io.jar')
- #def test_mvn_spec(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('a:b:12', 'usr/share/java/commons-io.jar')
+ def test_mvn_spec(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('a:b:war::1', 'usr/share/java/commons-war.war')
- #def test_mvn_spec_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('a:b:war::1', 'usr/share/java/commons-war.war')
+ def test_mvn_spec_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('/builddir/build/BUILDROOT/pkg-2.5.2-2.fc21.x86_64/a:b:war::1',
# 'usr/share/java/commons-war.war')