[java-sig-commits] [javapackages] mvn_* tests: Use xmvnconfig decorator for all tests
Michael Šimáček
msimacek at fedoraproject.org
Thu Sep 12 08:41:57 UTC 2013
commit 3b1e28f3794a978aade55e07f14d0fa0919e959a
Author: Michael Simacek <msimacek at redhat.com>
Date: Thu Sep 12 10:35:51 2013 +0200
mvn_* tests: Use xmvnconfig decorator for all tests
test/alias_test.py | 38 +++++++++++++++++++-------------------
test/build_test.py | 34 +++++++++++++++++-----------------
test/compat_version_test.py | 18 +++++++++---------
test/config_test.py | 22 +++++++++++-----------
test/file_test.py | 26 +++++++++++++-------------
test/package_test.py | 22 +++++++++++-----------
6 files changed, 80 insertions(+), 80 deletions(-)
---
diff --git a/test/alias_test.py b/test/alias_test.py
index f053a2f..9f8f5d5 100644
--- a/test/alias_test.py
+++ b/test/alias_test.py
@@ -16,14 +16,14 @@ class TestMvnalias(unittest.TestCase):
except OSError:
pass
- def test_run_no_args(self):
- (out, err, ret) = call_script("alias", [])
- self.assertNotEqual(ret, 0)
- self.assertEqual("Usage:", err[:6])
+ @xmvnconfig('alias', [])
+ def test_run_no_args(self, stdout, stderr, return_value):
+ self.assertNotEqual(return_value, 0)
+ self.assertEqual("Usage:", stderr[:6])
- def test_help(self):
- (out, err, ret) = call_script("alias", ['-h'])
- self.assertTrue(out)
+ @xmvnconfig('alias', ['-h'])
+ def test_help(self, stdout, stderr, return_value):
+ self.assertTrue(stdout)
@xmvnconfig('alias',['aaa:bbb', 'xxx:yyy', ])
def test_simple(self, stdout, stderr, return_value):
@@ -121,18 +121,18 @@ class TestMvnalias(unittest.TestCase):
for file in filelist:
self.assertEquals(get_actual_config(file), get_expected_config(file, 'alias', 'wildcard3'))
- def test_one_argument(self):
- (stdout, stderr, return_value) = call_script('alias', ['aaa:bbb', ])
+ @xmvnconfig('alias',['aaa:bbb', ])
+ def test_one_argument(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- def test_invalid1(self):
- (stdout, stderr, return_value) = call_script('alias', ['aaa:bbb', 'xxx', ])
+ @xmvnconfig('alias',['aaa:bbb', 'xxx', ])
+ def test_invalid1(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- def test_invalid2(self):
- (stdout, stderr, return_value) = call_script('alias', ['aaa', 'xxx:yyy', ])
+ @xmvnconfig('alias',['aaa', 'xxx:yyy', ])
+ def test_invalid2(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
@@ -144,13 +144,13 @@ class TestMvnalias(unittest.TestCase):
for file in filelist:
self.assertEquals(get_actual_config(file), get_expected_config(file, 'alias', 'wildcard4'))
- def test_invalid5(self):
- (stdout, stderr, return_value) = call_script('alias', ['a:b:c:d:e:f', 'x:y', ])
+ @xmvnconfig('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)
- def test_invalid6(self):
- (stdout, stderr, return_value) = call_script('alias', ['a:b', 'x:y:z:w:1:e', ])
+ @xmvnconfig('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)
@@ -175,8 +175,8 @@ class TestMvnalias(unittest.TestCase):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- def test_wildcard8(self):
- (stdout, stderr, return_value) = call_script('alias', ['x:y', 'a:b:c:*:1', ])
+ @xmvnconfig('alias',['x:y', 'a:b:c:*:1', ])
+ def test_wildcard8(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
diff --git a/test/build_test.py b/test/build_test.py
index 8ead083..a179f79 100644
--- a/test/build_test.py
+++ b/test/build_test.py
@@ -16,26 +16,26 @@ class TestMvnbuild(unittest.TestCase):
except OSError:
pass
- def test_run_no_args(self):
- (out, err, ret) = call_script("build", [])
- self.assertNotEqual(ret, 0)
- self.assertEqual("Usage:", err[:6])
+ @xmvnconfig('build', [])
+ def test_run_no_args(self, stdout, stderr, return_value):
+ self.assertNotEqual(return_value, 0)
+ self.assertEqual("Usage:", stderr[:6])
- def test_help(self):
- (out, err, ret) = call_script("build", ['-h'])
- self.assertTrue(out)
+ @xmvnconfig('build', ['-h'])
+ def test_help(self, stdout, stderr, return_value):
+ self.assertTrue(stdout)
- @xmvnconfig('build', [])
+ @xmvnconfig('build',[])
def test_run_no_args(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
self.assertEquals(get_actual_args(), get_expected_args('build', 'run_no_args'))
- @xmvnconfig('build', ['-b', ])
+ @xmvnconfig('build',['-b', ])
def test_bootstrap(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
self.assertEquals(get_actual_args(), get_expected_args('build', 'bootstrap'))
- @xmvnconfig('build', ['-d', ])
+ @xmvnconfig('build',['-d', ])
def test_xmvn_debug(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
self.assertEquals(get_actual_args(), get_expected_args('build', 'xmvn_debug'))
@@ -48,7 +48,7 @@ class TestMvnbuild(unittest.TestCase):
for file in filelist:
self.assertEquals(get_actual_config(file), get_expected_config(file, 'build', 'xmvn_debug1'))
- @xmvnconfig('build', ['-f', ])
+ @xmvnconfig('build',['-f', ])
def test_force(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
self.assertEquals(get_actual_args(), get_expected_args('build', 'force'))
@@ -61,27 +61,27 @@ class TestMvnbuild(unittest.TestCase):
for file in filelist:
self.assertEquals(get_actual_config(file), get_expected_config(file, 'build', 'force1'))
- @xmvnconfig('build', ['-g', ])
+ @xmvnconfig('build',['-g', ])
def test_goal_before(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
self.assertEquals(get_actual_args(), get_expected_args('build', 'goal_before'))
- @xmvnconfig('build', ['-G', ])
+ @xmvnconfig('build',['-G', ])
def test_goal_after(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
self.assertEquals(get_actual_args(), get_expected_args('build', 'goal_after'))
- @xmvnconfig('build', ['-i', ])
+ @xmvnconfig('build',['-i', ])
def test_skip_install(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
self.assertEquals(get_actual_args(), get_expected_args('build', 'skip_install'))
- @xmvnconfig('build', ['-j', ])
+ @xmvnconfig('build',['-j', ])
def test_skip_javadoc(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
self.assertEquals(get_actual_args(), get_expected_args('build', 'skip_javadoc'))
- @xmvnconfig('build', ['-s', ])
+ @xmvnconfig('build',['-s', ])
def test_singleton(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
self.assertEquals(get_actual_args(), get_expected_args('build', 'singleton'))
@@ -94,7 +94,7 @@ class TestMvnbuild(unittest.TestCase):
for file in filelist:
self.assertEquals(get_actual_config(file), get_expected_config(file, 'build', 'singleton1'))
- @xmvnconfig('build', ['-X', ])
+ @xmvnconfig('build',['-X', ])
def test_debug(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
self.assertEquals(get_actual_args(), get_expected_args('build', 'debug'))
diff --git a/test/compat_version_test.py b/test/compat_version_test.py
index be5bc3d..c79916c 100644
--- a/test/compat_version_test.py
+++ b/test/compat_version_test.py
@@ -16,14 +16,14 @@ class TestMvncompat_version(unittest.TestCase):
except OSError:
pass
- def test_run_no_args(self):
- (out, err, ret) = call_script("compat_version", [])
- self.assertNotEqual(ret, 0)
- self.assertEqual("Usage:", err[:6])
+ @xmvnconfig('compat_version', [])
+ def test_run_no_args(self, stdout, stderr, return_value):
+ self.assertNotEqual(return_value, 0)
+ self.assertEqual("Usage:", stderr[:6])
- def test_help(self):
- (out, err, ret) = call_script("compat_version", ['-h'])
- self.assertTrue(out)
+ @xmvnconfig('compat_version', ['-h'])
+ def test_help(self, stdout, stderr, return_value):
+ self.assertTrue(stdout)
@xmvnconfig('compat_version',['aaa:bbb', '1', ])
def test_simple(self, stdout, stderr, return_value):
@@ -33,8 +33,8 @@ class TestMvncompat_version(unittest.TestCase):
for file in filelist:
self.assertEquals(get_actual_config(file), get_expected_config(file, 'compat_version', 'simple'))
- def test_single(self):
- (stdout, stderr, return_value) = call_script('compat_version', ['aaa:bbb', ])
+ @xmvnconfig('compat_version',['aaa:bbb', ])
+ def test_single(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
diff --git a/test/config_test.py b/test/config_test.py
index b325df1..a46de44 100644
--- a/test/config_test.py
+++ b/test/config_test.py
@@ -16,22 +16,22 @@ class TestMvnconfig(unittest.TestCase):
except OSError:
pass
- def test_run_no_args(self):
- (out, err, ret) = call_script("config", [])
- self.assertNotEqual(ret, 0)
- self.assertEqual("Usage:", err[:6])
+ @xmvnconfig('config', [])
+ def test_run_no_args(self, stdout, stderr, return_value):
+ self.assertNotEqual(return_value, 0)
+ self.assertEqual("Usage:", stderr[:6])
- def test_help(self):
- (out, err, ret) = call_script("config", ['-h'])
- self.assertTrue(out)
+ @xmvnconfig('config', ['-h'])
+ def test_help(self, stdout, stderr, return_value):
+ self.assertTrue(stdout)
- def test_single(self):
- (stdout, stderr, return_value) = call_script('config', ['aaa', ])
+ @xmvnconfig('config',['aaa', ])
+ def test_single(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- def test_more(self):
- (stdout, stderr, return_value) = call_script('config', ['a', 'b', 'c', ])
+ @xmvnconfig('config',['a', 'b', 'c', ])
+ def test_more(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
diff --git a/test/file_test.py b/test/file_test.py
index 046f430..7162b89 100644
--- a/test/file_test.py
+++ b/test/file_test.py
@@ -16,17 +16,17 @@ class TestMvnfile(unittest.TestCase):
except OSError:
pass
- def test_run_no_args(self):
- (out, err, ret) = call_script("file", [])
- self.assertNotEqual(ret, 0)
- self.assertEqual("Usage:", err[:6])
+ @xmvnconfig('file', [])
+ def test_run_no_args(self, stdout, stderr, return_value):
+ self.assertNotEqual(return_value, 0)
+ self.assertEqual("Usage:", stderr[:6])
- def test_help(self):
- (out, err, ret) = call_script("file", ['-h'])
- self.assertTrue(out)
+ @xmvnconfig('file', ['-h'])
+ def test_help(self, stdout, stderr, return_value):
+ self.assertTrue(stdout)
- def test_single(self):
- (stdout, stderr, return_value) = call_script('file', ['x', ])
+ @xmvnconfig('file',['x', ])
+ def test_single(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
@@ -78,13 +78,13 @@ class TestMvnfile(unittest.TestCase):
for file in filelist:
self.assertEquals(get_actual_config(file), get_expected_config(file, 'file', 'wildcard'))
- def test_invalid1(self):
- (stdout, stderr, return_value) = call_script('file', ['a', 'file', ])
+ @xmvnconfig('file',['a', 'file', ])
+ def test_invalid1(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- def test_invalid2(self):
- (stdout, stderr, return_value) = call_script('file', ['a:b:c:d:e:f', 'file', ])
+ @xmvnconfig('file',['a:b:c:d:e:f', 'file', ])
+ def test_invalid2(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
diff --git a/test/package_test.py b/test/package_test.py
index 51e1681..20402c7 100644
--- a/test/package_test.py
+++ b/test/package_test.py
@@ -16,14 +16,14 @@ class TestMvnpackage(unittest.TestCase):
except OSError:
pass
- def test_run_no_args(self):
- (out, err, ret) = call_script("package", [])
- self.assertNotEqual(ret, 0)
- self.assertEqual("Usage:", err[:6])
+ @xmvnconfig('package', [])
+ def test_run_no_args(self, stdout, stderr, return_value):
+ self.assertNotEqual(return_value, 0)
+ self.assertEqual("Usage:", stderr[:6])
- def test_help(self):
- (out, err, ret) = call_script("package", ['-h'])
- self.assertTrue(out)
+ @xmvnconfig('package', ['-h'])
+ def test_help(self, stdout, stderr, return_value):
+ self.assertTrue(stdout)
@xmvnconfig('package',['aaa:bbb', 'pack', ])
def test_simple(self, stdout, stderr, return_value):
@@ -105,13 +105,13 @@ class TestMvnpackage(unittest.TestCase):
for file in filelist:
self.assertEquals(get_actual_config(file), get_expected_config(file, 'package', 'braces2'))
- def test_single(self):
- (stdout, stderr, return_value) = call_script('package', ['aaa:bbb', ])
+ @xmvnconfig('package',['aaa:bbb', ])
+ def test_single(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- def test_more(self):
- (stdout, stderr, return_value) = call_script('package', ['aaa:bbb', 'pack', 'evil', ])
+ @xmvnconfig('package',['aaa:bbb', 'pack', 'evil', ])
+ def test_more(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
More information about the java-sig-commits
mailing list