[java-sig-commits] [javapackages] Moved mvn_* test data into separate directories
Michael Šimáček
msimacek at fedoraproject.org
Mon Sep 30 13:26:27 UTC 2013
commit b91f6587125d1f3290dec41348a9e42bf36aaeab
Author: Michael Simacek <msimacek at redhat.com>
Date: Mon Sep 30 11:02:08 2013 +0200
Moved mvn_* test data into separate directories
.../backref2_00001.xml} | 0
.../backref_00001.xml} | 0
.../classifier_00001.xml} | 0
.../comb1_00001.xml} | 0
.../comb2_00001.xml} | 0
.../comb3_00001.xml} | 0
.../comb4_00001.xml} | 0
.../extension_00001.xml} | 0
.../longopt_00001.xml} | 0
.../multi_00001.xml} | 0
.../odd_00001.xml} | 0
.../simple_00001.xml} | 0
.../version_00001.xml} | 0
.../wildcard1_00001.xml} | 0
.../wildcard2_00001.xml} | 0
.../wildcard3_00001.xml} | 0
.../wildcard4_00001.xml} | 0
.../wildcard9_00001.xml} | 0
.../all1_00001.xml} | 0
.../all1_00002.xml} | 0
.../all1_00003.xml} | 0
.../all1_00004.xml} | 0
.../all1_00005.xml} | 0
test/data/{build_all_out => mvn_build/all_out} | 0
.../bootstrap_out} | 0
.../debug1_00001.xml} | 0
.../debug1_00002.xml} | 0
test/data/{build_debug_out => mvn_build/debug_out} | 0
.../force1_00001.xml} | 0
test/data/{build_force_out => mvn_build/force_out} | 0
.../goal_after_out} | 0
.../goal_before_out} | 0
.../run_no_args_out} | 0
.../singleton1_00001.xml} | 0
.../singleton1_00002.xml} | 0
.../singleton_out} | 0
.../skip_both_out} | 0
.../skip_install_out} | 0
.../skip_javadoc_out} | 0
.../xmvn_debug1_00001.xml} | 0
.../xmvn_debug1_00002.xml} | 0
.../xmvn_debug_out} | 0
.../backref1_00001.xml} | 0
.../more_00001.xml} | 0
.../simple_00001.xml} | 0
.../version_00001.xml} | 0
.../wildcard_00001.xml} | 0
.../entity_00001.xml} | 0
.../mixed_00001.xml} | 0
.../nested_xml1_00001.xml} | 0
.../nested_xml2_00001.xml} | 0
.../path_00001.xml} | 0
.../simple_00001.xml} | 0
.../xml1_00001.xml} | 0
.../xml2_00001.xml} | 0
.../xml3_00001.xml} | 0
.../xml4_00001.xml} | 0
.../absolute1_00001.xml} | 0
.../backref1_00001.xml} | 0
.../backref_00001.xml} | 0
.../classifier_00001.xml} | 0
.../extension_00001.xml} | 0
.../group_00001.xml} | 0
.../more_symlinks_00001.xml} | 0
.../prefix1_00001.xml} | 0
.../prefix2_00001.xml} | 0
.../relative1_00001.xml} | 0
.../relative2_00001.xml} | 0
.../relative3_00001.xml} | 0
.../simple_00001.xml} | 0
.../symlink_00001.xml} | 0
.../symlinks_00001.xml} | 0
.../version_00001.xml} | 0
.../wildcard2_00001.xml} | 0
.../wildcard_00001.xml} | 0
.../all_00001.xml} | 0
.../backref1_00001.xml} | 0
.../backref2_00001.xml} | 0
.../braces1_00001.xml} | 0
.../braces2_00001.xml} | 0
.../classifier_00001.xml} | 0
.../extension_00001.xml} | 0
.../noinstall_00001.xml} | 0
.../simple_00001.xml} | 0
.../version_00001.xml} | 0
.../wildcard1_00001.xml} | 0
.../wildcard2_00001.xml} | 0
.../wildcard3_00001.xml} | 0
test/{alias_test.py => mvn_alias_test.py} | 138 ++++++++++----------
test/{build_test.py => mvn_build_test.py} | 84 ++++++------
..._version_test.py => mvn_compat_version_test.py} | 44 +++---
test/{config_test.py => mvn_config_test.py} | 78 ++++++------
test/{file_test.py => mvn_file_test.py} | 128 +++++++++---------
test/{package_test.py => mvn_package_test.py} | 96 +++++++-------
test/test_common.py | 12 +-
95 files changed, 290 insertions(+), 290 deletions(-)
---
diff --git a/test/data/alias_backref2_00001.xml b/test/data/mvn_alias/backref2_00001.xml
similarity index 100%
rename from test/data/alias_backref2_00001.xml
rename to test/data/mvn_alias/backref2_00001.xml
diff --git a/test/data/alias_backref_00001.xml b/test/data/mvn_alias/backref_00001.xml
similarity index 100%
rename from test/data/alias_backref_00001.xml
rename to test/data/mvn_alias/backref_00001.xml
diff --git a/test/data/alias_classifier_00001.xml b/test/data/mvn_alias/classifier_00001.xml
similarity index 100%
rename from test/data/alias_classifier_00001.xml
rename to test/data/mvn_alias/classifier_00001.xml
diff --git a/test/data/alias_comb1_00001.xml b/test/data/mvn_alias/comb1_00001.xml
similarity index 100%
rename from test/data/alias_comb1_00001.xml
rename to test/data/mvn_alias/comb1_00001.xml
diff --git a/test/data/alias_comb2_00001.xml b/test/data/mvn_alias/comb2_00001.xml
similarity index 100%
rename from test/data/alias_comb2_00001.xml
rename to test/data/mvn_alias/comb2_00001.xml
diff --git a/test/data/alias_comb3_00001.xml b/test/data/mvn_alias/comb3_00001.xml
similarity index 100%
rename from test/data/alias_comb3_00001.xml
rename to test/data/mvn_alias/comb3_00001.xml
diff --git a/test/data/alias_comb4_00001.xml b/test/data/mvn_alias/comb4_00001.xml
similarity index 100%
rename from test/data/alias_comb4_00001.xml
rename to test/data/mvn_alias/comb4_00001.xml
diff --git a/test/data/alias_extension_00001.xml b/test/data/mvn_alias/extension_00001.xml
similarity index 100%
rename from test/data/alias_extension_00001.xml
rename to test/data/mvn_alias/extension_00001.xml
diff --git a/test/data/alias_longopt_00001.xml b/test/data/mvn_alias/longopt_00001.xml
similarity index 100%
rename from test/data/alias_longopt_00001.xml
rename to test/data/mvn_alias/longopt_00001.xml
diff --git a/test/data/alias_multi_00001.xml b/test/data/mvn_alias/multi_00001.xml
similarity index 100%
rename from test/data/alias_multi_00001.xml
rename to test/data/mvn_alias/multi_00001.xml
diff --git a/test/data/alias_odd_00001.xml b/test/data/mvn_alias/odd_00001.xml
similarity index 100%
rename from test/data/alias_odd_00001.xml
rename to test/data/mvn_alias/odd_00001.xml
diff --git a/test/data/alias_simple_00001.xml b/test/data/mvn_alias/simple_00001.xml
similarity index 100%
rename from test/data/alias_simple_00001.xml
rename to test/data/mvn_alias/simple_00001.xml
diff --git a/test/data/alias_version_00001.xml b/test/data/mvn_alias/version_00001.xml
similarity index 100%
rename from test/data/alias_version_00001.xml
rename to test/data/mvn_alias/version_00001.xml
diff --git a/test/data/alias_wildcard1_00001.xml b/test/data/mvn_alias/wildcard1_00001.xml
similarity index 100%
rename from test/data/alias_wildcard1_00001.xml
rename to test/data/mvn_alias/wildcard1_00001.xml
diff --git a/test/data/alias_wildcard2_00001.xml b/test/data/mvn_alias/wildcard2_00001.xml
similarity index 100%
rename from test/data/alias_wildcard2_00001.xml
rename to test/data/mvn_alias/wildcard2_00001.xml
diff --git a/test/data/alias_wildcard3_00001.xml b/test/data/mvn_alias/wildcard3_00001.xml
similarity index 100%
rename from test/data/alias_wildcard3_00001.xml
rename to test/data/mvn_alias/wildcard3_00001.xml
diff --git a/test/data/alias_wildcard4_00001.xml b/test/data/mvn_alias/wildcard4_00001.xml
similarity index 100%
rename from test/data/alias_wildcard4_00001.xml
rename to test/data/mvn_alias/wildcard4_00001.xml
diff --git a/test/data/alias_wildcard9_00001.xml b/test/data/mvn_alias/wildcard9_00001.xml
similarity index 100%
rename from test/data/alias_wildcard9_00001.xml
rename to test/data/mvn_alias/wildcard9_00001.xml
diff --git a/test/data/build_all1_00001.xml b/test/data/mvn_build/all1_00001.xml
similarity index 100%
rename from test/data/build_all1_00001.xml
rename to test/data/mvn_build/all1_00001.xml
diff --git a/test/data/build_all1_00002.xml b/test/data/mvn_build/all1_00002.xml
similarity index 100%
rename from test/data/build_all1_00002.xml
rename to test/data/mvn_build/all1_00002.xml
diff --git a/test/data/build_all1_00003.xml b/test/data/mvn_build/all1_00003.xml
similarity index 100%
rename from test/data/build_all1_00003.xml
rename to test/data/mvn_build/all1_00003.xml
diff --git a/test/data/build_all1_00004.xml b/test/data/mvn_build/all1_00004.xml
similarity index 100%
rename from test/data/build_all1_00004.xml
rename to test/data/mvn_build/all1_00004.xml
diff --git a/test/data/build_all1_00005.xml b/test/data/mvn_build/all1_00005.xml
similarity index 100%
rename from test/data/build_all1_00005.xml
rename to test/data/mvn_build/all1_00005.xml
diff --git a/test/data/build_all_out b/test/data/mvn_build/all_out
similarity index 100%
rename from test/data/build_all_out
rename to test/data/mvn_build/all_out
diff --git a/test/data/build_bootstrap_out b/test/data/mvn_build/bootstrap_out
similarity index 100%
rename from test/data/build_bootstrap_out
rename to test/data/mvn_build/bootstrap_out
diff --git a/test/data/build_debug1_00001.xml b/test/data/mvn_build/debug1_00001.xml
similarity index 100%
rename from test/data/build_debug1_00001.xml
rename to test/data/mvn_build/debug1_00001.xml
diff --git a/test/data/build_debug1_00002.xml b/test/data/mvn_build/debug1_00002.xml
similarity index 100%
rename from test/data/build_debug1_00002.xml
rename to test/data/mvn_build/debug1_00002.xml
diff --git a/test/data/build_debug_out b/test/data/mvn_build/debug_out
similarity index 100%
rename from test/data/build_debug_out
rename to test/data/mvn_build/debug_out
diff --git a/test/data/build_force1_00001.xml b/test/data/mvn_build/force1_00001.xml
similarity index 100%
rename from test/data/build_force1_00001.xml
rename to test/data/mvn_build/force1_00001.xml
diff --git a/test/data/build_force_out b/test/data/mvn_build/force_out
similarity index 100%
rename from test/data/build_force_out
rename to test/data/mvn_build/force_out
diff --git a/test/data/build_goal_after_out b/test/data/mvn_build/goal_after_out
similarity index 100%
rename from test/data/build_goal_after_out
rename to test/data/mvn_build/goal_after_out
diff --git a/test/data/build_goal_before_out b/test/data/mvn_build/goal_before_out
similarity index 100%
rename from test/data/build_goal_before_out
rename to test/data/mvn_build/goal_before_out
diff --git a/test/data/build_run_no_args_out b/test/data/mvn_build/run_no_args_out
similarity index 100%
rename from test/data/build_run_no_args_out
rename to test/data/mvn_build/run_no_args_out
diff --git a/test/data/build_singleton1_00001.xml b/test/data/mvn_build/singleton1_00001.xml
similarity index 100%
rename from test/data/build_singleton1_00001.xml
rename to test/data/mvn_build/singleton1_00001.xml
diff --git a/test/data/build_singleton1_00002.xml b/test/data/mvn_build/singleton1_00002.xml
similarity index 100%
rename from test/data/build_singleton1_00002.xml
rename to test/data/mvn_build/singleton1_00002.xml
diff --git a/test/data/build_singleton_out b/test/data/mvn_build/singleton_out
similarity index 100%
rename from test/data/build_singleton_out
rename to test/data/mvn_build/singleton_out
diff --git a/test/data/build_skip_both_out b/test/data/mvn_build/skip_both_out
similarity index 100%
rename from test/data/build_skip_both_out
rename to test/data/mvn_build/skip_both_out
diff --git a/test/data/build_skip_install_out b/test/data/mvn_build/skip_install_out
similarity index 100%
rename from test/data/build_skip_install_out
rename to test/data/mvn_build/skip_install_out
diff --git a/test/data/build_skip_javadoc_out b/test/data/mvn_build/skip_javadoc_out
similarity index 100%
rename from test/data/build_skip_javadoc_out
rename to test/data/mvn_build/skip_javadoc_out
diff --git a/test/data/build_xmvn_debug1_00001.xml b/test/data/mvn_build/xmvn_debug1_00001.xml
similarity index 100%
rename from test/data/build_xmvn_debug1_00001.xml
rename to test/data/mvn_build/xmvn_debug1_00001.xml
diff --git a/test/data/build_xmvn_debug1_00002.xml b/test/data/mvn_build/xmvn_debug1_00002.xml
similarity index 100%
rename from test/data/build_xmvn_debug1_00002.xml
rename to test/data/mvn_build/xmvn_debug1_00002.xml
diff --git a/test/data/build_xmvn_debug_out b/test/data/mvn_build/xmvn_debug_out
similarity index 100%
rename from test/data/build_xmvn_debug_out
rename to test/data/mvn_build/xmvn_debug_out
diff --git a/test/data/compat_version_backref1_00001.xml b/test/data/mvn_compat_version/backref1_00001.xml
similarity index 100%
rename from test/data/compat_version_backref1_00001.xml
rename to test/data/mvn_compat_version/backref1_00001.xml
diff --git a/test/data/compat_version_more_00001.xml b/test/data/mvn_compat_version/more_00001.xml
similarity index 100%
rename from test/data/compat_version_more_00001.xml
rename to test/data/mvn_compat_version/more_00001.xml
diff --git a/test/data/compat_version_simple_00001.xml b/test/data/mvn_compat_version/simple_00001.xml
similarity index 100%
rename from test/data/compat_version_simple_00001.xml
rename to test/data/mvn_compat_version/simple_00001.xml
diff --git a/test/data/compat_version_version_00001.xml b/test/data/mvn_compat_version/version_00001.xml
similarity index 100%
rename from test/data/compat_version_version_00001.xml
rename to test/data/mvn_compat_version/version_00001.xml
diff --git a/test/data/compat_version_wildcard_00001.xml b/test/data/mvn_compat_version/wildcard_00001.xml
similarity index 100%
rename from test/data/compat_version_wildcard_00001.xml
rename to test/data/mvn_compat_version/wildcard_00001.xml
diff --git a/test/data/config_entity_00001.xml b/test/data/mvn_config/entity_00001.xml
similarity index 100%
rename from test/data/config_entity_00001.xml
rename to test/data/mvn_config/entity_00001.xml
diff --git a/test/data/config_mixed_00001.xml b/test/data/mvn_config/mixed_00001.xml
similarity index 100%
rename from test/data/config_mixed_00001.xml
rename to test/data/mvn_config/mixed_00001.xml
diff --git a/test/data/config_nested_xml1_00001.xml b/test/data/mvn_config/nested_xml1_00001.xml
similarity index 100%
rename from test/data/config_nested_xml1_00001.xml
rename to test/data/mvn_config/nested_xml1_00001.xml
diff --git a/test/data/config_nested_xml2_00001.xml b/test/data/mvn_config/nested_xml2_00001.xml
similarity index 100%
rename from test/data/config_nested_xml2_00001.xml
rename to test/data/mvn_config/nested_xml2_00001.xml
diff --git a/test/data/config_path_00001.xml b/test/data/mvn_config/path_00001.xml
similarity index 100%
rename from test/data/config_path_00001.xml
rename to test/data/mvn_config/path_00001.xml
diff --git a/test/data/config_simple_00001.xml b/test/data/mvn_config/simple_00001.xml
similarity index 100%
rename from test/data/config_simple_00001.xml
rename to test/data/mvn_config/simple_00001.xml
diff --git a/test/data/config_xml1_00001.xml b/test/data/mvn_config/xml1_00001.xml
similarity index 100%
rename from test/data/config_xml1_00001.xml
rename to test/data/mvn_config/xml1_00001.xml
diff --git a/test/data/config_xml2_00001.xml b/test/data/mvn_config/xml2_00001.xml
similarity index 100%
rename from test/data/config_xml2_00001.xml
rename to test/data/mvn_config/xml2_00001.xml
diff --git a/test/data/config_xml3_00001.xml b/test/data/mvn_config/xml3_00001.xml
similarity index 100%
rename from test/data/config_xml3_00001.xml
rename to test/data/mvn_config/xml3_00001.xml
diff --git a/test/data/config_xml4_00001.xml b/test/data/mvn_config/xml4_00001.xml
similarity index 100%
rename from test/data/config_xml4_00001.xml
rename to test/data/mvn_config/xml4_00001.xml
diff --git a/test/data/file_absolute1_00001.xml b/test/data/mvn_file/absolute1_00001.xml
similarity index 100%
rename from test/data/file_absolute1_00001.xml
rename to test/data/mvn_file/absolute1_00001.xml
diff --git a/test/data/file_backref1_00001.xml b/test/data/mvn_file/backref1_00001.xml
similarity index 100%
rename from test/data/file_backref1_00001.xml
rename to test/data/mvn_file/backref1_00001.xml
diff --git a/test/data/file_backref_00001.xml b/test/data/mvn_file/backref_00001.xml
similarity index 100%
rename from test/data/file_backref_00001.xml
rename to test/data/mvn_file/backref_00001.xml
diff --git a/test/data/file_classifier_00001.xml b/test/data/mvn_file/classifier_00001.xml
similarity index 100%
rename from test/data/file_classifier_00001.xml
rename to test/data/mvn_file/classifier_00001.xml
diff --git a/test/data/file_extension_00001.xml b/test/data/mvn_file/extension_00001.xml
similarity index 100%
rename from test/data/file_extension_00001.xml
rename to test/data/mvn_file/extension_00001.xml
diff --git a/test/data/file_group_00001.xml b/test/data/mvn_file/group_00001.xml
similarity index 100%
rename from test/data/file_group_00001.xml
rename to test/data/mvn_file/group_00001.xml
diff --git a/test/data/file_more_symlinks_00001.xml b/test/data/mvn_file/more_symlinks_00001.xml
similarity index 100%
rename from test/data/file_more_symlinks_00001.xml
rename to test/data/mvn_file/more_symlinks_00001.xml
diff --git a/test/data/file_prefix1_00001.xml b/test/data/mvn_file/prefix1_00001.xml
similarity index 100%
rename from test/data/file_prefix1_00001.xml
rename to test/data/mvn_file/prefix1_00001.xml
diff --git a/test/data/file_prefix2_00001.xml b/test/data/mvn_file/prefix2_00001.xml
similarity index 100%
rename from test/data/file_prefix2_00001.xml
rename to test/data/mvn_file/prefix2_00001.xml
diff --git a/test/data/file_relative1_00001.xml b/test/data/mvn_file/relative1_00001.xml
similarity index 100%
rename from test/data/file_relative1_00001.xml
rename to test/data/mvn_file/relative1_00001.xml
diff --git a/test/data/file_relative2_00001.xml b/test/data/mvn_file/relative2_00001.xml
similarity index 100%
rename from test/data/file_relative2_00001.xml
rename to test/data/mvn_file/relative2_00001.xml
diff --git a/test/data/file_relative3_00001.xml b/test/data/mvn_file/relative3_00001.xml
similarity index 100%
rename from test/data/file_relative3_00001.xml
rename to test/data/mvn_file/relative3_00001.xml
diff --git a/test/data/file_simple_00001.xml b/test/data/mvn_file/simple_00001.xml
similarity index 100%
rename from test/data/file_simple_00001.xml
rename to test/data/mvn_file/simple_00001.xml
diff --git a/test/data/file_symlink_00001.xml b/test/data/mvn_file/symlink_00001.xml
similarity index 100%
rename from test/data/file_symlink_00001.xml
rename to test/data/mvn_file/symlink_00001.xml
diff --git a/test/data/file_symlinks_00001.xml b/test/data/mvn_file/symlinks_00001.xml
similarity index 100%
rename from test/data/file_symlinks_00001.xml
rename to test/data/mvn_file/symlinks_00001.xml
diff --git a/test/data/file_version_00001.xml b/test/data/mvn_file/version_00001.xml
similarity index 100%
rename from test/data/file_version_00001.xml
rename to test/data/mvn_file/version_00001.xml
diff --git a/test/data/file_wildcard2_00001.xml b/test/data/mvn_file/wildcard2_00001.xml
similarity index 100%
rename from test/data/file_wildcard2_00001.xml
rename to test/data/mvn_file/wildcard2_00001.xml
diff --git a/test/data/file_wildcard_00001.xml b/test/data/mvn_file/wildcard_00001.xml
similarity index 100%
rename from test/data/file_wildcard_00001.xml
rename to test/data/mvn_file/wildcard_00001.xml
diff --git a/test/data/package_all_00001.xml b/test/data/mvn_package/all_00001.xml
similarity index 100%
rename from test/data/package_all_00001.xml
rename to test/data/mvn_package/all_00001.xml
diff --git a/test/data/package_backref1_00001.xml b/test/data/mvn_package/backref1_00001.xml
similarity index 100%
rename from test/data/package_backref1_00001.xml
rename to test/data/mvn_package/backref1_00001.xml
diff --git a/test/data/package_backref2_00001.xml b/test/data/mvn_package/backref2_00001.xml
similarity index 100%
rename from test/data/package_backref2_00001.xml
rename to test/data/mvn_package/backref2_00001.xml
diff --git a/test/data/package_braces1_00001.xml b/test/data/mvn_package/braces1_00001.xml
similarity index 100%
rename from test/data/package_braces1_00001.xml
rename to test/data/mvn_package/braces1_00001.xml
diff --git a/test/data/package_braces2_00001.xml b/test/data/mvn_package/braces2_00001.xml
similarity index 100%
rename from test/data/package_braces2_00001.xml
rename to test/data/mvn_package/braces2_00001.xml
diff --git a/test/data/package_classifier_00001.xml b/test/data/mvn_package/classifier_00001.xml
similarity index 100%
rename from test/data/package_classifier_00001.xml
rename to test/data/mvn_package/classifier_00001.xml
diff --git a/test/data/package_extension_00001.xml b/test/data/mvn_package/extension_00001.xml
similarity index 100%
rename from test/data/package_extension_00001.xml
rename to test/data/mvn_package/extension_00001.xml
diff --git a/test/data/package_noinstall_00001.xml b/test/data/mvn_package/noinstall_00001.xml
similarity index 100%
rename from test/data/package_noinstall_00001.xml
rename to test/data/mvn_package/noinstall_00001.xml
diff --git a/test/data/package_simple_00001.xml b/test/data/mvn_package/simple_00001.xml
similarity index 100%
rename from test/data/package_simple_00001.xml
rename to test/data/mvn_package/simple_00001.xml
diff --git a/test/data/package_version_00001.xml b/test/data/mvn_package/version_00001.xml
similarity index 100%
rename from test/data/package_version_00001.xml
rename to test/data/mvn_package/version_00001.xml
diff --git a/test/data/package_wildcard1_00001.xml b/test/data/mvn_package/wildcard1_00001.xml
similarity index 100%
rename from test/data/package_wildcard1_00001.xml
rename to test/data/mvn_package/wildcard1_00001.xml
diff --git a/test/data/package_wildcard2_00001.xml b/test/data/mvn_package/wildcard2_00001.xml
similarity index 100%
rename from test/data/package_wildcard2_00001.xml
rename to test/data/mvn_package/wildcard2_00001.xml
diff --git a/test/data/package_wildcard3_00001.xml b/test/data/mvn_package/wildcard3_00001.xml
similarity index 100%
rename from test/data/package_wildcard3_00001.xml
rename to test/data/mvn_package/wildcard3_00001.xml
diff --git a/test/alias_test.py b/test/mvn_alias_test.py
similarity index 68%
rename from test/alias_test.py
rename to test/mvn_alias_test.py
index aef5978..dfe4e56 100644
--- a/test/alias_test.py
+++ b/test/mvn_alias_test.py
@@ -2,7 +2,7 @@ import unittest
import shutil
from test_common import *
-class TestMvnalias(unittest.TestCase):
+class TestMvnmvn_alias(unittest.TestCase):
def setUp(self):
try:
@@ -16,215 +16,215 @@ class TestMvnalias(unittest.TestCase):
except OSError:
pass
- @xmvnconfig('alias', [])
+ @xmvnconfig('mvn_alias', [])
def test_run_no_args(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertEqual("Usage:", stderr[:6])
- @xmvnconfig('alias', ['-h'])
+ @xmvnconfig('mvn_alias', ['-h'])
def test_help(self, stdout, stderr, return_value):
self.assertTrue(stdout)
- @xmvnconfig('alias',['aaa:bbb', 'xxx:yyy', ])
+ @xmvnconfig('mvn_alias',['aaa:bbb', 'xxx:yyy', ])
def test_simple(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('alias', 'simple'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_alias', 'simple'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'alias', 'simple'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_alias', 'simple'))
- @xmvnconfig('alias',['aaa:bbb', 'xxx:yyy:1.2', ])
+ @xmvnconfig('mvn_alias',['aaa:bbb', 'xxx:yyy:1.2', ])
def test_version(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('alias', 'version'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_alias', 'version'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'alias', 'version'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_alias', 'version'))
- @xmvnconfig('alias',['aaa:bbb', 'xxx:yyy:zzz:', ])
+ @xmvnconfig('mvn_alias',['aaa:bbb', 'xxx:yyy:zzz:', ])
def test_extension(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('alias', 'extension'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_alias', 'extension'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'alias', 'extension'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_alias', 'extension'))
- @xmvnconfig('alias',['aaa:bbb', 'xxx:yyy:zzz:www:', ])
+ @xmvnconfig('mvn_alias',['aaa:bbb', 'xxx:yyy:zzz:www:', ])
def test_classifier(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('alias', 'classifier'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_alias', 'classifier'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'alias', 'classifier'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_alias', 'classifier'))
- @xmvnconfig('alias',['aaa:bbb:3.1', 'xxx:yyy:zzz:3.0', ])
+ @xmvnconfig('mvn_alias',['aaa:bbb:3.1', 'xxx:yyy:zzz:3.0', ])
def test_comb1(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('alias', 'comb1'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_alias', 'comb1'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'alias', 'comb1'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_alias', 'comb1'))
- @xmvnconfig('alias',['aaa:bbb:ccc:ddd:2.1', 'xxx:yyy:', ])
+ @xmvnconfig('mvn_alias',['aaa:bbb:ccc:ddd:2.1', 'xxx:yyy:', ])
def test_comb2(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('alias', 'comb2'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_alias', 'comb2'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'alias', 'comb2'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_alias', 'comb2'))
- @xmvnconfig('alias',['aaa:bbb:ccc:', 'xxx:yyy:zzz:www:2.1', ])
+ @xmvnconfig('mvn_alias',['aaa:bbb:ccc:', 'xxx:yyy:zzz:www:2.1', ])
def test_comb3(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('alias', 'comb3'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_alias', 'comb3'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'alias', 'comb3'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_alias', 'comb3'))
- @xmvnconfig('alias',['aaa:bbb:ccc:4.1', 'xxx:yyy:zzz:', ])
+ @xmvnconfig('mvn_alias',['aaa:bbb:ccc:4.1', 'xxx:yyy:zzz:', ])
def test_comb4(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('alias', 'comb4'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_alias', 'comb4'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'alias', 'comb4'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_alias', 'comb4'))
- @xmvnconfig('alias',['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb:ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc:dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd:1111111111111111111111111111111111111', 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy:zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz:wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww:33333333333333333333333333333333333333333333', ])
+ @xmvnconfig('mvn_alias',['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb:ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc:dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd:1111111111111111111111111111111111111', 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy:zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz:wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww:33333333333333333333333333333333333333333333', ])
def test_longopt(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('alias', 'longopt'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_alias', 'longopt'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'alias', 'longopt'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_alias', 'longopt'))
- @xmvnconfig('alias',['*:aaa', 'xxx:yyy', ])
+ @xmvnconfig('mvn_alias',['*:aaa', 'xxx:yyy', ])
def test_wildcard1(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('alias', 'wildcard1'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_alias', 'wildcard1'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'alias', 'wildcard1'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_alias', 'wildcard1'))
- @xmvnconfig('alias',[':aaa', 'xxx:yyy', ])
+ @xmvnconfig('mvn_alias',[':aaa', 'xxx:yyy', ])
def test_wildcard2(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('alias', 'wildcard2'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_alias', 'wildcard2'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'alias', 'wildcard2'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_alias', 'wildcard2'))
- @xmvnconfig('alias',['aaa::ccc', 'xxx:yyy', ])
+ @xmvnconfig('mvn_alias',['aaa::ccc', 'xxx:yyy', ])
def test_wildcard3(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('alias', 'wildcard3'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_alias', 'wildcard3'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'alias', 'wildcard3'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_alias', 'wildcard3'))
- @xmvnconfig('alias',['aaa:bbb', ])
+ @xmvnconfig('mvn_alias',['aaa:bbb', ])
def test_one_argument(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('alias',['aaa:bbb', 'xxx', ])
+ @xmvnconfig('mvn_alias',['aaa:bbb', 'xxx', ])
def test_invalid1(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('alias',['aaa', 'xxx:yyy', ])
+ @xmvnconfig('mvn_alias',['aaa', 'xxx:yyy', ])
def test_invalid2(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('alias',['aaa:bbb', 'xxx:', ])
+ @xmvnconfig('mvn_alias',['aaa:bbb', 'xxx:', ])
def test_wildcard4(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('alias', 'wildcard4'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_alias', 'wildcard4'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'alias', 'wildcard4'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_alias', 'wildcard4'))
- @xmvnconfig('alias',['a:b:c:d:e:f', 'x:y', ])
+ @xmvnconfig('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('alias',['a:b', 'x:y:z:w:1:e', ])
+ @xmvnconfig('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('alias',['aaa:bbb', 'ccc:ddd', 'eee:fff', 'ggg:hhh', ])
+ @xmvnconfig('mvn_alias',['aaa:bbb', 'ccc:ddd', 'eee:fff', 'ggg:hhh', ])
def test_multi(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('alias', 'multi'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_alias', 'multi'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'alias', 'multi'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_alias', 'multi'))
- @xmvnconfig('alias',['aaa:bbb', 'ccc:ddd', 'eee:fff', ])
+ @xmvnconfig('mvn_alias',['aaa:bbb', 'ccc:ddd', 'eee:fff', ])
def test_odd(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('alias', 'odd'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_alias', 'odd'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'alias', 'odd'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_alias', 'odd'))
- @xmvnconfig('alias',[':', ':', ])
+ @xmvnconfig('mvn_alias',[':', ':', ])
def test_wildcard7(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('alias',['x:y', 'a:b:c:*:1', ])
+ @xmvnconfig('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('alias',['x:y', 'a:b:c::1', ])
+ @xmvnconfig('mvn_alias',['x:y', 'a:b:c::1', ])
def test_wildcard9(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('alias', 'wildcard9'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_alias', 'wildcard9'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'alias', 'wildcard9'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_alias', 'wildcard9'))
- @xmvnconfig('alias',['*:{aaa,bbb}*', ':@1', ])
+ @xmvnconfig('mvn_alias',['*:{aaa,bbb}*', ':@1', ])
def test_backref(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('alias', 'backref'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_alias', 'backref'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'alias', 'backref'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_alias', 'backref'))
- @xmvnconfig('alias',['aaa', ':@1', ])
+ @xmvnconfig('mvn_alias',['aaa', ':@1', ])
def test_backref1(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('alias',['{aa,bb}:{cc,dd}', '@1:@2', ])
+ @xmvnconfig('mvn_alias',['{aa,bb}:{cc,dd}', '@1:@2', ])
def test_backref2(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('alias', 'backref2'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_alias', 'backref2'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'alias', 'backref2'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_alias', 'backref2'))
- @xmvnconfig('alias',[':{aaa,bbb}', '@1:@2', ])
+ @xmvnconfig('mvn_alias',[':{aaa,bbb}', '@1:@2', ])
def test_backref3(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('alias',[':{aaa,bbb', '@1', ])
+ @xmvnconfig('mvn_alias',[':{aaa,bbb', '@1', ])
def test_odd_braces1(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('alias',[':{aaa,bbb}}', '@1', ])
+ @xmvnconfig('mvn_alias',[':{aaa,bbb}}', '@1', ])
def test_odd_braces2(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('alias',['{aaa:bbb}:ccc', '@1', ])
+ @xmvnconfig('mvn_alias',['{aaa:bbb}:ccc', '@1', ])
def test_braces(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
diff --git a/test/build_test.py b/test/mvn_build_test.py
similarity index 74%
rename from test/build_test.py
rename to test/mvn_build_test.py
index 9ba3543..e669eef 100644
--- a/test/build_test.py
+++ b/test/mvn_build_test.py
@@ -2,7 +2,7 @@ import unittest
import shutil
from test_common import *
-class TestMvnbuild(unittest.TestCase):
+class TestMvnmvn_build(unittest.TestCase):
def setUp(self):
try:
@@ -16,114 +16,114 @@ class TestMvnbuild(unittest.TestCase):
except OSError:
pass
- @xmvnconfig('build', [])
+ @xmvnconfig('mvn_build', [])
def test_run_no_args(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertEqual("Usage:", stderr[:6])
- @xmvnconfig('build', ['-h'])
+ @xmvnconfig('mvn_build', ['-h'])
def test_help(self, stdout, stderr, return_value):
self.assertTrue(stdout)
- @xmvnconfig('build',[])
+ @xmvnconfig('mvn_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'))
+ self.assertEquals(get_actual_args(), get_expected_args('mvn_build', 'run_no_args'))
- @xmvnconfig('build',['-b', ])
+ @xmvnconfig('mvn_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'))
+ self.assertEquals(get_actual_args(), get_expected_args('mvn_build', 'bootstrap'))
- @xmvnconfig('build',['-d', ])
+ @xmvnconfig('mvn_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'))
+ self.assertEquals(get_actual_args(), get_expected_args('mvn_build', 'xmvn_debug'))
- @xmvnconfig('build',['-d', ])
+ @xmvnconfig('mvn_build',['-d', ])
def test_xmvn_debug1(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('build', 'xmvn_debug1'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_build', 'xmvn_debug1'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'build', 'xmvn_debug1'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_build', 'xmvn_debug1'))
- @xmvnconfig('build',['-f', ])
+ @xmvnconfig('mvn_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'))
+ self.assertEquals(get_actual_args(), get_expected_args('mvn_build', 'force'))
- @xmvnconfig('build',['-f', ])
+ @xmvnconfig('mvn_build',['-f', ])
def test_force1(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('build', 'force1'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_build', 'force1'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'build', 'force1'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_build', 'force1'))
- @xmvnconfig('build',['-g', ])
+ @xmvnconfig('mvn_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'))
+ self.assertEquals(get_actual_args(), get_expected_args('mvn_build', 'goal_before'))
- @xmvnconfig('build',['-G', ])
+ @xmvnconfig('mvn_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'))
+ self.assertEquals(get_actual_args(), get_expected_args('mvn_build', 'goal_after'))
- @xmvnconfig('build',['-i', ])
+ @xmvnconfig('mvn_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'))
+ self.assertEquals(get_actual_args(), get_expected_args('mvn_build', 'skip_install'))
- @xmvnconfig('build',['-j', ])
+ @xmvnconfig('mvn_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'))
+ self.assertEquals(get_actual_args(), get_expected_args('mvn_build', 'skip_javadoc'))
- @xmvnconfig('build',['-s', ])
+ @xmvnconfig('mvn_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'))
+ self.assertEquals(get_actual_args(), get_expected_args('mvn_build', 'singleton'))
- @xmvnconfig('build',['-s', ])
+ @xmvnconfig('mvn_build',['-s', ])
def test_singleton1(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('build', 'singleton1'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_build', 'singleton1'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'build', 'singleton1'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_build', 'singleton1'))
- @xmvnconfig('build',['-X', ])
+ @xmvnconfig('mvn_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'))
+ self.assertEquals(get_actual_args(), get_expected_args('mvn_build', 'debug'))
- @xmvnconfig('build',['-X', ])
+ @xmvnconfig('mvn_build',['-X', ])
def test_debug1(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('build', 'debug1'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_build', 'debug1'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'build', 'debug1'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_build', 'debug1'))
- @xmvnconfig('build',['-ji', ])
+ @xmvnconfig('mvn_build',['-ji', ])
def test_skip_both(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
- self.assertEquals(get_actual_args(), get_expected_args('build', 'skip_both'))
+ self.assertEquals(get_actual_args(), get_expected_args('mvn_build', 'skip_both'))
- @xmvnconfig('build',['-dfijsX', ])
+ @xmvnconfig('mvn_build',['-dfijsX', ])
def test_all(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
- self.assertEquals(get_actual_args(), get_expected_args('build', 'all'))
+ self.assertEquals(get_actual_args(), get_expected_args('mvn_build', 'all'))
- @xmvnconfig('build',['-dfijsX', ])
+ @xmvnconfig('mvn_build',['-dfijsX', ])
def test_all1(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('build', 'all1'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_build', 'all1'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'build', 'all1'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_build', 'all1'))
if __name__ == '__main__':
unittest.main()
diff --git a/test/compat_version_test.py b/test/mvn_compat_version_test.py
similarity index 70%
rename from test/compat_version_test.py
rename to test/mvn_compat_version_test.py
index c54ec06..dbfca24 100644
--- a/test/compat_version_test.py
+++ b/test/mvn_compat_version_test.py
@@ -2,7 +2,7 @@ import unittest
import shutil
from test_common import *
-class TestMvncompat_version(unittest.TestCase):
+class TestMvnmvn_compat_version(unittest.TestCase):
def setUp(self):
try:
@@ -16,71 +16,71 @@ class TestMvncompat_version(unittest.TestCase):
except OSError:
pass
- @xmvnconfig('compat_version', [])
+ @xmvnconfig('mvn_compat_version', [])
def test_run_no_args(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertEqual("Usage:", stderr[:6])
- @xmvnconfig('compat_version', ['-h'])
+ @xmvnconfig('mvn_compat_version', ['-h'])
def test_help(self, stdout, stderr, return_value):
self.assertTrue(stdout)
- @xmvnconfig('compat_version',['aaa:bbb', '1', ])
+ @xmvnconfig('mvn_compat_version',['aaa:bbb', '1', ])
def test_simple(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('compat_version', 'simple'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_compat_version', 'simple'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'compat_version', 'simple'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_compat_version', 'simple'))
- @xmvnconfig('compat_version',['aaa:bbb', ])
+ @xmvnconfig('mvn_compat_version',['aaa:bbb', ])
def test_single(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('compat_version',['aaa:bbb', '1', '2', '3', ])
+ @xmvnconfig('mvn_compat_version',['aaa:bbb', '1', '2', '3', ])
def test_more(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('compat_version', 'more'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_compat_version', 'more'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'compat_version', 'more'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_compat_version', 'more'))
- @xmvnconfig('compat_version',['aaa:bbb:ccc:ddd:1.2', '3.1', ])
+ @xmvnconfig('mvn_compat_version',['aaa:bbb:ccc:ddd:1.2', '3.1', ])
def test_version(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('compat_version', 'version'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_compat_version', 'version'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'compat_version', 'version'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_compat_version', 'version'))
- @xmvnconfig('compat_version',[':bbb', '2', ])
+ @xmvnconfig('mvn_compat_version',[':bbb', '2', ])
def test_wildcard(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('compat_version', 'wildcard'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_compat_version', 'wildcard'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'compat_version', 'wildcard'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_compat_version', 'wildcard'))
- @xmvnconfig('compat_version',['aa:bb:{1,2}', '@1', ])
+ @xmvnconfig('mvn_compat_version',['aa:bb:{1,2}', '@1', ])
def test_backref1(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('compat_version', 'backref1'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_compat_version', 'backref1'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'compat_version', 'backref1'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_compat_version', 'backref1'))
- @xmvnconfig('compat_version',['aaa:bb:{1,2}', '@3', ])
+ @xmvnconfig('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('compat_version',['aaa:bbb:{1,2', '@1', ])
+ @xmvnconfig('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('compat_version',['aaa:bbb:1,2}', '@3', ])
+ @xmvnconfig('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/config_test.py b/test/mvn_config_test.py
similarity index 73%
rename from test/config_test.py
rename to test/mvn_config_test.py
index ca44f78..c2a86b7 100644
--- a/test/config_test.py
+++ b/test/mvn_config_test.py
@@ -2,7 +2,7 @@ import unittest
import shutil
from test_common import *
-class TestMvnconfig(unittest.TestCase):
+class TestMvnmvn_config(unittest.TestCase):
def setUp(self):
try:
@@ -16,124 +16,124 @@ class TestMvnconfig(unittest.TestCase):
except OSError:
pass
- @xmvnconfig('config', [])
+ @xmvnconfig('mvn_config', [])
def test_run_no_args(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertEqual("Usage:", stderr[:6])
- @xmvnconfig('config', ['-h'])
+ @xmvnconfig('mvn_config', ['-h'])
def test_help(self, stdout, stderr, return_value):
self.assertTrue(stdout)
- @xmvnconfig('config',['aaa', ])
+ @xmvnconfig('mvn_config',['aaa', ])
def test_single(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('config',['a', 'b', 'c', ])
+ @xmvnconfig('mvn_config',['a', 'b', 'c', ])
def test_more(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('config',['aaa', 'bbb', ])
+ @xmvnconfig('mvn_config',['aaa', 'bbb', ])
def test_simple(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('config', 'simple'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_config', 'simple'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'config', 'simple'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_config', 'simple'))
- @xmvnconfig('config',['a/b/c', 'xxx', ])
+ @xmvnconfig('mvn_config',['a/b/c', 'xxx', ])
def test_path(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('config', 'path'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_config', 'path'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'config', 'path'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_config', 'path'))
- @xmvnconfig('config',['a', '<b/>', ])
+ @xmvnconfig('mvn_config',['a', '<b/>', ])
def test_xml1(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('config', 'xml1'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_config', 'xml1'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'config', 'xml1'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_config', 'xml1'))
- @xmvnconfig('config',['a', '<b>c</b>', ])
+ @xmvnconfig('mvn_config',['a', '<b>c</b>', ])
def test_xml2(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('config', 'xml2'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_config', 'xml2'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'config', 'xml2'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_config', 'xml2'))
- @xmvnconfig('config',['a', '<b>c</b><d/>', ])
+ @xmvnconfig('mvn_config',['a', '<b>c</b><d/>', ])
def test_xml3(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('config', 'xml3'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_config', 'xml3'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'config', 'xml3'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_config', 'xml3'))
- @xmvnconfig('config',['a', '<b>c</b><d>e</d>', ])
+ @xmvnconfig('mvn_config',['a', '<b>c</b><d>e</d>', ])
def test_xml4(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('config', 'xml4'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_config', 'xml4'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'config', 'xml4'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_config', 'xml4'))
- @xmvnconfig('config',['a', '<b><c>d</c></b>', ])
+ @xmvnconfig('mvn_config',['a', '<b><c>d</c></b>', ])
def test_nested_xml1(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('config', 'nested_xml1'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_config', 'nested_xml1'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'config', 'nested_xml1'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_config', 'nested_xml1'))
- @xmvnconfig('config',['a', '<b><c>d</c>d</b>', ])
+ @xmvnconfig('mvn_config',['a', '<b><c>d</c>d</b>', ])
def test_nested_xml2(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('config', 'nested_xml2'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_config', 'nested_xml2'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'config', 'nested_xml2'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_config', 'nested_xml2'))
- @xmvnconfig('config',['a', '<b', ])
+ @xmvnconfig('mvn_config',['a', '<b', ])
def test_invalid_xml1(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('config',['a', '<b>', ])
+ @xmvnconfig('mvn_config',['a', '<b>', ])
def test_invalid_xml2(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('config',['a', '<b><c></b>', ])
+ @xmvnconfig('mvn_config',['a', '<b><c></b>', ])
def test_invalid_xml3(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('config',['a', '<b></c></b>', ])
+ @xmvnconfig('mvn_config',['a', '<b></c></b>', ])
def test_invalid_xml4(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('config',['a', '<b>c<d</b>', ])
+ @xmvnconfig('mvn_config',['a', '<b>c<d</b>', ])
def test_entity(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('config', 'entity'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_config', 'entity'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'config', 'entity'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_config', 'entity'))
- @xmvnconfig('config',['a', 'f<b>c</b>d', ])
+ @xmvnconfig('mvn_config',['a', 'f<b>c</b>d', ])
def test_mixed(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('config', 'mixed'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_config', 'mixed'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'config', 'mixed'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_config', 'mixed'))
if __name__ == '__main__':
unittest.main()
diff --git a/test/file_test.py b/test/mvn_file_test.py
similarity index 71%
rename from test/file_test.py
rename to test/mvn_file_test.py
index df2b71b..29d3122 100644
--- a/test/file_test.py
+++ b/test/mvn_file_test.py
@@ -2,7 +2,7 @@ import unittest
import shutil
from test_common import *
-class TestMvnfile(unittest.TestCase):
+class TestMvnmvn_file(unittest.TestCase):
def setUp(self):
try:
@@ -16,193 +16,193 @@ class TestMvnfile(unittest.TestCase):
except OSError:
pass
- @xmvnconfig('file', [])
+ @xmvnconfig('mvn_file', [])
def test_run_no_args(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertEqual("Usage:", stderr[:6])
- @xmvnconfig('file', ['-h'])
+ @xmvnconfig('mvn_file', ['-h'])
def test_help(self, stdout, stderr, return_value):
self.assertTrue(stdout)
- @xmvnconfig('file',['x', ])
+ @xmvnconfig('mvn_file',['x', ])
def test_single(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('file',[':x', 'file', ])
+ @xmvnconfig('mvn_file',[':x', 'file', ])
def test_simple(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('file', 'simple'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_file', 'simple'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'file', 'simple'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_file', 'simple'))
- @xmvnconfig('file',[':guice', 'google/guice', 'guice', ])
+ @xmvnconfig('mvn_file',[':guice', 'google/guice', 'guice', ])
def test_symlink(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('file', 'symlink'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_file', 'symlink'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'file', 'symlink'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_file', 'symlink'))
- @xmvnconfig('file',['a:b', 'file', ])
+ @xmvnconfig('mvn_file',['a:b', 'file', ])
def test_group(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('file', 'group'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_file', 'group'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'file', 'group'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_file', 'group'))
- @xmvnconfig('file',[':a:1.3', 'file', ])
+ @xmvnconfig('mvn_file',[':a:1.3', 'file', ])
def test_version(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('file', 'version'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_file', 'version'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'file', 'version'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_file', 'version'))
- @xmvnconfig('file',['a:b:c:', 'file', ])
+ @xmvnconfig('mvn_file',['a:b:c:', 'file', ])
def test_extension(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('file', 'extension'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_file', 'extension'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'file', 'extension'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_file', 'extension'))
- @xmvnconfig('file',['*:a', 'file', ])
+ @xmvnconfig('mvn_file',['*:a', 'file', ])
def test_wildcard(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('file', 'wildcard'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_file', 'wildcard'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'file', 'wildcard'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_file', 'wildcard'))
- @xmvnconfig('file',['a', 'file', ])
+ @xmvnconfig('mvn_file',['a', 'file', ])
def test_invalid1(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('file',['a:b:c:d:e:f', 'file', ])
+ @xmvnconfig('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('file',[':a', 'file', 'sym1', 'sym2', 'sym3', ])
+ @xmvnconfig('mvn_file',[':a', 'file', 'sym1', 'sym2', 'sym3', ])
def test_symlinks(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('file', 'symlinks'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_file', 'symlinks'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'file', 'symlinks'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_file', 'symlinks'))
- @xmvnconfig('file',['a:b:c:d:1', 'sym', ])
+ @xmvnconfig('mvn_file',['a:b:c:d:1', 'sym', ])
def test_classifier(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('file', 'classifier'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_file', 'classifier'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'file', 'classifier'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_file', 'classifier'))
- @xmvnconfig('file',['a::c:', 'sym', ])
+ @xmvnconfig('mvn_file',['a::c:', 'sym', ])
def test_wildcard2(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('file', 'wildcard2'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_file', 'wildcard2'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'file', 'wildcard2'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_file', 'wildcard2'))
- @xmvnconfig('file',['a:b', 'sym1', 'sym2', 'sym3', 'sym4', 'sym5', 'sym6', 'sym7', 'sym8', 'sym9', 'sym10', 'sym11', 'sym12', 'sym13', 'sym14', 'sym15', 'sym16', 'sym17', 'sym18', 'sym19', 'sym20', 'sym21', ])
+ @xmvnconfig('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):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('file', 'more_symlinks'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_file', 'more_symlinks'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'file', 'more_symlinks'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_file', 'more_symlinks'))
- @xmvnconfig('file',[':{aa,bb}', '@1', ])
+ @xmvnconfig('mvn_file',[':{aa,bb}', '@1', ])
def test_backref(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('file', 'backref'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_file', 'backref'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'file', 'backref'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_file', 'backref'))
- @xmvnconfig('file',['{aa,bb}:{cc,dd}', '@2', '@1', ])
+ @xmvnconfig('mvn_file',['{aa,bb}:{cc,dd}', '@2', '@1', ])
def test_backref1(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('file', 'backref1'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_file', 'backref1'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'file', 'backref1'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_file', 'backref1'))
- @xmvnconfig('file',[':a', '@1', ])
+ @xmvnconfig('mvn_file',[':a', '@1', ])
def test_backref2(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('file',[':{a,b}', '@1', '@4', ])
+ @xmvnconfig('mvn_file',[':{a,b}', '@1', '@4', ])
def test_backref3(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('file',['{aa,bb}:{x,y', '@1', ])
+ @xmvnconfig('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('file',['{aa,bb}:{x,y}}', '@1', ])
+ @xmvnconfig('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('file',['a:b', 'a/file1', ])
+ @xmvnconfig('mvn_file',['a:b', 'a/file1', ])
def test_relative1(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('file', 'relative1'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_file', 'relative1'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'file', 'relative1'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_file', 'relative1'))
- @xmvnconfig('file',['a:b', '../file1', ])
+ @xmvnconfig('mvn_file',['a:b', '../file1', ])
def test_relative2(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('file', 'relative2'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_file', 'relative2'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'file', 'relative2'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_file', 'relative2'))
- @xmvnconfig('file',['a:{bb,cc}', 'a/@1', ])
+ @xmvnconfig('mvn_file',['a:{bb,cc}', 'a/@1', ])
def test_relative3(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('file', 'relative3'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_file', 'relative3'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'file', 'relative3'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_file', 'relative3'))
- @xmvnconfig('file',['a:b', '/usr/share/java/sym', ])
+ @xmvnconfig('mvn_file',['a:b', '/usr/share/java/sym', ])
def test_absolute1(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('file', 'absolute1'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_file', 'absolute1'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'file', 'absolute1'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_file', 'absolute1'))
- @xmvnconfig('file',['-p', '/usr/share/', 'a:b', '/usr/share/sym', ])
+ @xmvnconfig('mvn_file',['-p', '/usr/share/', 'a:b', '/usr/share/sym', ])
def test_prefix1(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('file', 'prefix1'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_file', 'prefix1'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'file', 'prefix1'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_file', 'prefix1'))
- @xmvnconfig('file',['-p', '/usr', 'a:b', '/usr/share/sym', ])
+ @xmvnconfig('mvn_file',['-p', '/usr', 'a:b', '/usr/share/sym', ])
def test_prefix2(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('file', 'prefix2'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_file', 'prefix2'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'file', 'prefix2'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_file', 'prefix2'))
if __name__ == '__main__':
unittest.main()
diff --git a/test/package_test.py b/test/mvn_package_test.py
similarity index 71%
rename from test/package_test.py
rename to test/mvn_package_test.py
index ecfd93a..95de076 100644
--- a/test/package_test.py
+++ b/test/mvn_package_test.py
@@ -2,7 +2,7 @@ import unittest
import shutil
from test_common import *
-class TestMvnpackage(unittest.TestCase):
+class TestMvnmvn_package(unittest.TestCase):
def setUp(self):
try:
@@ -16,148 +16,148 @@ class TestMvnpackage(unittest.TestCase):
except OSError:
pass
- @xmvnconfig('package', [])
+ @xmvnconfig('mvn_package', [])
def test_run_no_args(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertEqual("Usage:", stderr[:6])
- @xmvnconfig('package', ['-h'])
+ @xmvnconfig('mvn_package', ['-h'])
def test_help(self, stdout, stderr, return_value):
self.assertTrue(stdout)
- @xmvnconfig('package',['aaa:bbb', 'pack', ])
+ @xmvnconfig('mvn_package',['aaa:bbb', 'pack', ])
def test_simple(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('package', 'simple'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_package', 'simple'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'package', 'simple'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_package', 'simple'))
- @xmvnconfig('package',['aaa:bbb:1.2', 'pack', ])
+ @xmvnconfig('mvn_package',['aaa:bbb:1.2', 'pack', ])
def test_version(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('package', 'version'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_package', 'version'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'package', 'version'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_package', 'version'))
- @xmvnconfig('package',['aaa:bbb:ccc:', 'pack', ])
+ @xmvnconfig('mvn_package',['aaa:bbb:ccc:', 'pack', ])
def test_extension(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('package', 'extension'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_package', 'extension'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'package', 'extension'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_package', 'extension'))
- @xmvnconfig('package',['aaa:bbb:ccc:ddd:', 'pack', ])
+ @xmvnconfig('mvn_package',['aaa:bbb:ccc:ddd:', 'pack', ])
def test_classifier(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('package', 'classifier'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_package', 'classifier'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'package', 'classifier'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_package', 'classifier'))
- @xmvnconfig('package',['aaa:bbb:ccc:ddd:21', 'pack', ])
+ @xmvnconfig('mvn_package',['aaa:bbb:ccc:ddd:21', 'pack', ])
def test_all(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('package', 'all'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_package', 'all'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'package', 'all'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_package', 'all'))
- @xmvnconfig('package',[':bbb', 'pack', ])
+ @xmvnconfig('mvn_package',[':bbb', 'pack', ])
def test_wildcard1(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('package', 'wildcard1'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_package', 'wildcard1'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'package', 'wildcard1'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_package', 'wildcard1'))
- @xmvnconfig('package',[':', 'pack', ])
+ @xmvnconfig('mvn_package',[':', 'pack', ])
def test_wildcard2(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('package', 'wildcard2'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_package', 'wildcard2'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'package', 'wildcard2'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_package', 'wildcard2'))
- @xmvnconfig('package',['*:*', 'pack', ])
+ @xmvnconfig('mvn_package',['*:*', 'pack', ])
def test_wildcard3(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('package', 'wildcard3'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_package', 'wildcard3'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'package', 'wildcard3'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_package', 'wildcard3'))
- @xmvnconfig('package',[':bbb-{a,b,c}', 'pack', ])
+ @xmvnconfig('mvn_package',[':bbb-{a,b,c}', 'pack', ])
def test_braces1(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('package', 'braces1'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_package', 'braces1'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'package', 'braces1'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_package', 'braces1'))
- @xmvnconfig('package',['a-{b,c}:{x,y}-z', 'pack', ])
+ @xmvnconfig('mvn_package',['a-{b,c}:{x,y}-z', 'pack', ])
def test_braces2(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('package', 'braces2'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_package', 'braces2'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'package', 'braces2'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_package', 'braces2'))
- @xmvnconfig('package',['aaa:bbb', ])
+ @xmvnconfig('mvn_package',['aaa:bbb', ])
def test_single(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('package',['aaa:bbb', 'pack', 'evil', ])
+ @xmvnconfig('mvn_package',['aaa:bbb', 'pack', 'evil', ])
def test_more(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('package',[':bbb-{a,b', 'pack', ])
+ @xmvnconfig('mvn_package',[':bbb-{a,b', 'pack', ])
def test_odd_braces(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('package',[':bb-a,b}', 'pack', ])
+ @xmvnconfig('mvn_package',[':bb-a,b}', 'pack', ])
def test_odd_braces1(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('package',['a-{b,c}:{x,y}-z', '@2', ])
+ @xmvnconfig('mvn_package',['a-{b,c}:{x,y}-z', '@2', ])
def test_backref1(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('package', 'backref1'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_package', 'backref1'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'package', 'backref1'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_package', 'backref1'))
- @xmvnconfig('package',['a-{b,c}:{x,y}-z', '@1', ])
+ @xmvnconfig('mvn_package',['a-{b,c}:{x,y}-z', '@1', ])
def test_backref2(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('package', 'backref2'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_package', 'backref2'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'package', 'backref2'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_package', 'backref2'))
- @xmvnconfig('package',['a:b', '@1', ])
+ @xmvnconfig('mvn_package',['a:b', '@1', ])
def test_backref3(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('package',['a-{b,c}:x', '@3', ])
+ @xmvnconfig('mvn_package',['a-{b,c}:x', '@3', ])
def test_backref4(self, stdout, stderr, return_value):
self.assertNotEqual(return_value, 0)
self.assertTrue(stderr)
- @xmvnconfig('package',['aaa:bbb', '__noinstall', ])
+ @xmvnconfig('mvn_package',['aaa:bbb', '__noinstall', ])
def test_noinstall(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
filelist = get_config_file_list()
- self.assertEquals(len(filelist), get_expected_file_count('package', 'noinstall'))
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_package', 'noinstall'))
for file in filelist:
- self.assertEquals(get_actual_config(file), get_expected_config(file, 'package', 'noinstall'))
+ self.assertEquals(get_actual_config(file), get_expected_config(file, 'mvn_package', 'noinstall'))
if __name__ == '__main__':
unittest.main()
diff --git a/test/test_common.py b/test/test_common.py
index 7ef06e6..8f745ab 100644
--- a/test/test_common.py
+++ b/test/test_common.py
@@ -41,25 +41,25 @@ def get_actual_config(filename):
return etree.tostring(etree.parse(actfile), pretty_print=True)
def get_expected_config(filename, scriptname, testname):
- expfname = '{}_{}_{}.xml'.format(scriptname, testname, re.findall('[0-9]+', filename)[-1])
- expfile = open(os.path.join(dirpath, 'data', expfname))
+ expfname = '{name}_{idx}.xml'.format(name=testname, idx=re.findall('[0-9]+', filename)[-1])
+ expfile = open(os.path.join(dirpath, 'data', scriptname, expfname))
return etree.tostring(etree.parse(expfile), pretty_print=True)
def get_expected_file_count(scriptname, testname):
- filelist = os.listdir(os.path.join(dirpath, 'data'))
- return len([file for file in filelist if file.startswith("{}_{}_".format(scriptname, testname))])
+ filelist = os.listdir(os.path.join(dirpath, 'data', scriptname))
+ return len([file for file in filelist if file.startswith("{name}_".format(name=testname))])
def get_actual_args():
return open('.xmvn/out').read()
def get_expected_args(scriptname, testname):
- return open(os.path.join(dirpath, 'data', "{}_{}_out".format(scriptname, testname))).read()
+ return open(os.path.join(dirpath, 'data', scriptname, "{name}_out".format(name=testname))).read()
def xmvnconfig(name, fnargs):
def test_decorator(fn):
def test_decorated(self, *args, **kwargs):
- path = os.path.join(dirpath, '..', 'java-utils', 'mvn_' + name + '.py')
+ path = os.path.join(dirpath, '..', 'java-utils', name + '.py')
(stdout, stderr, return_value) = call_script(path, fnargs)
fn(self, stdout, stderr, return_value)
return test_decorated
More information about the java-sig-commits
mailing list