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):