[javapackages] Adapt to strutils changes
by Michal Srb
commit dca4acc305392da0828db11c24be706ecc97c027
Author: Michal Srb <msrb(a)redhat.com>
Date: Sat May 2 13:29:23 2015 +0200
Adapt to strutils changes
depgenerators/maven.prov | 2 +-
depgenerators/maven.req | 8 ++++----
java-utils/builddep.py | 2 +-
python/javapackages/common/osgi.py | 4 ++--
python/javapackages/common/util.py | 6 ------
python/javapackages/maven/artifact.py | 9 ++++-----
python/javapackages/metadata/alias.py | 2 +-
python/javapackages/metadata/artifact.py | 16 ++++++++--------
python/javapackages/metadata/dependency.py | 8 ++++----
python/javapackages/metadata/exclusion.py | 2 +-
python/javapackages/metadata/skippedartifact.py | 2 +-
11 files changed, 27 insertions(+), 34 deletions(-)
---
diff --git a/depgenerators/maven.prov b/depgenerators/maven.prov
index 3d2546d..4da95b9 100755
--- a/depgenerators/maven.prov
+++ b/depgenerators/maven.prov
@@ -58,7 +58,7 @@ class TagBuilder:
provides = set()
for artifact in metadata.artifacts:
provides.add(artifact.get_rpm_str(namespace=artifact.namespace,
- pkgver=artifact.version))
+ pkg_ver=artifact.version))
# print OSGi provides from metadata
osgi_provides = metadata.get_osgi_provides()
for p in osgi_provides:
diff --git a/depgenerators/maven.req b/depgenerators/maven.req
index 39a56db..9409de8 100755
--- a/depgenerators/maven.req
+++ b/depgenerators/maven.req
@@ -142,7 +142,7 @@ class TagBuilder(object):
# check if dependency is NOT provided by currently
# processed subpackage
if not dep.is_provided_by(metadata.artifacts)[0]:
- req_str = dep.get_rpm_str(pkgver=dver,
+ req_str = dep.get_rpm_str(pkg_ver=dver,
namespace=artifact.namespace)
pom_requires.add(req_str)
elif r:
@@ -197,12 +197,12 @@ class TagBuilder(object):
if not dependency.is_provided_by(metadata.artifacts)[0]:
# requires on subpackages are always versioned
rpmstr = dependency.get_rpm_str(namespace=dependency.namespace,
- compat=dependency.resolvedVersion,
- pkgver=pkgver)
+ compat_ver=dependency.resolvedVersion,
+ pkg_ver=pkgver)
requires.add(rpmstr)
else:
rpmstr = dependency.get_rpm_str(namespace=dependency.namespace,
- compat=dependency.resolvedVersion)
+ compat_ver=dependency.resolvedVersion)
requires.add(rpmstr)
if unknown_deps:
diff --git a/java-utils/builddep.py b/java-utils/builddep.py
index e8de664..fda36d2 100644
--- a/java-utils/builddep.py
+++ b/java-utils/builddep.py
@@ -64,7 +64,7 @@ if __name__ == "__main__":
deps = et.findall('./dependency')
for dep in deps:
art = Artifact.from_xml_element(dep)
- print(art.get_rpm_str(compat=art.version))
+ print(art.get_rpm_str(compat_ver=art.version))
except (ArtifactValidationException, ArtifactFormatException) as e:
parser.error("{e}: Provided artifact strings were invalid. "
"Please see help and check your arguments".format(e=e))
diff --git a/python/javapackages/common/osgi.py b/python/javapackages/common/osgi.py
index 6e8ff26..9f9bac7 100644
--- a/python/javapackages/common/osgi.py
+++ b/python/javapackages/common/osgi.py
@@ -35,7 +35,7 @@
import re
from javapackages.common.manifest import Manifest, ManifestException
-from javapackages.common.util import sanitize_version
+from javapackages.common.strutils import _sanitize_version
class OSGiUtils(object):
@@ -43,7 +43,7 @@ class OSGiUtils(object):
@staticmethod
def get_rpm_str(bundle, version="", namespace=""):
ns = namespace or ""
- version = sanitize_version(version)
+ version = _sanitize_version(version)
return "{ns}{d}osgi({bundle}){eq}{version}".format(ns=ns,
d="-" if ns else "",
bundle=bundle,
diff --git a/python/javapackages/common/util.py b/python/javapackages/common/util.py
index f31d5ee..add1322 100644
--- a/python/javapackages/common/util.py
+++ b/python/javapackages/common/util.py
@@ -116,9 +116,3 @@ def get_logger(name):
handler.setFormatter(formatter)
logger.addHandler(handler)
return logger
-
-
-def sanitize_version(version):
- if version:
- return version.replace("-", ".")
- return ""
diff --git a/python/javapackages/maven/artifact.py b/python/javapackages/maven/artifact.py
index ea5fbdd..e85eeba 100644
--- a/python/javapackages/maven/artifact.py
+++ b/python/javapackages/maven/artifact.py
@@ -36,7 +36,7 @@ import re
import six
import javapackages.maven.pomreader as POMReader
-import javapackages.maven.printer as Printer
+import javapackages.common.strutils as Printer
from javapackages.common.exception import JavaPackagesToolsException
from lxml.etree import Element, SubElement, tostring
@@ -63,16 +63,15 @@ class AbstractArtifact(object):
cla=m['classifier'],
ver=m['version'])
- def get_rpm_str(self, namespace="", compat=None, pkgver=None):
+ def get_rpm_str(self, namespace=None, compat_ver=None, pkg_ver=None):
m = self.__get_members()
return Printer.get_rpm_str(m['groupId'],
m['artifactId'],
ext=m['extension'],
cla=m['classifier'],
- ver=m['version'],
namespace=namespace,
- compat=compat,
- pkgver=pkgver)
+ compat_ver=compat_ver,
+ pkg_ver=pkg_ver)
@staticmethod
def get_parts_from_mvn_str(mvnstr):
diff --git a/python/javapackages/metadata/alias.py b/python/javapackages/metadata/alias.py
index eb6f5b0..90a3622 100644
--- a/python/javapackages/metadata/alias.py
+++ b/python/javapackages/metadata/alias.py
@@ -32,7 +32,7 @@
# Authors: Michal Srb <msrb(a)redhat.com>
from javapackages.maven.artifact import Artifact
-import javapackages.maven.printer as Printer
+import javapackages.common.strutils as Printer
from javapackages.common.binding import ObjectBinding
diff --git a/python/javapackages/metadata/artifact.py b/python/javapackages/metadata/artifact.py
index 958d28e..3593d76 100644
--- a/python/javapackages/metadata/artifact.py
+++ b/python/javapackages/metadata/artifact.py
@@ -35,7 +35,7 @@ import javapackages.common.config as config
from javapackages.common.osgi import OSGiBundle
from javapackages.maven.artifact import Artifact
from javapackages.maven.pom import POM
-import javapackages.maven.printer as Printer
+import javapackages.common.strutils as Printer
from javapackages.metadata.alias import MetadataAlias
from javapackages.metadata.dependency import MetadataDependency
@@ -90,7 +90,7 @@ class MetadataArtifact(ObjectBinding):
cla=self.classifier,
ver=self.version)
- def get_rpm_str(self, namespace="", pkgver=None):
+ def get_rpm_str(self, namespace=None, pkg_ver=None):
result = []
if not self.is_compat():
@@ -100,7 +100,7 @@ class MetadataArtifact(ObjectBinding):
ext=self.extension,
cla=self.classifier,
namespace=namespace,
- pkgver=pkgver))
+ pkg_ver=pkg_ver))
# non-compat rpm string(s) for aliases
for alias in self.aliases:
@@ -109,7 +109,7 @@ class MetadataArtifact(ObjectBinding):
ext=alias.extension,
cla=alias.classifier,
namespace=namespace,
- pkgver=pkgver))
+ pkg_ver=pkg_ver))
else:
# compat rpm string(s) for main artifact
for compat_ver in self.compatVersions:
@@ -117,9 +117,9 @@ class MetadataArtifact(ObjectBinding):
self.artifactId,
ext=self.extension,
cla=self.classifier,
- compat=compat_ver,
+ compat_ver=compat_ver,
namespace=namespace,
- pkgver=pkgver))
+ pkg_ver=pkg_ver))
# compat rpm string(s) for aliases
for alias in self.aliases:
@@ -127,9 +127,9 @@ class MetadataArtifact(ObjectBinding):
alias.artifactId,
ext=alias.extension,
cla=alias.classifier,
- compat=compat_ver,
+ compat_ver=compat_ver,
namespace=namespace,
- pkgver=pkgver))
+ pkg_ver=pkg_ver))
return "\n".join(result)
def __unicode__(self):
diff --git a/python/javapackages/metadata/dependency.py b/python/javapackages/metadata/dependency.py
index fa66257..8f843af 100644
--- a/python/javapackages/metadata/dependency.py
+++ b/python/javapackages/metadata/dependency.py
@@ -32,7 +32,7 @@
# Authors: Michal Srb <msrb(a)redhat.com>
from javapackages.maven.artifact import Artifact
-import javapackages.maven.printer as Printer
+import javapackages.common.strutils as Printer
from javapackages.metadata.exclusion import MetadataExclusion
from javapackages.common.binding import ObjectBinding
@@ -62,14 +62,14 @@ class MetadataDependency(ObjectBinding):
cla=self.classifier,
ver=self.requestedVersion)
- def get_rpm_str(self, namespace="", compat=None, pkgver=None):
+ def get_rpm_str(self, namespace=None, compat_ver=None, pkg_ver=None):
return Printer.get_rpm_str(self.groupId,
self.artifactId,
ext=self.extension,
cla=self.classifier,
namespace=namespace or self.namespace,
- compat=compat or self.resolvedVersion,
- pkgver=pkgver)
+ compat_ver=compat_ver or self.resolvedVersion,
+ pkg_ver=pkg_ver)
def is_provided_by(self, artifacts):
for provided in artifacts:
diff --git a/python/javapackages/metadata/exclusion.py b/python/javapackages/metadata/exclusion.py
index 286c8b7..3152b09 100644
--- a/python/javapackages/metadata/exclusion.py
+++ b/python/javapackages/metadata/exclusion.py
@@ -32,7 +32,7 @@
# Authors: Michal Srb <msrb(a)redhat.com>
from javapackages.maven.artifact import Artifact
-import javapackages.maven.printer as Printer
+import javapackages.common.strutils as Printer
from javapackages.common.binding import ObjectBinding
diff --git a/python/javapackages/metadata/skippedartifact.py b/python/javapackages/metadata/skippedartifact.py
index 640689f..84d3915 100644
--- a/python/javapackages/metadata/skippedartifact.py
+++ b/python/javapackages/metadata/skippedartifact.py
@@ -32,7 +32,7 @@
# Authors: Michal Srb <msrb(a)redhat.com>
from javapackages.maven.artifact import Artifact
-import javapackages.maven.printer as Printer
+import javapackages.common.strutils as Printer
from javapackages.common.binding import ObjectBinding
8 years, 11 months
[javapackages] [test] Add unit tests for strutils
by Michal Srb
commit dd9f87b27312de35b7322a245c1bde78f13ab373
Author: Michal Srb <msrb(a)redhat.com>
Date: Sat May 2 12:38:16 2015 +0200
[test] Add unit tests for strutils
python/test/strutils_test.py | 54 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 deletions(-)
---
diff --git a/python/test/strutils_test.py b/python/test/strutils_test.py
new file mode 100644
index 0000000..c18881f
--- /dev/null
+++ b/python/test/strutils_test.py
@@ -0,0 +1,54 @@
+import unittest
+
+from javapackages.common.strutils import get_mvn_str, get_rpm_str
+
+
+class TestStrUtils(unittest.TestCase):
+
+ def test_get_mvn_str(self):
+ s = get_mvn_str("g", "a")
+ self.assertEqual("g:a", s)
+ s = get_mvn_str("g", "a", ext="jar")
+ self.assertEqual("g:a", s)
+ s = get_mvn_str("g", "a", ext="hpi")
+ self.assertEqual("g:a:hpi:", s)
+ s = get_mvn_str("g", "a", cla="test")
+ self.assertEqual("g:a::test:", s)
+ s = get_mvn_str("g", "a", ver="1.0")
+ self.assertEqual("g:a:1.0", s)
+ s = get_mvn_str("g", "a", ext="zip", cla="sources", ver="2")
+ self.assertEqual("g:a:zip:sources:2", s)
+
+ def test_get_rpm_str_basic(self):
+ s = get_rpm_str("g", "a")
+ self.assertEqual("mvn(g:a)", s)
+ s = get_rpm_str("g", "a", ext="jar")
+ self.assertEqual("mvn(g:a)", s)
+ s = get_rpm_str("g", "a", ext="hpi")
+ self.assertEqual("mvn(g:a:hpi:)", s)
+ s = get_rpm_str("g", "a", cla="test")
+ self.assertEqual("mvn(g:a::test:)", s)
+
+ def test_get_rpm_str_compat(self):
+ s = get_rpm_str("g", "a", compat_ver="1.0")
+ self.assertEqual("mvn(g:a:1.0)", s)
+ s = get_rpm_str("g", "a", compat_ver="1-SNAPSHOT")
+ self.assertEqual("mvn(g:a:1-SNAPSHOT)", s)
+ s = get_rpm_str("g", "a", ext="zip", compat_ver="1.0")
+ self.assertEqual("mvn(g:a:zip:1.0)", s)
+
+ def test_get_rpm_str_versioned(self):
+ s = get_rpm_str("g", "a", pkg_ver="1.0")
+ self.assertEqual("mvn(g:a) = 1.0", s)
+ s = get_rpm_str("g", "a", pkg_ver="1-SNAPSHOT")
+ self.assertEqual("mvn(g:a) = 1.SNAPSHOT", s)
+ s = get_rpm_str("g", "a", ext="zip", pkg_ver="1.0")
+ self.assertEqual("mvn(g:a:zip:) = 1.0", s)
+
+ def test_get_rpm_str_namespace(self):
+ s = get_rpm_str("g", "a", namespace="ns1")
+ self.assertEqual("ns1-mvn(g:a)", s)
+
+
+if __name__ == '__main__':
+ unittest.main()
8 years, 11 months
[javapackages] Move .maven.printer to .common.strutils and document it
by Michal Srb
commit 6647cee149edc2786f66f5552eea9697546efe48
Author: Michal Srb <msrb(a)redhat.com>
Date: Sat May 2 12:17:36 2015 +0200
Move .maven.printer to .common.strutils and document it
.../{maven/printer.py => common/strutils.py} | 61 ++++++++++++++++---
1 files changed, 51 insertions(+), 10 deletions(-)
---
diff --git a/python/javapackages/maven/printer.py b/python/javapackages/common/strutils.py
similarity index 55%
rename from python/javapackages/maven/printer.py
rename to python/javapackages/common/strutils.py
index 564279f..a76fbe2 100644
--- a/python/javapackages/maven/printer.py
+++ b/python/javapackages/common/strutils.py
@@ -31,12 +31,23 @@
#
# Authors: Michal Srb <msrb(a)redhat.com>
-from javapackages.common.util import sanitize_version
+def get_mvn_str(gid, aid, ext=None, cla=None, ver=None):
+ """Construct and return Maven coordinates.
+
+ At least groupId (gid) and artifactId (aid) needs to be provided.
+
+ >>> get_mvn_str("org.example", "artifact")
+ 'org.example:artifact'
+ >>> get_mvn_str("org.example", "artifact", ver="1")
+ 'org.example:artifact:1'
+ >>> get_mvn_str("org.example", "artifact", cla="test")
+ 'org.example:artifact::test:'
+ """
-def get_mvn_str(gid, aid, ext="", cla="", ver=""):
mvnstr = "{gid}:{aid}".format(gid=gid, aid=aid)
+ # "jar" is a default extension in Maven world, we can omit it
if ext == "jar":
ext = ""
@@ -56,19 +67,49 @@ def get_mvn_str(gid, aid, ext="", cla="", ver=""):
return mvnstr
-def get_rpm_str(gid, aid, ext="", cla="", ver="", namespace="",
- compat=None, pkgver=None):
- # TODO: "ver" is never used, get rid of it?
+def get_rpm_str(gid, aid, ext=None, cla=None, namespace=None,
+ compat_ver=None, pkg_ver=None):
+ """Construct and return string representing RPM's "virtual provide"
+ of a given Maven artifact.
+
+ >>> get_rpm_str("org.example", "artifact")
+ 'mvn(org.example:artifact)'
+ >>> get_rpm_str("org.example", "artifact", pkg_ver="1")
+ 'mvn(org.example:artifact) = 1'
+ >>> get_rpm_str("org.example", "artifact", namespace="scl", compat_ver="1")
+ 'scl-mvn(org.example:artifact:1)'
+ """
mvnstr = get_mvn_str(gid, aid, ext=ext, cla=cla,
- ver=compat if compat is not None else "")
+ ver=compat_ver if compat_ver is not None else None)
rpmstr = "mvn({mvnstr})".format(mvnstr=mvnstr)
if namespace:
- rpmstr = "{ns}-{rpmstr}".format(ns=namespace, rpmstr=rpmstr)
+ rpmstr = "{ns}-".format(ns=namespace) + rpmstr
- if pkgver is not None:
- pkgver = sanitize_version(pkgver)
- rpmstr = "{rpmstr} = {ver}".format(rpmstr=rpmstr, ver=pkgver)
+ if pkg_ver:
+ pkg_ver = _sanitize_version(pkg_ver)
+ rpmstr = rpmstr + " = {ver}".format(ver=pkg_ver)
return rpmstr
+
+
+def _sanitize_version(ver):
+ """Sanitize version so it can be properly handled by YUM/DNF.
+
+ RPM package managers seem to have a problem with versioned "Provides"
+ containing dashes, e.g. "mvn(g:a) = 1.0-SNAPSHOT".
+
+ >>> _sanitize_version("1.0-SNAPSHOT")
+ '1.0.SNAPSHOT'
+ >>> _sanitize_version("1.0")
+ '1.0'
+ """
+ if ver:
+ return ver.replace("-", ".")
+ return ""
+
+
+if __name__ == "__main__":
+ import doctest
+ doctest.testmod()
8 years, 11 months
[javapackages] Call get_*_str() with named args
by Michal Srb
commit 0164e5a2535f81334ed57c5b691629ba87acf5c7
Author: Michal Srb <msrb(a)redhat.com>
Date: Sat May 2 10:11:31 2015 +0200
Call get_*_str() with named args
python/javapackages/maven/artifact.py | 22 +++++++----
python/javapackages/maven/printer.py | 5 ++-
python/javapackages/metadata/alias.py | 6 ++-
python/javapackages/metadata/artifact.py | 45 ++++++++++++++++-------
python/javapackages/metadata/dependency.py | 20 ++++++----
python/javapackages/metadata/skippedartifact.py | 6 ++-
6 files changed, 69 insertions(+), 35 deletions(-)
---
diff --git a/python/javapackages/maven/artifact.py b/python/javapackages/maven/artifact.py
index 1246cc6..ea5fbdd 100644
--- a/python/javapackages/maven/artifact.py
+++ b/python/javapackages/maven/artifact.py
@@ -57,16 +57,22 @@ class AbstractArtifact(object):
def get_mvn_str(self):
m = self.__get_members()
- return Printer.get_mvn_str(m['groupId'], m['artifactId'],
- m['extension'], m['classifier'],
- m['version'])
+ return Printer.get_mvn_str(m['groupId'],
+ m['artifactId'],
+ ext=m['extension'],
+ cla=m['classifier'],
+ ver=m['version'])
- def get_rpm_str(self, namespace="", compat=False, pkgver=None):
+ def get_rpm_str(self, namespace="", compat=None, pkgver=None):
m = self.__get_members()
- return Printer.get_rpm_str(m['groupId'], m['artifactId'],
- m['extension'], m['classifier'],
- m['version'], namespace=namespace,
- compat=compat, pkgver=pkgver)
+ return Printer.get_rpm_str(m['groupId'],
+ m['artifactId'],
+ ext=m['extension'],
+ cla=m['classifier'],
+ ver=m['version'],
+ namespace=namespace,
+ compat=compat,
+ pkgver=pkgver)
@staticmethod
def get_parts_from_mvn_str(mvnstr):
diff --git a/python/javapackages/maven/printer.py b/python/javapackages/maven/printer.py
index e2abaa4..564279f 100644
--- a/python/javapackages/maven/printer.py
+++ b/python/javapackages/maven/printer.py
@@ -58,9 +58,10 @@ def get_mvn_str(gid, aid, ext="", cla="", ver=""):
def get_rpm_str(gid, aid, ext="", cla="", ver="", namespace="",
compat=None, pkgver=None):
+ # TODO: "ver" is never used, get rid of it?
- mvnstr = get_mvn_str(gid, aid, ext, cla,
- compat if compat is not None else "")
+ mvnstr = get_mvn_str(gid, aid, ext=ext, cla=cla,
+ ver=compat if compat is not None else "")
rpmstr = "mvn({mvnstr})".format(mvnstr=mvnstr)
if namespace:
diff --git a/python/javapackages/metadata/alias.py b/python/javapackages/metadata/alias.py
index 9903109..eb6f5b0 100644
--- a/python/javapackages/metadata/alias.py
+++ b/python/javapackages/metadata/alias.py
@@ -43,8 +43,10 @@ class MetadataAlias(ObjectBinding):
defaults = {'extension': 'jar'}
def get_mvn_str(self):
- return Printer.get_mvn_str(self.groupId, self.artifactId,
- self.extension, self.classifier)
+ return Printer.get_mvn_str(self.groupId,
+ self.artifactId,
+ ext=self.extension,
+ cla=self.classifier)
@classmethod
def from_mvn_str(cls, mvn_str):
diff --git a/python/javapackages/metadata/artifact.py b/python/javapackages/metadata/artifact.py
index c83cca2..958d28e 100644
--- a/python/javapackages/metadata/artifact.py
+++ b/python/javapackages/metadata/artifact.py
@@ -60,7 +60,7 @@ class MetadataArtifact(ObjectBinding):
def __init__(self, *args, **kwargs):
super(MetadataArtifact, self).__init__(*args, **kwargs)
for alias in self.aliases:
- if not 'extension' in alias and 'extension' in self:
+ if 'extension' not in alias and 'extension' in self:
alias.extension = self.extension
def is_compat(self):
@@ -84,33 +84,52 @@ class MetadataArtifact(ObjectBinding):
return os.path.join(prefix, self.path[1:])
def get_mvn_str(self):
- return Printer.get_mvn_str(self.groupId, self.artifactId,
- self.extension, self.classifier,
- self.version)
+ return Printer.get_mvn_str(self.groupId,
+ self.artifactId,
+ ext=self.extension,
+ cla=self.classifier,
+ ver=self.version)
def get_rpm_str(self, namespace="", pkgver=None):
result = []
if not self.is_compat():
# non-compat rpm string for main artifact
- result.append(Printer.get_rpm_str(self.groupId, self.artifactId,
- self.extension, self.classifier, namespace=namespace, pkgver=pkgver))
+ result.append(Printer.get_rpm_str(self.groupId,
+ self.artifactId,
+ ext=self.extension,
+ cla=self.classifier,
+ namespace=namespace,
+ pkgver=pkgver))
# non-compat rpm string(s) for aliases
for alias in self.aliases:
- result.append(Printer.get_rpm_str(alias.groupId, alias.artifactId, alias.extension,
- alias.classifier, namespace=namespace, pkgver=pkgver))
+ result.append(Printer.get_rpm_str(alias.groupId,
+ alias.artifactId,
+ ext=alias.extension,
+ cla=alias.classifier,
+ namespace=namespace,
+ pkgver=pkgver))
else:
# compat rpm string(s) for main artifact
for compat_ver in self.compatVersions:
- result.append(Printer.get_rpm_str(self.groupId, self.artifactId, self.extension, self.classifier,
- compat=compat_ver, namespace=namespace, pkgver=pkgver))
+ result.append(Printer.get_rpm_str(self.groupId,
+ self.artifactId,
+ ext=self.extension,
+ cla=self.classifier,
+ compat=compat_ver,
+ namespace=namespace,
+ pkgver=pkgver))
# compat rpm string(s) for aliases
for alias in self.aliases:
- result.append(Printer.get_rpm_str(alias.groupId, alias.artifactId, alias.extension,
- alias.classifier, compat=compat_ver,
- namespace=namespace, pkgver=pkgver))
+ result.append(Printer.get_rpm_str(alias.groupId,
+ alias.artifactId,
+ ext=alias.extension,
+ cla=alias.classifier,
+ compat=compat_ver,
+ namespace=namespace,
+ pkgver=pkgver))
return "\n".join(result)
def __unicode__(self):
diff --git a/python/javapackages/metadata/dependency.py b/python/javapackages/metadata/dependency.py
index ef5511b..fa66257 100644
--- a/python/javapackages/metadata/dependency.py
+++ b/python/javapackages/metadata/dependency.py
@@ -39,6 +39,7 @@ from javapackages.common.binding import ObjectBinding
import six
+
class MetadataDependency(ObjectBinding):
element_name = 'dependency'
fields = ['groupId', 'artifactId', 'extension', 'classifier',
@@ -46,7 +47,7 @@ class MetadataDependency(ObjectBinding):
'resolvedVersion', 'exclusions']
defaults = {'extension': 'jar',
'requestedVersion': 'SYSTEM'}
- types = {'optional': str, # todo bool
+ types = {'optional': str, # todo bool
'exclusions': set([MetadataExclusion])}
def is_optional(self):
@@ -55,14 +56,17 @@ class MetadataDependency(ObjectBinding):
return False
def get_mvn_str(self):
- return Printer.get_mvn_str(self.groupId, self.artifactId,
- self.extension, self.classifier,
- self.requestedVersion)
-
- def get_rpm_str(self, namespace="", compat=False, pkgver=None):
- return Printer.get_rpm_str(self.groupId, self.artifactId,
- self.extension, self.classifier,
- self.requestedVersion,
+ return Printer.get_mvn_str(self.groupId,
+ self.artifactId,
+ ext=self.extension,
+ cla=self.classifier,
+ ver=self.requestedVersion)
+
+ def get_rpm_str(self, namespace="", compat=None, pkgver=None):
+ return Printer.get_rpm_str(self.groupId,
+ self.artifactId,
+ ext=self.extension,
+ cla=self.classifier,
namespace=namespace or self.namespace,
compat=compat or self.resolvedVersion,
pkgver=pkgver)
diff --git a/python/javapackages/metadata/skippedartifact.py b/python/javapackages/metadata/skippedartifact.py
index fcf876a..640689f 100644
--- a/python/javapackages/metadata/skippedartifact.py
+++ b/python/javapackages/metadata/skippedartifact.py
@@ -43,8 +43,10 @@ class MetadataSkippedArtifact(ObjectBinding):
defaults = {'extension': 'jar'}
def get_mvn_str(self):
- return Printer.get_mvn_str(self.groupId, self.artifactId,
- self.extension, self.classifier)
+ return Printer.get_mvn_str(self.groupId,
+ self.artifactId,
+ ext=self.extension,
+ cla=self.classifier)
@classmethod
def from_mvn_str(cls, mvn_str):
8 years, 11 months
[Bug 1207850] New: mvnDebug should be installed in /usr/bin/
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1207850
Bug ID: 1207850
Summary: mvnDebug should be installed in /usr/bin/
Product: Fedora
Version: 21
Component: maven
Assignee: mizdebsk(a)redhat.com
Reporter: thomas.mey(a)web.de
QA Contact: extras-qa(a)fedoraproject.org
CC: akurtako(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org,
mizdebsk(a)redhat.com, msimacek(a)redhat.com,
msrb(a)redhat.com
Description of problem:
mvn will be installed on the standard path /usr/bin/, but
mvnDebug not. mvnDebug will only be installed in /usr/share/maven/bin/mvnDebug.
To use it, every user needs to add this path to it's path list.
Please install mvnDebug also in /usr/bin/
Version-Release number of selected component (if applicable):
How reproducible:
Steps to Reproduce:
1.
2.
3.
Actual results:
Expected results:
Additional info:
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=MC2jKhT6Pk&a=cc_unsubscribe
8 years, 11 months
[Bug 1217306] New: objenesis: update to 2.1
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1217306
Bug ID: 1217306
Summary: objenesis: update to 2.1
Product: Fedora
Version: rawhide
Component: objenesis
Assignee: guido.grazioli(a)gmail.com
Reporter: msrb(a)redhat.com
QA Contact: extras-qa(a)fedoraproject.org
CC: guido.grazioli(a)gmail.com,
java-sig-commits(a)lists.fedoraproject.org,
jvanek(a)redhat.com, mizdebsk(a)redhat.com,
mmraka(a)redhat.com
Description of problem:
objenesis 1.2 in Fedora is quite old, it was released in 2010. There is a "new"
upstream version 2.1, released in 2013. Some of the packages, like latest
mockito, require this new version. We should update objenesis package in
Rawhide.
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=amVk1zGLjB&a=cc_unsubscribe
8 years, 11 months
[javapackages] [test] Add test for builddep
by Michal Srb
commit 13e8347293a7ace684f3f75d53c1ce73b26b5b44
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri May 1 21:01:18 2015 +0200
[test] Add test for builddep
test/builddep/compat | 8 ++++++++
test/builddep_test.py | 19 +++++++++++++++++++
2 files changed, 27 insertions(+), 0 deletions(-)
---
diff --git a/test/builddep/compat b/test/builddep/compat
new file mode 100644
index 0000000..b393898
--- /dev/null
+++ b/test/builddep/compat
@@ -0,0 +1,8 @@
+<!-- Build dependencies generated by XMvn -->
+<dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>1.8.9</version>
+ </dependency>
+</dependencies>
diff --git a/test/builddep_test.py b/test/builddep_test.py
new file mode 100644
index 0000000..20aa78c
--- /dev/null
+++ b/test/builddep_test.py
@@ -0,0 +1,19 @@
+import unittest
+from test_common import javautils_script
+
+
+class TestBuilddep(unittest.TestCase):
+
+ cmd = "builddep"
+ p = "../test/builddep/"
+
+ @javautils_script(cmd, [p + "compat"])
+ def test_compat(self, stdout, stderr, return_value):
+ self.assertEqual(return_value, 0)
+ sout = [x for x in stdout.split('\n') if x]
+ want = ("mvn(org.codehaus.groovy:groovy:1.8.9)",)
+ self.assertEqual(set(want), set(sout))
+
+
+if __name__ == '__main__':
+ unittest.main()
8 years, 11 months
[javapackages] [test] Rename xmvnconfig decorator to javautils_script
by Michal Srb
commit e2c52cc9e34310e78f5413a4b462356d46c8f042
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri May 1 21:00:38 2015 +0200
[test] Rename xmvnconfig decorator to javautils_script
test/mvn_alias_test.py | 72 +++++++++++++++++++-------------------
test/mvn_build_test.py | 36 ++++++++++----------
test/mvn_compat_version_test.py | 24 ++++++------
test/mvn_config_test.py | 38 ++++++++++----------
test/mvn_file_test.py | 54 ++++++++++++++--------------
test/mvn_package_test.py | 44 ++++++++++++------------
test/test_common.py | 2 +-
7 files changed, 135 insertions(+), 135 deletions(-)
---
diff --git a/test/mvn_alias_test.py b/test/mvn_alias_test.py
index 5ea367c..b18e5a4 100644
--- a/test/mvn_alias_test.py
+++ b/test/mvn_alias_test.py
@@ -1,7 +1,7 @@
import unittest
import shutil
import os
-from test_common import xmvnconfig, get_config_file_list, \
+from test_common import javautils_script, get_config_file_list, \
get_actual_config, get_expected_config, \
preload_xmvn_config, DIRPATH
@@ -26,16 +26,16 @@ class TestMvnAlias(unittest.TestCase):
pass
os.chdir(self.olddir)
- @xmvnconfig('mvn_alias', [])
+ @javautils_script('mvn_alias', [])
def test_run_no_args(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertEqual("Usage:", stderr[:6])
- @xmvnconfig('mvn_alias', ['-h'])
+ @javautils_script('mvn_alias', ['-h'])
def test_help(self, stdout, stderr, return_value):
self.assertTrue(stdout)
- @xmvnconfig('mvn_alias',['aaa:bbb', 'xxx:yyy', ])
+ @javautils_script('mvn_alias',['aaa:bbb', 'xxx:yyy', ])
def test_simple(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -46,7 +46,7 @@ class TestMvnAlias(unittest.TestCase):
unordered)
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_alias',['aaa:bbb', 'xxx:yyy:1.2', ])
+ @javautils_script('mvn_alias',['aaa:bbb', 'xxx:yyy:1.2', ])
def test_version(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -57,7 +57,7 @@ class TestMvnAlias(unittest.TestCase):
unordered)
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_alias',['aaa:bbb', 'xxx:yyy:zzz:', ])
+ @javautils_script('mvn_alias',['aaa:bbb', 'xxx:yyy:zzz:', ])
def test_extension(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -68,7 +68,7 @@ class TestMvnAlias(unittest.TestCase):
unordered)
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_alias',['aaa:bbb', 'xxx:yyy:zzz:www:', ])
+ @javautils_script('mvn_alias',['aaa:bbb', 'xxx:yyy:zzz:www:', ])
def test_classifier(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -79,7 +79,7 @@ class TestMvnAlias(unittest.TestCase):
unordered)
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_alias',['aaa:bbb:3.1', 'xxx:yyy:zzz:3.0', ])
+ @javautils_script('mvn_alias',['aaa:bbb:3.1', 'xxx:yyy:zzz:3.0', ])
def test_comb1(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -90,7 +90,7 @@ class TestMvnAlias(unittest.TestCase):
unordered)
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_alias',['aaa:bbb:ccc:ddd:2.1', 'xxx:yyy:', ])
+ @javautils_script('mvn_alias',['aaa:bbb:ccc:ddd:2.1', 'xxx:yyy:', ])
def test_comb2(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -101,7 +101,7 @@ class TestMvnAlias(unittest.TestCase):
unordered)
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_alias',['aaa:bbb:ccc:', 'xxx:yyy:zzz:www:2.1', ])
+ @javautils_script('mvn_alias',['aaa:bbb:ccc:', 'xxx:yyy:zzz:www:2.1', ])
def test_comb3(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -112,7 +112,7 @@ class TestMvnAlias(unittest.TestCase):
unordered)
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_alias',['aaa:bbb:ccc:4.1', 'xxx:yyy:zzz:', ])
+ @javautils_script('mvn_alias',['aaa:bbb:ccc:4.1', 'xxx:yyy:zzz:', ])
def test_comb4(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -123,7 +123,7 @@ class TestMvnAlias(unittest.TestCase):
unordered)
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_alias',['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
+ @javautils_script('mvn_alias',['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
'aaaaaaaaaaaaaaaaaaaaa:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb:c' +
'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc' +
'cccccccccc:ddddddddddddddddddddddddddddddddddddddddddddddddddddd' +
@@ -142,7 +142,7 @@ class TestMvnAlias(unittest.TestCase):
unordered)
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_alias',['*:aaa', 'xxx:yyy', ])
+ @javautils_script('mvn_alias',['*:aaa', 'xxx:yyy', ])
def test_wildcard1(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -153,7 +153,7 @@ class TestMvnAlias(unittest.TestCase):
unordered)
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_alias',[':aaa', 'xxx:yyy', ])
+ @javautils_script('mvn_alias',[':aaa', 'xxx:yyy', ])
def test_wildcard2(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -164,7 +164,7 @@ class TestMvnAlias(unittest.TestCase):
unordered)
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_alias',['aaa::ccc', 'xxx:yyy', ])
+ @javautils_script('mvn_alias',['aaa::ccc', 'xxx:yyy', ])
def test_wildcard3(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -175,22 +175,22 @@ class TestMvnAlias(unittest.TestCase):
unordered)
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_alias',['aaa:bbb', ])
+ @javautils_script('mvn_alias',['aaa:bbb', ])
def test_one_argument(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_alias',['aaa:bbb', 'xxx', ])
+ @javautils_script('mvn_alias',['aaa:bbb', 'xxx', ])
def test_invalid1(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_alias',['aaa', 'xxx:yyy', ])
+ @javautils_script('mvn_alias',['aaa', 'xxx:yyy', ])
def test_invalid2(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_alias',['aaa:bbb', 'xxx:', ])
+ @javautils_script('mvn_alias',['aaa:bbb', 'xxx:', ])
def test_wildcard4(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -201,17 +201,17 @@ class TestMvnAlias(unittest.TestCase):
unordered)
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_alias',['a:b:c:d:e:f', 'x:y', ])
+ @javautils_script('mvn_alias',['a:b:c:d:e:f', 'x:y', ])
def test_invalid5(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_alias',['a:b', 'x:y:z:w:1:e', ])
+ @javautils_script('mvn_alias',['a:b', 'x:y:z:w:1:e', ])
def test_invalid6(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_alias',['aaa:bbb', 'ccc:ddd', 'eee:fff', 'ggg:hhh', ])
+ @javautils_script('mvn_alias',['aaa:bbb', 'ccc:ddd', 'eee:fff', 'ggg:hhh', ])
def test_multi(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -222,7 +222,7 @@ class TestMvnAlias(unittest.TestCase):
unordered)
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_alias',['aaa:bbb', 'ccc:ddd', 'eee:fff', ])
+ @javautils_script('mvn_alias',['aaa:bbb', 'ccc:ddd', 'eee:fff', ])
def test_odd(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -233,17 +233,17 @@ class TestMvnAlias(unittest.TestCase):
unordered)
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_alias',[':', ':', ])
+ @javautils_script('mvn_alias',[':', ':', ])
def test_wildcard7(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_alias',['x:y', 'a:b:c:*:1', ])
+ @javautils_script('mvn_alias',['x:y', 'a:b:c:*:1', ])
def test_wildcard8(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_alias',['x:y', 'a:b:c::1', ])
+ @javautils_script('mvn_alias',['x:y', 'a:b:c::1', ])
def test_wildcard9(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -254,7 +254,7 @@ class TestMvnAlias(unittest.TestCase):
unordered)
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_alias',['*:{aaa,bbb}*', ':@1', ])
+ @javautils_script('mvn_alias',['*:{aaa,bbb}*', ':@1', ])
def test_backref(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -265,12 +265,12 @@ class TestMvnAlias(unittest.TestCase):
unordered)
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_alias',['aaa', ':@1', ])
+ @javautils_script('mvn_alias',['aaa', ':@1', ])
def test_backref1(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_alias',['{aa,bb}:{cc,dd}', '@1:@2', ])
+ @javautils_script('mvn_alias',['{aa,bb}:{cc,dd}', '@1:@2', ])
def test_backref2(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -281,28 +281,28 @@ class TestMvnAlias(unittest.TestCase):
unordered)
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_alias',[':{aaa,bbb}', '@1:@2', ])
+ @javautils_script('mvn_alias',[':{aaa,bbb}', '@1:@2', ])
def test_backref3(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_alias',[':{aaa,bbb', '@1', ])
+ @javautils_script('mvn_alias',[':{aaa,bbb', '@1', ])
def test_odd_braces1(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_alias',[':{aaa,bbb}}', '@1', ])
+ @javautils_script('mvn_alias',[':{aaa,bbb}}', '@1', ])
def test_odd_braces2(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_alias',['{aaa:bbb}:ccc', '@1', ])
+ @javautils_script('mvn_alias',['{aaa:bbb}:ccc', '@1', ])
def test_braces(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
# for rhbz#1014301
- @xmvnconfig('mvn_alias',[':{woodstox-core}-asl', '@1-lgpl' ])
+ @javautils_script('mvn_alias',[':{woodstox-core}-asl', '@1-lgpl' ])
def test_rhbz1014301(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertEqual(stderr.count("Artifact string '@1-lgpl' does not "
@@ -310,7 +310,7 @@ class TestMvnAlias(unittest.TestCase):
1)
@preload_xmvn_config('mvn_alias', 'preexisting.xml')
- @xmvnconfig('mvn_alias',['aaa:bbb', 'xxx:yyy', ])
+ @javautils_script('mvn_alias',['aaa:bbb', 'xxx:yyy', ])
def test_preexisting_unindexed(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -324,7 +324,7 @@ class TestMvnAlias(unittest.TestCase):
@preload_xmvn_config('mvn_alias', 'preexisting.xml',
dstname='javapackages-config-00001.xml',
update_index=True)
- @xmvnconfig('mvn_alias',['aaa:bbb', 'xxx:yyy', ])
+ @javautils_script('mvn_alias',['aaa:bbb', 'xxx:yyy', ])
def test_preexisting(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
diff --git a/test/mvn_build_test.py b/test/mvn_build_test.py
index 9cce0d6..cd902f5 100644
--- a/test/mvn_build_test.py
+++ b/test/mvn_build_test.py
@@ -1,7 +1,7 @@
import unittest
import shutil
import os
-from test_common import xmvnconfig, get_actual_args, get_expected_args, \
+from test_common import javautils_script, get_actual_args, get_expected_args, \
get_config_file_list, get_actual_config, get_expected_config, DIRPATH
from xml_compare import compare_xml_files
@@ -22,35 +22,35 @@ class TestMvnBuild(unittest.TestCase):
pass
os.chdir(self.olddir)
- @xmvnconfig('mvn_build', ['-h'])
+ @javautils_script('mvn_build', ['-h'])
def test_help(self, stdout, stderr, return_value):
self.assertTrue(stdout)
- @xmvnconfig('mvn_build',[])
+ @javautils_script('mvn_build',[])
def test_run_no_args(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
self.assertEqual(get_actual_args(),
get_expected_args('mvn_build', 'run_no_args'))
- @xmvnconfig('mvn_build',['-b', ])
+ @javautils_script('mvn_build',['-b', ])
def test_bootstrap(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
self.assertEqual(get_actual_args(),
get_expected_args('mvn_build', 'bootstrap'))
- @xmvnconfig('mvn_build',['-d', ])
+ @javautils_script('mvn_build',['-d', ])
def test_xmvn_debug(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
self.assertEqual(get_actual_args(),
get_expected_args('mvn_build', 'xmvn_debug'))
- @xmvnconfig('mvn_build',['-f', ])
+ @javautils_script('mvn_build',['-f', ])
def test_force(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
self.assertEqual(get_actual_args(),
get_expected_args('mvn_build', 'force'))
- @xmvnconfig('mvn_build',['-f', ])
+ @javautils_script('mvn_build',['-f', ])
def test_force1(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -61,37 +61,37 @@ class TestMvnBuild(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_build',['-g', 'validate'])
+ @javautils_script('mvn_build',['-g', 'validate'])
def test_goal_before(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
self.assertEqual(get_actual_args(),
get_expected_args('mvn_build', 'goal_before'))
- @xmvnconfig('mvn_build',['-G', 'integration-test'])
+ @javautils_script('mvn_build',['-G', 'integration-test'])
def test_goal_after(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
self.assertEqual(get_actual_args(),
get_expected_args('mvn_build', 'goal_after'))
- @xmvnconfig('mvn_build',['-i', ])
+ @javautils_script('mvn_build',['-i', ])
def test_skip_install(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
self.assertEqual(get_actual_args(),
get_expected_args('mvn_build', 'skip_install'))
- @xmvnconfig('mvn_build',['-j', ])
+ @javautils_script('mvn_build',['-j', ])
def test_skip_javadoc(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
self.assertEqual(get_actual_args(),
get_expected_args('mvn_build', 'skip_javadoc'))
- @xmvnconfig('mvn_build',['-s', ])
+ @javautils_script('mvn_build',['-s', ])
def test_singleton(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
self.assertEqual(get_actual_args(),
get_expected_args('mvn_build', 'singleton'))
- @xmvnconfig('mvn_build',['-s', ])
+ @javautils_script('mvn_build',['-s', ])
def test_singleton1(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -102,25 +102,25 @@ class TestMvnBuild(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_build',['-X', ])
+ @javautils_script('mvn_build',['-X', ])
def test_debug(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
self.assertEqual(get_actual_args(),
get_expected_args('mvn_build', 'debug'))
- @xmvnconfig('mvn_build',['-ji', ])
+ @javautils_script('mvn_build',['-ji', ])
def test_skip_both(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
self.assertEqual(get_actual_args(),
get_expected_args('mvn_build', 'skip_both'))
- @xmvnconfig('mvn_build',['-dfijsX', ])
+ @javautils_script('mvn_build',['-dfijsX', ])
def test_all(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
self.assertEqual(get_actual_args(),
get_expected_args('mvn_build', 'all'))
- @xmvnconfig('mvn_build',['-dfijsX', ])
+ @javautils_script('mvn_build',['-dfijsX', ])
def test_all1(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -131,7 +131,7 @@ class TestMvnBuild(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_build',['-g', 'validate', 'compile', '-G',
+ @javautils_script('mvn_build',['-g', 'validate', 'compile', '-G',
'integration-test', 'verify'])
def test_more_goals(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
diff --git a/test/mvn_compat_version_test.py b/test/mvn_compat_version_test.py
index 9f1354d..f665d1c 100644
--- a/test/mvn_compat_version_test.py
+++ b/test/mvn_compat_version_test.py
@@ -1,7 +1,7 @@
import unittest
import shutil
import os
-from test_common import xmvnconfig, get_config_file_list, \
+from test_common import javautils_script, get_config_file_list, \
get_actual_config, get_expected_config, DIRPATH
from xml_compare import compare_xml_files
@@ -23,16 +23,16 @@ class TestMvnCompatVersion(unittest.TestCase):
pass
os.chdir(self.olddir)
- @xmvnconfig('mvn_compat_version', [])
+ @javautils_script('mvn_compat_version', [])
def test_run_no_args(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertEqual("Usage:", stderr[:6])
- @xmvnconfig('mvn_compat_version', ['-h'])
+ @javautils_script('mvn_compat_version', ['-h'])
def test_help(self, stdout, stderr, return_value):
self.assertTrue(stdout)
- @xmvnconfig('mvn_compat_version',['aaa:bbb', '1', ])
+ @javautils_script('mvn_compat_version',['aaa:bbb', '1', ])
def test_simple(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -43,12 +43,12 @@ class TestMvnCompatVersion(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_compat_version',['aaa:bbb', ])
+ @javautils_script('mvn_compat_version',['aaa:bbb', ])
def test_single(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_compat_version',['aaa:bbb', '1', '2', '3', ])
+ @javautils_script('mvn_compat_version',['aaa:bbb', '1', '2', '3', ])
def test_more(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -59,7 +59,7 @@ class TestMvnCompatVersion(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_compat_version',['aaa:bbb:ccc:ddd:1.2', '3.1', ])
+ @javautils_script('mvn_compat_version',['aaa:bbb:ccc:ddd:1.2', '3.1', ])
def test_version(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -70,7 +70,7 @@ class TestMvnCompatVersion(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_compat_version',[':bbb', '2', ])
+ @javautils_script('mvn_compat_version',[':bbb', '2', ])
def test_wildcard(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -82,7 +82,7 @@ class TestMvnCompatVersion(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_compat_version',['aa:bb:{1,2}', '@1', ])
+ @javautils_script('mvn_compat_version',['aa:bb:{1,2}', '@1', ])
def test_backref1(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -94,17 +94,17 @@ class TestMvnCompatVersion(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_compat_version',['aaa:bb:{1,2}', '@3', ])
+ @javautils_script('mvn_compat_version',['aaa:bb:{1,2}', '@3', ])
def test_backref2(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_compat_version',['aaa:bbb:{1,2', '@1', ])
+ @javautils_script('mvn_compat_version',['aaa:bbb:{1,2', '@1', ])
def test_odd_braces1(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_compat_version',['aaa:bbb:1,2}', '@3', ])
+ @javautils_script('mvn_compat_version',['aaa:bbb:1,2}', '@3', ])
def test_odd_braces2(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
diff --git a/test/mvn_config_test.py b/test/mvn_config_test.py
index 9cb21c6..f98d779 100644
--- a/test/mvn_config_test.py
+++ b/test/mvn_config_test.py
@@ -1,7 +1,7 @@
import unittest
import shutil
import os
-from test_common import xmvnconfig, get_config_file_list, \
+from test_common import javautils_script, get_config_file_list, \
get_actual_config, get_expected_config, DIRPATH
from xml_compare import compare_xml_files
@@ -23,26 +23,26 @@ class TestMvnConfig(unittest.TestCase):
pass
os.chdir(self.olddir)
- @xmvnconfig('mvn_config', [])
+ @javautils_script('mvn_config', [])
def test_run_no_args(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertEqual("Usage:", stderr[:6])
- @xmvnconfig('mvn_config', ['-h'])
+ @javautils_script('mvn_config', ['-h'])
def test_help(self, stdout, stderr, return_value):
self.assertTrue(stdout)
- @xmvnconfig('mvn_config',['aaa', ])
+ @javautils_script('mvn_config',['aaa', ])
def test_single(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_config',['a', 'b', 'c', ])
+ @javautils_script('mvn_config',['a', 'b', 'c', ])
def test_more(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_config',['aaa', 'bbb', ])
+ @javautils_script('mvn_config',['aaa', 'bbb', ])
def test_simple(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -53,7 +53,7 @@ class TestMvnConfig(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_config',['a/b/c', 'xxx', ])
+ @javautils_script('mvn_config',['a/b/c', 'xxx', ])
def test_path(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -64,7 +64,7 @@ class TestMvnConfig(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_config',['a', '<b/>', ])
+ @javautils_script('mvn_config',['a', '<b/>', ])
def test_xml1(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -75,7 +75,7 @@ class TestMvnConfig(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_config',['a', '<b>c</b>', ])
+ @javautils_script('mvn_config',['a', '<b>c</b>', ])
def test_xml2(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -86,7 +86,7 @@ class TestMvnConfig(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_config',['a', '<b>c</b><d/>', ])
+ @javautils_script('mvn_config',['a', '<b>c</b><d/>', ])
def test_xml3(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -97,7 +97,7 @@ class TestMvnConfig(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_config',['a', '<b>c</b><d>e</d>', ])
+ @javautils_script('mvn_config',['a', '<b>c</b><d>e</d>', ])
def test_xml4(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -108,7 +108,7 @@ class TestMvnConfig(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_config',['a', '<b><c>d</c></b>', ])
+ @javautils_script('mvn_config',['a', '<b><c>d</c></b>', ])
def test_nested_xml1(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -119,7 +119,7 @@ class TestMvnConfig(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_config',['a', '<b><c>d</c>d</b>', ])
+ @javautils_script('mvn_config',['a', '<b><c>d</c>d</b>', ])
def test_nested_xml2(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -130,27 +130,27 @@ class TestMvnConfig(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_config',['a', '<b', ])
+ @javautils_script('mvn_config',['a', '<b', ])
def test_invalid_xml1(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_config',['a', '<b>', ])
+ @javautils_script('mvn_config',['a', '<b>', ])
def test_invalid_xml2(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_config',['a', '<b><c></b>', ])
+ @javautils_script('mvn_config',['a', '<b><c></b>', ])
def test_invalid_xml3(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_config',['a', '<b></c></b>', ])
+ @javautils_script('mvn_config',['a', '<b></c></b>', ])
def test_invalid_xml4(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_config',['a', '<b>c<d</b>', ])
+ @javautils_script('mvn_config',['a', '<b>c<d</b>', ])
def test_entity(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -161,7 +161,7 @@ class TestMvnConfig(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_config',['a', 'f<b>c</b>d', ])
+ @javautils_script('mvn_config',['a', 'f<b>c</b>d', ])
def test_mixed(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
diff --git a/test/mvn_file_test.py b/test/mvn_file_test.py
index ea0ade8..966b0d3 100644
--- a/test/mvn_file_test.py
+++ b/test/mvn_file_test.py
@@ -1,7 +1,7 @@
import unittest
import shutil
import os
-from test_common import xmvnconfig, get_config_file_list, \
+from test_common import javautils_script, get_config_file_list, \
get_actual_config, get_expected_config, DIRPATH
from xml_compare import compare_xml_files
@@ -23,21 +23,21 @@ class TestMvnFile(unittest.TestCase):
pass
os.chdir(self.olddir)
- @xmvnconfig('mvn_file', [])
+ @javautils_script('mvn_file', [])
def test_run_no_args(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertEqual("Usage:", stderr[:6])
- @xmvnconfig('mvn_file', ['-h'])
+ @javautils_script('mvn_file', ['-h'])
def test_help(self, stdout, stderr, return_value):
self.assertTrue(stdout)
- @xmvnconfig('mvn_file',['x', ])
+ @javautils_script('mvn_file',['x', ])
def test_single(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_file',[':x', 'file', ])
+ @javautils_script('mvn_file',[':x', 'file', ])
def test_simple(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -48,7 +48,7 @@ class TestMvnFile(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_file',[':guice', 'google/guice', 'guice', ])
+ @javautils_script('mvn_file',[':guice', 'google/guice', 'guice', ])
def test_symlink(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -59,7 +59,7 @@ class TestMvnFile(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_file',['a:b', 'file', ])
+ @javautils_script('mvn_file',['a:b', 'file', ])
def test_group(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -70,7 +70,7 @@ class TestMvnFile(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_file',[':a:1.3', 'file', ])
+ @javautils_script('mvn_file',[':a:1.3', 'file', ])
def test_version(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -81,7 +81,7 @@ class TestMvnFile(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_file',['a:b:c:', 'file', ])
+ @javautils_script('mvn_file',['a:b:c:', 'file', ])
def test_extension(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -92,7 +92,7 @@ class TestMvnFile(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_file',['*:a', 'file', ])
+ @javautils_script('mvn_file',['*:a', 'file', ])
def test_wildcard(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -103,17 +103,17 @@ class TestMvnFile(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_file',['a', 'file', ])
+ @javautils_script('mvn_file',['a', 'file', ])
def test_invalid1(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_file',['a:b:c:d:e:f', 'file', ])
+ @javautils_script('mvn_file',['a:b:c:d:e:f', 'file', ])
def test_invalid2(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_file',[':a', 'file', 'sym1', 'sym2', 'sym3', ])
+ @javautils_script('mvn_file',[':a', 'file', 'sym1', 'sym2', 'sym3', ])
def test_symlinks(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -124,7 +124,7 @@ class TestMvnFile(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_file',['a:b:c:d:1', 'sym', ])
+ @javautils_script('mvn_file',['a:b:c:d:1', 'sym', ])
def test_classifier(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -135,7 +135,7 @@ class TestMvnFile(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_file',['a::c:', 'sym', ])
+ @javautils_script('mvn_file',['a::c:', 'sym', ])
def test_wildcard2(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -146,7 +146,7 @@ class TestMvnFile(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_file',['a:b', 'sym1', 'sym2', 'sym3', 'sym4', 'sym5',
+ @javautils_script('mvn_file',['a:b', 'sym1', 'sym2', 'sym3', 'sym4', 'sym5',
'sym6', 'sym7', 'sym8', 'sym9', 'sym10', 'sym11', 'sym12', 'sym13',
'sym14', 'sym15', 'sym16', 'sym17', 'sym18', 'sym19', 'sym20', 'sym21'])
def test_more_symlinks(self, stdout, stderr, return_value):
@@ -159,7 +159,7 @@ class TestMvnFile(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_file',[':{aa,bb}', '@1', ])
+ @javautils_script('mvn_file',[':{aa,bb}', '@1', ])
def test_backref(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -170,7 +170,7 @@ class TestMvnFile(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_file',['{aa,bb}:{cc,dd}', '@2', '@1', ])
+ @javautils_script('mvn_file',['{aa,bb}:{cc,dd}', '@2', '@1', ])
def test_backref1(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -181,27 +181,27 @@ class TestMvnFile(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_file',[':a', '@1', ])
+ @javautils_script('mvn_file',[':a', '@1', ])
def test_backref2(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_file',[':{a,b}', '@1', '@4', ])
+ @javautils_script('mvn_file',[':{a,b}', '@1', '@4', ])
def test_backref3(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_file',['{aa,bb}:{x,y', '@1', ])
+ @javautils_script('mvn_file',['{aa,bb}:{x,y', '@1', ])
def test_odd_braces1(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_file',['{aa,bb}:{x,y}}', '@1', ])
+ @javautils_script('mvn_file',['{aa,bb}:{x,y}}', '@1', ])
def test_odd_braces2(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_file',['a:b', 'a/file1', ])
+ @javautils_script('mvn_file',['a:b', 'a/file1', ])
def test_relative1(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -212,7 +212,7 @@ class TestMvnFile(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_file',['a:b', '../file1', ])
+ @javautils_script('mvn_file',['a:b', '../file1', ])
def test_relative2(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -223,7 +223,7 @@ class TestMvnFile(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_file',['a:{bb,cc}', 'a/@1', ])
+ @javautils_script('mvn_file',['a:{bb,cc}', 'a/@1', ])
def test_relative3(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -234,7 +234,7 @@ class TestMvnFile(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_file',['a:b', 'file', '/usr/share/java/sym'])
+ @javautils_script('mvn_file',['a:b', 'file', '/usr/share/java/sym'])
def test_absolute1(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -245,7 +245,7 @@ class TestMvnFile(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_file',['a:b', '/usr/share/java/sym', ])
+ @javautils_script('mvn_file',['a:b', '/usr/share/java/sym', ])
def test_absolute2(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
diff --git a/test/mvn_package_test.py b/test/mvn_package_test.py
index 6dc9bb3..b52b3f7 100644
--- a/test/mvn_package_test.py
+++ b/test/mvn_package_test.py
@@ -1,7 +1,7 @@
import unittest
import shutil
import os
-from test_common import xmvnconfig, get_config_file_list, \
+from test_common import javautils_script, get_config_file_list, \
get_actual_config, get_expected_config, DIRPATH
from xml_compare import compare_xml_files
@@ -24,16 +24,16 @@ class TestMvnPackage(unittest.TestCase):
pass
os.chdir(self.olddir)
- @xmvnconfig('mvn_package', [])
+ @javautils_script('mvn_package', [])
def test_run_no_args(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertEqual("Usage:", stderr[:6])
- @xmvnconfig('mvn_package', ['-h'])
+ @javautils_script('mvn_package', ['-h'])
def test_help(self, stdout, stderr, return_value):
self.assertTrue(stdout)
- @xmvnconfig('mvn_package',['aaa:bbb', 'pack', ])
+ @javautils_script('mvn_package',['aaa:bbb', 'pack', ])
def test_simple(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -44,7 +44,7 @@ class TestMvnPackage(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_package',['aaa:bbb:1.2', 'pack', ])
+ @javautils_script('mvn_package',['aaa:bbb:1.2', 'pack', ])
def test_version(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -55,7 +55,7 @@ class TestMvnPackage(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_package',['aaa:bbb:ccc:', 'pack', ])
+ @javautils_script('mvn_package',['aaa:bbb:ccc:', 'pack', ])
def test_extension(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -66,7 +66,7 @@ class TestMvnPackage(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_package',['aaa:bbb:ccc:ddd:', 'pack', ])
+ @javautils_script('mvn_package',['aaa:bbb:ccc:ddd:', 'pack', ])
def test_classifier(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -77,7 +77,7 @@ class TestMvnPackage(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_package',['aaa:bbb:ccc:ddd:21', 'pack', ])
+ @javautils_script('mvn_package',['aaa:bbb:ccc:ddd:21', 'pack', ])
def test_all(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -88,7 +88,7 @@ class TestMvnPackage(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_package',[':bbb', 'pack', ])
+ @javautils_script('mvn_package',[':bbb', 'pack', ])
def test_wildcard1(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -99,7 +99,7 @@ class TestMvnPackage(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_package',[':', 'pack', ])
+ @javautils_script('mvn_package',[':', 'pack', ])
def test_wildcard2(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -110,7 +110,7 @@ class TestMvnPackage(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_package',['*:*', 'pack', ])
+ @javautils_script('mvn_package',['*:*', 'pack', ])
def test_wildcard3(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -121,7 +121,7 @@ class TestMvnPackage(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_package',[':bbb-{a,b,c}', 'pack', ])
+ @javautils_script('mvn_package',[':bbb-{a,b,c}', 'pack', ])
def test_braces1(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -132,7 +132,7 @@ class TestMvnPackage(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_package',['a-{b,c}:{x,y}-z', 'pack', ])
+ @javautils_script('mvn_package',['a-{b,c}:{x,y}-z', 'pack', ])
def test_braces2(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -143,7 +143,7 @@ class TestMvnPackage(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_package',['aaa:bbb', ])
+ @javautils_script('mvn_package',['aaa:bbb', ])
def test_single(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -154,22 +154,22 @@ class TestMvnPackage(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_package',['aaa:bbb', 'pack', 'evil', ])
+ @javautils_script('mvn_package',['aaa:bbb', 'pack', 'evil', ])
def test_more(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_package',[':bbb-{a,b', 'pack', ])
+ @javautils_script('mvn_package',[':bbb-{a,b', 'pack', ])
def test_odd_braces(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_package',[':bb-a,b}', 'pack', ])
+ @javautils_script('mvn_package',[':bb-a,b}', 'pack', ])
def test_odd_braces1(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_package',['a-{b,c}:{x,y}-z', '@2', ])
+ @javautils_script('mvn_package',['a-{b,c}:{x,y}-z', '@2', ])
def test_backref1(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -180,7 +180,7 @@ class TestMvnPackage(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_package',['a-{b,c}:{x,y}-z', '@1', ])
+ @javautils_script('mvn_package',['a-{b,c}:{x,y}-z', '@1', ])
def test_backref2(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
@@ -191,17 +191,17 @@ class TestMvnPackage(unittest.TestCase):
['artifactGlob'])
self.assertFalse(report, '\n' + report)
- @xmvnconfig('mvn_package',['a:b', '@1', ])
+ @javautils_script('mvn_package',['a:b', '@1', ])
def test_backref3(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_package',['a-{b,c}:x', '@3', ])
+ @javautils_script('mvn_package',['a-{b,c}:x', '@3', ])
def test_backref4(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('mvn_package',['aaa:bbb', '__noinstall', ])
+ @javautils_script('mvn_package',['aaa:bbb', '__noinstall', ])
def test_noinstall(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
filelist = get_config_file_list()
diff --git a/test/test_common.py b/test/test_common.py
index a37501b..9f7c2fd 100644
--- a/test/test_common.py
+++ b/test/test_common.py
@@ -106,7 +106,7 @@ def prepare_metadata(metadata_dir):
xml.write(want_file)
-def xmvnconfig(name, fnargs):
+def javautils_script(name, fnargs):
def test_decorator(fun):
@wraps(fun)
def test_decorated(self):
8 years, 11 months