commit 147082bf3f0e4aaa0f5ef247acab1a441b56fa74
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Apr 22 14:17:07 2014 +0200
[test] Update mvn_artifact tests for new metadata
test/data/artifact/test_artifact_war-want.xml | 19 -------------------
test/data/artifact/test_basic-want.xml | 11 -----------
test/data/artifact/test_basic_jar-want.xml | 18 ------------------
.../artifact/test_extension_not_specified-want.xml | 11 -----------
.../artifact/test_mvn_spec_classifier-want.xml | 10 ----------
.../artifact/test_mvn_spec_classifier_war-want.xml | 11 -----------
test/data/artifact/test_mvn_spec_ext-want.xml | 9 ---------
test/data/artifact/test_mvn_spec_ext_war-want.xml | 10 ----------
test/data/artifact/test_mvn_spec_jar-want.xml | 9 ---------
test/data/artifact/test_mvn_spec_war-want.xml | 10 ----------
test/data/{artifact => mvn_artifact}/args4j.pom | 8 ++------
test/data/mvn_artifact/test_artifact_war-want.xml | 19 +++++++++++++++++++
test/data/mvn_artifact/test_basic-want.xml | 12 ++++++++++++
test/data/mvn_artifact/test_basic_jar-want.xml | 19 +++++++++++++++++++
.../test_extension_not_specified-want.xml | 13 +++++++++++++
.../mvn_artifact/test_mvn_spec_classifier-want.xml | 13 +++++++++++++
.../test_mvn_spec_classifier_war-want.xml | 13 +++++++++++++
test/data/mvn_artifact/test_mvn_spec_ext-want.xml | 12 ++++++++++++
.../mvn_artifact/test_mvn_spec_ext_war-want.xml | 12 ++++++++++++
test/data/mvn_artifact/test_mvn_spec_jar-want.xml | 12 ++++++++++++
test/data/mvn_artifact/test_mvn_spec_war-want.xml | 12 ++++++++++++
test/mvn_artifact_test.py | 17 +++++++----------
22 files changed, 146 insertions(+), 134 deletions(-)
---
diff --git a/test/data/artifact/args4j.pom b/test/data/mvn_artifact/args4j.pom
similarity index 88%
rename from test/data/artifact/args4j.pom
rename to test/data/mvn_artifact/args4j.pom
index 7d193cd..c9dc46e 100644
--- a/test/data/artifact/args4j.pom
+++ b/test/data/mvn_artifact/args4j.pom
@@ -1,13 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?><project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>args4j</groupId>
- <artifactId>args4j-site</artifactId>
- <version>2.0.16</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
+ <groupId>args4j</groupId>
<artifactId>args4j</artifactId>
<name>args4j</name>
+ <version>2.0.16</version>
<packaging>bundle</packaging>
<build>
diff --git a/test/data/mvn_artifact/test_artifact_war-want.xml
b/test/data/mvn_artifact/test_artifact_war-want.xml
new file mode 100644
index 0000000..df3aded
--- /dev/null
+++ b/test/data/mvn_artifact/test_artifact_war-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>args4j</ns1:groupId>
+ <ns1:artifactId>args4j</ns1:artifactId>
+ <ns1:extension>pom</ns1:extension>
+ <ns1:version>2.0.16</ns1:version>
+ <ns1:path>%s/args4j.pom</ns1:path>
+ </ns1:artifact>
+ <ns1:artifact>
+ <ns1:groupId>args4j</ns1:groupId>
+ <ns1:artifactId>args4j</ns1:artifactId>
+ <ns1:extension>war</ns1:extension>
+ <ns1:version>2.0.16</ns1:version>
+ <ns1:path>%s/webapp.war</ns1:path>
+ </ns1:artifact>
+ </ns1:artifacts>
+</ns1:metadata>
diff --git a/test/data/mvn_artifact/test_basic-want.xml
b/test/data/mvn_artifact/test_basic-want.xml
new file mode 100644
index 0000000..6f1193b
--- /dev/null
+++ b/test/data/mvn_artifact/test_basic-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>args4j</ns1:groupId>
+ <ns1:artifactId>args4j</ns1:artifactId>
+ <ns1:extension>pom</ns1:extension>
+ <ns1:version>2.0.16</ns1:version>
+ <ns1:path>%s/args4j.pom</ns1:path>
+ </ns1:artifact>
+ </ns1:artifacts>
+</ns1:metadata>
diff --git a/test/data/mvn_artifact/test_basic_jar-want.xml
b/test/data/mvn_artifact/test_basic_jar-want.xml
new file mode 100644
index 0000000..cd1772c
--- /dev/null
+++ b/test/data/mvn_artifact/test_basic_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>args4j</ns1:groupId>
+ <ns1:artifactId>args4j</ns1:artifactId>
+ <ns1:extension>pom</ns1:extension>
+ <ns1:version>2.0.16</ns1:version>
+ <ns1:path>%s/args4j.pom</ns1:path>
+ </ns1:artifact>
+ <ns1:artifact>
+ <ns1:groupId>args4j</ns1:groupId>
+ <ns1:artifactId>args4j</ns1:artifactId>
+ <ns1:extension>jar</ns1:extension>
+ <ns1:version>2.0.16</ns1:version>
+ <ns1:path>%s/maven-artifact.jar</ns1:path>
+ </ns1:artifact>
+ </ns1:artifacts>
+</ns1:metadata>
diff --git a/test/data/mvn_artifact/test_extension_not_specified-want.xml
b/test/data/mvn_artifact/test_extension_not_specified-want.xml
new file mode 100644
index 0000000..60b54ea
--- /dev/null
+++ b/test/data/mvn_artifact/test_extension_not_specified-want.xml
@@ -0,0 +1,13 @@
+<?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:classifier>javadoc</ns1:classifier>
+ <ns1:version>12</ns1:version>
+ <ns1:path>%s/test-javadoc.war</ns1:path>
+ </ns1:artifact>
+ </ns1:artifacts>
+</ns1:metadata>
diff --git a/test/data/mvn_artifact/test_mvn_spec_classifier-want.xml
b/test/data/mvn_artifact/test_mvn_spec_classifier-want.xml
new file mode 100644
index 0000000..7489890
--- /dev/null
+++ b/test/data/mvn_artifact/test_mvn_spec_classifier-want.xml
@@ -0,0 +1,13 @@
+<?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>jar</ns1:extension>
+ <ns1:classifier>sources</ns1:classifier>
+ <ns1:version>12</ns1:version>
+ <ns1:path>%s/test-sources.jar</ns1:path>
+ </ns1:artifact>
+ </ns1:artifacts>
+</ns1:metadata>
diff --git a/test/data/mvn_artifact/test_mvn_spec_classifier_war-want.xml
b/test/data/mvn_artifact/test_mvn_spec_classifier_war-want.xml
new file mode 100644
index 0000000..60b54ea
--- /dev/null
+++ b/test/data/mvn_artifact/test_mvn_spec_classifier_war-want.xml
@@ -0,0 +1,13 @@
+<?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:classifier>javadoc</ns1:classifier>
+ <ns1:version>12</ns1:version>
+ <ns1:path>%s/test-javadoc.war</ns1:path>
+ </ns1:artifact>
+ </ns1:artifacts>
+</ns1:metadata>
diff --git a/test/data/mvn_artifact/test_mvn_spec_ext-want.xml
b/test/data/mvn_artifact/test_mvn_spec_ext-want.xml
new file mode 100644
index 0000000..22da8b2
--- /dev/null
+++ b/test/data/mvn_artifact/test_mvn_spec_ext-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>jar</ns1:extension>
+ <ns1:version>12</ns1:version>
+ <ns1:path>%s/test.jar</ns1:path>
+ </ns1:artifact>
+ </ns1:artifacts>
+</ns1:metadata>
diff --git a/test/data/mvn_artifact/test_mvn_spec_ext_war-want.xml
b/test/data/mvn_artifact/test_mvn_spec_ext_war-want.xml
new file mode 100644
index 0000000..71a1221
--- /dev/null
+++ b/test/data/mvn_artifact/test_mvn_spec_ext_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>12</ns1:version>
+ <ns1:path>%s/test.war</ns1:path>
+ </ns1:artifact>
+ </ns1:artifacts>
+</ns1:metadata>
diff --git a/test/data/mvn_artifact/test_mvn_spec_jar-want.xml
b/test/data/mvn_artifact/test_mvn_spec_jar-want.xml
new file mode 100644
index 0000000..22da8b2
--- /dev/null
+++ b/test/data/mvn_artifact/test_mvn_spec_jar-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>jar</ns1:extension>
+ <ns1:version>12</ns1:version>
+ <ns1:path>%s/test.jar</ns1:path>
+ </ns1:artifact>
+ </ns1:artifacts>
+</ns1:metadata>
diff --git a/test/data/mvn_artifact/test_mvn_spec_war-want.xml
b/test/data/mvn_artifact/test_mvn_spec_war-want.xml
new file mode 100644
index 0000000..71a1221
--- /dev/null
+++ b/test/data/mvn_artifact/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>12</ns1:version>
+ <ns1:path>%s/test.war</ns1:path>
+ </ns1:artifact>
+ </ns1:artifacts>
+</ns1:metadata>
diff --git a/test/mvn_artifact_test.py b/test/mvn_artifact_test.py
index 8e0dbab..65a6100 100644
--- a/test/mvn_artifact_test.py
+++ b/test/mvn_artifact_test.py
@@ -2,10 +2,12 @@ import inspect
import os
import unittest
import shutil
+import javapackages.metadata as m
from test_common import *
from lxml import etree
from formencode import doctest_xml_compare
+
class TestMvnArtifact(unittest.TestCase):
@classmethod
@@ -26,17 +28,12 @@ class TestMvnArtifact(unittest.TestCase):
for filename in filenames:
if filename.endswith("-want.xml"):
want_file = os.path.join(dirname, filename)
- doc = etree.parse(want_file)
- pom_paths = doc.xpath("./artifact/rawPomPath")
- if len(pom_paths) > 0:
- for pom_path in pom_paths:
- pom_path.text = pom_path.text % (cls.workdir)
- jar_paths = doc.xpath("./artifact/file")
- if len(jar_paths) > 0:
- for jar_path in jar_paths:
- jar_path.text = jar_path.text % (cls.workdir)
+ metadata = m.CreateFromDocument(open(want_file).read())
+ for a in metadata.artifacts.artifact:
+ a.path = a.path % (cls.workdir)
with open(want_file, "w") as f:
- f.write(etree.tostring(doc.getroot(), pretty_print=True))
+ dom = metadata.toDOM(None)
+ f.write(dom.toprettyxml(indent=" "))
@classmethod
def tearDownClass(cls):