commit 46f8d135e1814f2a49841656135a4137e3bbb39f
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Jun 6 09:25:22 2014 +0200
Fix tests for mvn_build
test/data/mvn_build/all1_00001.xml | 6 +++---
test/data/mvn_build/all1_00002.xml | 12 +++++++++---
test/data/mvn_build/all1_00003.xml | 11 ++++++++---
test/data/mvn_build/all1_00004.xml | 16 ----------------
test/data/mvn_build/all1_00005.xml | 15 ---------------
test/mvn_build_test.py | 24 +-----------------------
6 files changed, 21 insertions(+), 63 deletions(-)
---
diff --git a/test/data/mvn_build/all1_00001.xml b/test/data/mvn_build/all1_00001.xml
index c21c275..9272777 100644
--- a/test/data/mvn_build/all1_00001.xml
+++ b/test/data/mvn_build/all1_00001.xml
@@ -4,7 +4,7 @@
<!--XMvn configuration file generated by javapackages.xmvn_config (part of
javapackages-tools)-->
- <resolverSettings>
- <debug>true</debug>
- </resolverSettings>
+ <buildSettings>
+ <skipTests>true</skipTests>
+ </buildSettings>
</configuration>
diff --git a/test/data/mvn_build/all1_00002.xml b/test/data/mvn_build/all1_00002.xml
index 885d585..1e11d32 100644
--- a/test/data/mvn_build/all1_00002.xml
+++ b/test/data/mvn_build/all1_00002.xml
@@ -4,7 +4,13 @@
<!--XMvn configuration file generated by javapackages.xmvn_config (part of
javapackages-tools)-->
- <installerSettings>
- <debug>true</debug>
- </installerSettings>
+ <artifactManagement>
+ <rule>
+ <artifactGlob>
+ <classifier>*?</classifier>
+ </artifactGlob>
+ <optional>true</optional>
+ <targetPackage>__noinstall</targetPackage>
+ </rule>
+ </artifactManagement>
</configuration>
diff --git a/test/data/mvn_build/all1_00003.xml b/test/data/mvn_build/all1_00003.xml
index 9272777..c839562 100644
--- a/test/data/mvn_build/all1_00003.xml
+++ b/test/data/mvn_build/all1_00003.xml
@@ -4,7 +4,12 @@
<!--XMvn configuration file generated by javapackages.xmvn_config (part of
javapackages-tools)-->
- <buildSettings>
- <skipTests>true</skipTests>
- </buildSettings>
+ <artifactManagement>
+ <rule>
+ <artifactGlob>
+ <artifactId>{*}</artifactId>
+ </artifactGlob>
+ <targetPackage>@1</targetPackage>
+ </rule>
+ </artifactManagement>
</configuration>
diff --git a/test/mvn_build_test.py b/test/mvn_build_test.py
index 02ea18f..b34a450 100644
--- a/test/mvn_build_test.py
+++ b/test/mvn_build_test.py
@@ -44,17 +44,6 @@ class TestMvnBuild(unittest.TestCase):
self.assertEquals(get_actual_args(),
get_expected_args('mvn_build', 'xmvn_debug'))
- @xmvnconfig('mvn_build',['-d', ])
- def test_xmvn_debug1(self, stdout, stderr, return_value):
- self.assertEquals(return_value, 0, stderr)
- filelist = get_config_file_list()
- self.assertEquals(len(filelist), 2)
- for filename in filelist:
- report = compare_xml_files(get_actual_config(filename),
- get_expected_config(filename, 'mvn_build',
'xmvn_debug1'),
- ['artifactGlob'])
- self.assertFalse(report, '\n' + report)
-
@xmvnconfig('mvn_build',['-f', ])
def test_force(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0, stderr)
@@ -119,17 +108,6 @@ class TestMvnBuild(unittest.TestCase):
self.assertEquals(get_actual_args(),
get_expected_args('mvn_build', 'debug'))
- @xmvnconfig('mvn_build',['-X', ])
- def test_debug1(self, stdout, stderr, return_value):
- self.assertEquals(return_value, 0, stderr)
- filelist = get_config_file_list()
- self.assertEquals(len(filelist), 2)
- for filename in filelist:
- report = compare_xml_files(get_actual_config(filename),
- get_expected_config(filename, 'mvn_build', 'debug1'),
- ['artifactGlob'])
- self.assertFalse(report, '\n' + report)
-
@xmvnconfig('mvn_build',['-ji', ])
def test_skip_both(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0, stderr)
@@ -146,7 +124,7 @@ class TestMvnBuild(unittest.TestCase):
def test_all1(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0, stderr)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), 5)
+ self.assertEquals(len(filelist), 3)
for filename in filelist:
report = compare_xml_files(get_actual_config(filename),
get_expected_config(filename, 'mvn_build', 'all1'),