[javapackages] Tests for pom_xpath_disable
by Michael Šimáček
commit 85fc9e4a86e01839f5305c98d4d40bb5de60ea85
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Thu Jul 3 13:34:39 2014 +0200
Tests for pom_xpath_disable
.../pom_editor/want/parent_disabled_common.xml | 28 +++++++++++++++++
test/pom_editor_modules_test.py | 9 +++++
test/pom_editor_paths_test.py | 32 ++++++++++----------
3 files changed, 53 insertions(+), 16 deletions(-)
---
diff --git a/test/data/pom_editor/want/parent_disabled_common.xml b/test/data/pom_editor/want/parent_disabled_common.xml
new file mode 100644
index 0000000..de4b550
--- /dev/null
+++ b/test/data/pom_editor/want/parent_disabled_common.xml
@@ -0,0 +1,28 @@
+<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">
+ <parent>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-parent</artifactId>
+ <version>17</version>
+ </parent>
+ <modules>
+ <module>intermediate</module>
+ <!--
+ <module>common</module>
+ -->
+ </modules>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.example</groupId>
+ <artifactId>parent</artifactId>
+ <version>2.6</version>
+ <name>Example parent</name>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>4.0</version>
+ </plugin>
+ </plugins>
+
+
+</project>
diff --git a/test/pom_editor_modules_test.py b/test/pom_editor_modules_test.py
index e04f80d..bb72631 100644
--- a/test/pom_editor_modules_test.py
+++ b/test/pom_editor_modules_test.py
@@ -1,4 +1,5 @@
from test_common import exec_pom_macro, WorkdirTestCase, assertIn
+from pom_editor_paths_test import example_tree
import unittest
class TestPomXpathDisable(WorkdirTestCase):
@@ -13,5 +14,13 @@ class TestPomXpathDisable(WorkdirTestCase):
assertIn(self, "Couldn't locate ", stderr)
self.assertNotEqual(0, return_value)
+ def test_disable_by_aid(self):
+ return_value, stderr, report = exec_pom_macro(
+ """%pom_xpath_disable "/pom:project/pom:artifactId='common'" """,
+ poms_tree=example_tree,
+ want_tree={'': 'parent_disabled_common.xml'})
+ self.assertEqual(0, return_value, stderr)
+ self.assertEqual('', report, report)
+
if __name__ == '__main__':
unittest.main()
diff --git a/test/pom_editor_paths_test.py b/test/pom_editor_paths_test.py
index e4a997e..aa37a43 100644
--- a/test/pom_editor_paths_test.py
+++ b/test/pom_editor_paths_test.py
@@ -1,6 +1,12 @@
from test_common import exec_pom_macro, WorkdirTestCase, assertIn
import unittest
+example_tree = {
+ '': 'example_parent.xml',
+ 'common': 'example_common.xml',
+ 'intermediate': 'example_intermediate.xml',
+ 'intermediate/schemas': 'example_schemas.xml'}
+
class TestPomPath(WorkdirTestCase):
def test_sanity(self):
return_value, stderr, report = exec_pom_macro('', {
@@ -104,15 +110,9 @@ class TestMorePoms(WorkdirTestCase):
self.assertEqual('', report, report)
class TestRecursive(WorkdirTestCase):
- example_tree = {
- '': 'example_parent.xml',
- 'common': 'example_common.xml',
- 'intermediate': 'example_intermediate.xml',
- 'intermediate/schemas': 'example_schemas.xml'}
-
def test_default_recursive1(self):
return_value, stderr, report = exec_pom_macro('%pom_remove_dep -r :commons-io',
- poms_tree=self.example_tree,
+ poms_tree=example_tree,
want_tree={'intermediate': 'example_intermediate_removed_commons_io.xml',
'common': 'example_common_removed_commons_io.xml'})
self.assertEqual(0, return_value, stderr)
@@ -120,14 +120,14 @@ class TestRecursive(WorkdirTestCase):
def test_default_recursive2(self):
return_value, stderr, report = exec_pom_macro('%pom_remove_dep -r :junit',
- poms_tree=self.example_tree,
+ poms_tree=example_tree,
want_tree={'intermediate/schemas': 'example_schemas_removed_junit.xml',
'common': 'example_common_removed_junit.xml'})
self.assertEqual(0, return_value, stderr)
self.assertEqual('', report, report)
def test_recursive_plugin_with_module(self):
- poms_tree = dict(self.example_tree)
+ poms_tree = dict(example_tree)
poms_tree[''] = 'example_parent_plugin_with_module.xml'
return_value, stderr, report = exec_pom_macro('%pom_remove_dep -r :junit',
poms_tree=poms_tree,
@@ -136,7 +136,7 @@ class TestRecursive(WorkdirTestCase):
self.assertEqual('', report, report)
def test_default_recursive_profile(self):
- poms_tree = dict(self.example_tree)
+ poms_tree = dict(example_tree)
poms_tree[''] = 'example_parent_profile.xml'
return_value, stderr, report = exec_pom_macro('%pom_remove_dep -r :commons-io',
poms_tree=poms_tree,
@@ -147,13 +147,13 @@ class TestRecursive(WorkdirTestCase):
def test_recursive_no_match(self):
return_value, stderr, _ = exec_pom_macro('%pom_remove_dep -r :not-there',
- poms_tree=self.example_tree)
+ poms_tree=example_tree)
assertIn(self, "Error", stderr)
assertIn(self, "not found", stderr)
self.assertNotEqual(0, return_value)
def test_recursive_missing(self):
- poms_tree = dict(self.example_tree)
+ poms_tree = dict(example_tree)
del poms_tree['intermediate/schemas']
return_value, stderr, _ = exec_pom_macro('%pom_remove_dep -r :commons-io',
poms_tree=poms_tree)
@@ -162,13 +162,13 @@ class TestRecursive(WorkdirTestCase):
def test_recursive_subpom(self):
return_value, stderr, report = exec_pom_macro('%pom_remove_dep -r :junit intermediate',
- poms_tree=self.example_tree,
+ poms_tree=example_tree,
want_tree={'intermediate/schemas': 'example_schemas_removed_junit.xml'})
self.assertEqual(0, return_value, stderr)
self.assertEqual('', report, report)
def test_recursive_multiple(self):
- poms_tree = dict(self.example_tree)
+ poms_tree = dict(example_tree)
return_value, stderr, report = exec_pom_macro('%pom_remove_dep -r :junit intermediate common',
poms_tree=poms_tree,
want_tree={'intermediate/schemas': 'example_schemas_removed_junit.xml',
@@ -178,7 +178,7 @@ class TestRecursive(WorkdirTestCase):
def test_recursive_partial_match(self):
return_value, stderr, _ = exec_pom_macro('%pom_remove_dep -r commons-ioX intermediate common',
- poms_tree=self.example_tree)
+ poms_tree=example_tree)
assertIn(self, "Error", stderr)
assertIn(self, "not found", stderr)
self.assertNotEqual(0, return_value)
@@ -186,7 +186,7 @@ class TestRecursive(WorkdirTestCase):
def test_recursive_partial_match_forced(self):
return_value, stderr, report = exec_pom_macro(\
'%pom_remove_dep -rf commons-ioX:commons-io intermediate common',
- poms_tree=self.example_tree,
+ poms_tree=example_tree,
want_tree={'common': 'example_common_removed_commons_iox.xml'})
self.assertEqual(0, return_value, stderr)
self.assertEqual('', report, report)
9 years, 9 months
[javapackages] [metadata.dependency] Remove is_compat()
by Michal Srb
commit 80a94d05b7dd59b2397da47dd6aca62cc12e350d
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu Jul 3 08:44:09 2014 +0200
[metadata.dependency] Remove is_compat()
It is copy/paste leftover from MetadataArtifact class
python/javapackages/metadata/dependency.py | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/python/javapackages/metadata/dependency.py b/python/javapackages/metadata/dependency.py
index b8a434e..2cdcca5 100644
--- a/python/javapackages/metadata/dependency.py
+++ b/python/javapackages/metadata/dependency.py
@@ -22,11 +22,6 @@ class MetadataDependency(object):
self.resolvedVersion = resolvedVersion
self.exclusions = exclusions or set()
- def is_compat(self):
- """Return true if this is a dependency on compat package"""
-
- return self.compatVersions
-
def get_mvn_str(self):
return Printer.get_mvn_str(self.groupId, self.artifactId,
self.extension, self.classifier,
9 years, 9 months
[javapackages] [metadata.dependency] Skip requestedVersion in resulting metadata XML, if it's not specified
by Michal Srb
commit 85c960ddaf45a597e0c64b73fc8dde92148bd4e6
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu Jul 3 08:41:04 2014 +0200
[metadata.dependency] Skip requestedVersion in resulting metadata XML, if it's not specified
python/javapackages/metadata/dependency.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/python/javapackages/metadata/dependency.py b/python/javapackages/metadata/dependency.py
index a588e6f..b8a434e 100644
--- a/python/javapackages/metadata/dependency.py
+++ b/python/javapackages/metadata/dependency.py
@@ -63,7 +63,7 @@ class MetadataDependency(object):
d = m.Dependency()
d.groupId = self.groupId
d.artifactId = self.artifactId
- d.requestedVersion = self.requestedVersion
+ d.requestedVersion = self.requestedVersion or None
d.resolvedVersion = self.resolvedVersion
d.classifier = self.classifier or None
d.extension = self.extension or None
9 years, 9 months
[javapackages] [metadata.dependency] Do not fail if requestedVersion is not in metadata, it's optional now
by Michal Srb
commit 4b24185851079d435606c2f58125f50009f95c70
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu Jul 3 08:36:44 2014 +0200
[metadata.dependency] Do not fail if requestedVersion is not in metadata, it's optional now
python/javapackages/metadata/dependency.py | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/python/javapackages/metadata/dependency.py b/python/javapackages/metadata/dependency.py
index a132c65..a588e6f 100644
--- a/python/javapackages/metadata/dependency.py
+++ b/python/javapackages/metadata/dependency.py
@@ -82,9 +82,10 @@ class MetadataDependency(object):
def from_metadata(cls, metadata):
groupId = metadata.groupId.strip()
artifactId = metadata.artifactId.strip()
- requestedVersion = metadata.requestedVersion.strip()
- resolvedVersion = extension = classifier = namespace = ""
+ requestedVersion = resolvedVersion = extension = classifier = namespace = ""
+ if hasattr(metadata, 'requestedVersion') and metadata.requestedVersion:
+ requestedVersion = metadata.requestedVersion.strip()
if hasattr(metadata, 'resolvedVersion') and metadata.resolvedVersion:
resolvedVersion = metadata.resolvedVersion.strip()
if hasattr(metadata, 'extension') and metadata.extension:
9 years, 9 months
[javapackages] [osgi.req] Ignore symlinks in buildroot
by Michal Srb
commit 09fc46c716559b59364caec9c2986ca4f8e8e2a4
Author: Michal Srb <msrb(a)redhat.com>
Date: Wed Jul 2 17:02:37 2014 +0200
[osgi.req] Ignore symlinks in buildroot
depgenerators/osgi.req | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/depgenerators/osgi.req b/depgenerators/osgi.req
index 3715f96..6f70282 100755
--- a/depgenerators/osgi.req
+++ b/depgenerators/osgi.req
@@ -73,6 +73,8 @@ class TagBuilder(object):
def _check_path(path):
+ if os.path.islink(path):
+ return False
if path.endswith(".jar"):
return True
if path.endswith("/MANIFEST.MF"):
9 years, 9 months
[javapackages] [mvn_artifact] Try to resolve dependencies only once
by Michal Srb
commit 55bd933299e2038cea05bab13d6d399c5fd10e72
Author: Michal Srb <msrb(a)redhat.com>
Date: Wed Jul 2 16:10:54 2014 +0200
[mvn_artifact] Try to resolve dependencies only once
java-utils/mvn_artifact.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/java-utils/mvn_artifact.py b/java-utils/mvn_artifact.py
index 68d9275..565f311 100644
--- a/java-utils/mvn_artifact.py
+++ b/java-utils/mvn_artifact.py
@@ -318,10 +318,10 @@ if __name__ == "__main__":
if deps[-1].requestedVersion == "":
deps[-1].requestedVersion = "SYSTEM"
- unavail = resolve_deps(deps)
- if unavail:
- unavail_str = ';'.join([x.get_mvn_str() for x in unavail])
- art.properties['maven.req.check.deps'] = unavail_str
+ unavail = resolve_deps(deps)
+ if unavail:
+ unavail_str = ';'.join([x.get_mvn_str() for x in unavail])
+ art.properties['maven.req.check.deps'] = unavail_str
art.dependencies = set(deps)
else:
art.properties['xmvn.resolver.disableEffectivePom'] = 'true'
9 years, 9 months
[javapackages] [mvn_artifact] Set requestedVersion to "SYSTEM" if not specified otherwise
by Michal Srb
commit 6a980898f20813510ca5e2a711d71587a3c73e15
Author: Michal Srb <msrb(a)redhat.com>
Date: Wed Jul 2 16:08:34 2014 +0200
[mvn_artifact] Set requestedVersion to "SYSTEM" if not specified otherwise
java-utils/mvn_artifact.py | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/java-utils/mvn_artifact.py b/java-utils/mvn_artifact.py
index 5af647b..68d9275 100644
--- a/java-utils/mvn_artifact.py
+++ b/java-utils/mvn_artifact.py
@@ -315,6 +315,9 @@ if __name__ == "__main__":
mvn_deps = gather_dependencies(pom_path)
for d in mvn_deps:
deps.append(MetadataDependency.from_mvn_dependency(d))
+ if deps[-1].requestedVersion == "":
+ deps[-1].requestedVersion = "SYSTEM"
+
unavail = resolve_deps(deps)
if unavail:
unavail_str = ';'.join([x.get_mvn_str() for x in unavail])
9 years, 9 months