commit 36440c6b56692ab1224e6cf3bdf247fea8834e8e Author: Michal Srb msrb@redhat.com Date: Thu Jul 24 09:37:58 2014 +0200
py3k: fix "DeprecationWarning: Please use assertEqual instead."
python/test/artifact_test.py | 54 +++++++++++----------- test/maven_prov_test.py | 56 ++++++++++++------------ test/maven_req_test.py | 92 +++++++++++++++++++------------------- test/mvn_alias_test.py | 80 +++++++++++++++++----------------- test/mvn_build_test.py | 64 +++++++++++++------------- test/mvn_compat_version_test.py | 20 ++++---- test/mvn_config_test.py | 40 ++++++++-------- test/mvn_file_test.py | 64 +++++++++++++------------- test/mvn_macros_test.py | 60 +++++++++++++------------- test/mvn_package_test.py | 56 ++++++++++++------------ test/osgi_prov_test.py | 12 +++--- test/osgi_req_test.py | 8 ++-- 12 files changed, 303 insertions(+), 303 deletions(-) --- diff --git a/python/test/artifact_test.py b/python/test/artifact_test.py index 621b372..5750fdc 100644 --- a/python/test/artifact_test.py +++ b/python/test/artifact_test.py @@ -63,10 +63,10 @@ class TestArtifact(unittest.TestCase): self.assertNotEqual(doc, None) item = doc.find('./groupId') self.assertNotEqual(item, None) - self.assertEquals(item.text, 'g') + self.assertEqual(item.text, 'g') item = doc.find('./artifactId') self.assertNotEqual(item, None) - self.assertEquals(item.text, 'a') + self.assertEqual(item.text, 'a') item = doc.find('./extension') self.assertEqual(item, None) item = doc.find('./classifier') @@ -80,13 +80,13 @@ class TestArtifact(unittest.TestCase): self.assertNotEqual(doc, None) item = doc.find('./groupId') self.assertNotEqual(item, None) - self.assertEquals(item.text, 'g') + self.assertEqual(item.text, 'g') item = doc.find('./artifactId') self.assertNotEqual(item, None) - self.assertEquals(item.text, 'a') + self.assertEqual(item.text, 'a') item = doc.find('./extension') self.assertNotEqual(item, None) - self.assertEquals(item.text, 'e') + self.assertEqual(item.text, 'e') item = doc.find('./classifier') self.assertEqual(item, None) item = doc.find('./version') @@ -98,16 +98,16 @@ class TestArtifact(unittest.TestCase): self.assertNotEqual(doc, None) item = doc.find('./groupId') self.assertNotEqual(item, None) - self.assertEquals(item.text, 'g') + self.assertEqual(item.text, 'g') item = doc.find('./artifactId') self.assertNotEqual(item, None) - self.assertEquals(item.text, 'a') + self.assertEqual(item.text, 'a') item = doc.find('./extension') self.assertNotEqual(item, None) - self.assertEquals(item.text, 'jar') + self.assertEqual(item.text, 'jar') item = doc.find('./classifier') self.assertNotEqual(item, None) - self.assertEquals(item.text, 'c') + self.assertEqual(item.text, 'c') item = doc.find('./version') self.assertEqual(item, None) self.assertEqual(len(doc), 4) @@ -117,18 +117,18 @@ class TestArtifact(unittest.TestCase): self.assertNotEqual(doc, None) item = doc.find('./groupId') self.assertNotEqual(item, None) - self.assertEquals(item.text, 'g') + self.assertEqual(item.text, 'g') item = doc.find('./artifactId') self.assertNotEqual(item, None) - self.assertEquals(item.text, 'a') + self.assertEqual(item.text, 'a') item = doc.find('./extension') self.assertNotEqual(item, None) - self.assertEquals(item.text, 'jar') + self.assertEqual(item.text, 'jar') item = doc.find('./classifier') self.assertEqual(item, None) item = doc.find('./version') self.assertNotEqual(item, None) - self.assertEquals(item.text, 'v') + self.assertEqual(item.text, 'v') self.assertEqual(len(doc), 4)
def test_xml_str_gaev(self): @@ -136,18 +136,18 @@ class TestArtifact(unittest.TestCase): self.assertNotEqual(doc, None) item = doc.find('./groupId') self.assertNotEqual(item, None) - self.assertEquals(item.text, 'g') + self.assertEqual(item.text, 'g') item = doc.find('./artifactId') self.assertNotEqual(item, None) - self.assertEquals(item.text, 'a') + self.assertEqual(item.text, 'a') item = doc.find('./extension') self.assertNotEqual(item, None) - self.assertEquals(item.text, 'e') + self.assertEqual(item.text, 'e') item = doc.find('./classifier') self.assertEqual(item, None) item = doc.find('./version') self.assertNotEqual(item, None) - self.assertEquals(item.text, 'v') + self.assertEqual(item.text, 'v') self.assertEqual(len(doc), 4)
def test_xml_str_gacv(self): @@ -155,19 +155,19 @@ class TestArtifact(unittest.TestCase): self.assertNotEqual(doc, None) item = doc.find('./groupId') self.assertNotEqual(item, None) - self.assertEquals(item.text, 'g') + self.assertEqual(item.text, 'g') item = doc.find('./artifactId') self.assertNotEqual(item, None) - self.assertEquals(item.text, 'a') + self.assertEqual(item.text, 'a') item = doc.find('./extension') self.assertNotEqual(item, None) - self.assertEquals(item.text, 'jar') + self.assertEqual(item.text, 'jar') item = doc.find('./classifier') self.assertNotEqual(item, None) - self.assertEquals(item.text, 'c') + self.assertEqual(item.text, 'c') item = doc.find('./version') self.assertNotEqual(item, None) - self.assertEquals(item.text, 'v') + self.assertEqual(item.text, 'v') self.assertEqual(len(doc), 5)
def test_xml_str_full(self): @@ -175,19 +175,19 @@ class TestArtifact(unittest.TestCase): self.assertNotEqual(doc, None) item = doc.find('./groupId') self.assertNotEqual(item, None) - self.assertEquals(item.text, 'g') + self.assertEqual(item.text, 'g') item = doc.find('./artifactId') self.assertNotEqual(item, None) - self.assertEquals(item.text, 'a') + self.assertEqual(item.text, 'a') item = doc.find('./extension') self.assertNotEqual(item, None) - self.assertEquals(item.text, 'e') + self.assertEqual(item.text, 'e') item = doc.find('./classifier') self.assertNotEqual(item, None) - self.assertEquals(item.text, 'c') + self.assertEqual(item.text, 'c') item = doc.find('./version') self.assertNotEqual(item, None) - self.assertEquals(item.text, 'v') + self.assertEqual(item.text, 'v') self.assertEqual(len(doc), 5)
@exception_expected(ArtifactFormatException) diff --git a/test/maven_prov_test.py b/test/maven_prov_test.py index 778a6c0..98d6044 100644 --- a/test/maven_prov_test.py +++ b/test/maven_prov_test.py @@ -8,9 +8,9 @@ class TestMavenProv(unittest.TestCase):
@mavenprov(["simple.xml"]) def test_simple(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] - self.assertEquals(len(sout), 2) + self.assertEqual(len(sout), 2) assertIn(self, "ns-mvn(org.codehaus.plexus:plexus-ant-factory:1.0) = 1.0", sout) assertIn(self, "ns-mvn(org.codehaus.plexus:plexus-ant-factory:pom:1.0) = 1.0", sout)
@@ -28,9 +28,9 @@ class TestMavenProv(unittest.TestCase):
@mavenprov(["single_ns.xml"]) def test_single_ns(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] - self.assertEquals(len(sout), 4) + self.assertEqual(len(sout), 4) assertIn(self, "ns-mvn(org.codehaus.plexus:plexus-ant-factory:1.0) = 1.0", sout) assertIn(self, "ns-mvn(org.codehaus.plexus:plexus-ant-factory:pom:1.0) = 1.0", sout) assertIn(self, "ns-mvn(org.mortbay.jetty:jsp-2.1-glassfish:1.0) = 9.1.1.b60.25.p2", sout) @@ -38,9 +38,9 @@ class TestMavenProv(unittest.TestCase):
@mavenprov(["multi_ns.xml"]) def test_multi_ns(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] - self.assertEquals(len(sout), 4) + self.assertEqual(len(sout), 4) assertIn(self, "ns-mvn(org.codehaus.plexus:plexus-ant-factory:1.0) = 1.0", sout) assertIn(self, "ns-mvn(org.codehaus.plexus:plexus-ant-factory:pom:1.0) = 1.0", sout) assertIn(self, "ns2-mvn(org.mortbay.jetty:jsp-2.1-glassfish:1.0) = 9.1.1.b60.25.p2", sout) @@ -52,9 +52,9 @@ class TestMavenProv(unittest.TestCase):
@mavenprov(["simple.xml", "simple2.xml"]) def test_more_files(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] - self.assertEquals(len(sout), 4) + self.assertEqual(len(sout), 4) assertIn(self, "ns-mvn(org.codehaus.plexus:plexus-ant-factory:1.0) = 1.0", sout) assertIn(self, "ns-mvn(org.codehaus.plexus:plexus-ant-factory:pom:1.0) = 1.0", sout) assertIn(self, "ns-mvn(org.mortbay.jetty:jsp-2.1-glassfish:6.0.18) = 9.1.1.b60.25.p2", sout) @@ -66,60 +66,60 @@ class TestMavenProv(unittest.TestCase):
@mavenprov(["non_compat.xml"]) def test_non_compat(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] - self.assertEquals(len(sout), 2) + self.assertEqual(len(sout), 2) assertIn(self, "ns-mvn(org.codehaus.plexus:plexus-ant-factory) = 1.0", sout) assertIn(self, "ns-mvn(org.codehaus.plexus:plexus-ant-factory:pom:) = 1.0", sout)
@mavenprov(["extension1.xml"]) def test_extension1(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] - self.assertEquals(len(sout), 1) + self.assertEqual(len(sout), 1) assertIn(self, "ns-mvn(org.mortbay.jetty:jsp-2.1-glassfish:war:6.0.18) = 9.1.1.B60.25.p2", sout)
@mavenprov(["extension2.xml"]) def test_extension2(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] - self.assertEquals(len(sout), 1) + self.assertEqual(len(sout), 1) assertIn(self, "ns-mvn(org.mortbay.jetty:jsp-2.1-glassfish:6.0.18) = 9.1.1.B60.25.p2", sout)
@mavenprov(["pom_extension.xml"]) def test__pom_extension(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] - self.assertEquals(len(sout), 1) + self.assertEqual(len(sout), 1) assertIn(self, "ns-mvn(org.mortbay.jetty:jsp-2.1-glassfish:pom:) = 6.0.18", sout)
@mavenprov(["pom_namespace.xml"]) def test_namespace_rhbz1017271(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] - self.assertEquals(len(sout), 1) + self.assertEqual(len(sout), 1) assertIn(self, "maven31-mvn(org.apache.maven:apache-maven:pom:) = 3.1.1", sout)
@mavenprov(["pom_compat.xml"]) def test_compat_version_in_artifact(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] - self.assertEquals(len(sout), 1) + self.assertEqual(len(sout), 1) assertIn(self, "mvn(org.apache.maven:apache-maven:pom:3.1.1) = 3.1.1", sout)
@mavenprov(["alias.xml"]) def test_alias(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] - self.assertEquals(len(sout), 2) + self.assertEqual(len(sout), 2) assertIn(self, "mvn(jakarta-regexp:jakarta-regexp:pom:) = 1.0", sout) assertIn(self, "mvn(regexp:regexp:pom:) = 1.0", sout)
@mavenprov(["alias2.xml"]) def test_alias2(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] - self.assertEquals(len(sout), 4) + self.assertEqual(len(sout), 4) assertIn(self, "mvn(jakarta-regexp:jakarta-regexp:pom:) = 1.0", sout) assertIn(self, "mvn(jakarta-regexp:jakarta-regexp) = 1.0", sout) assertIn(self, "mvn(regexp:regexp:pom:) = 1.0", sout) @@ -127,9 +127,9 @@ class TestMavenProv(unittest.TestCase):
@mavenprov(["compat_alias.xml"]) def test_compat_alias(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] - self.assertEquals(len(sout), 4) + self.assertEqual(len(sout), 4) assertIn(self, "mvn(jakarta-regexp:jakarta-regexp:pom:1.1) = 1.0", sout) assertIn(self, "mvn(jakarta-regexp:jakarta-regexp:pom:1.1.1) = 1.0", sout) assertIn(self, "mvn(regexp:regexp:pom:1.1) = 1.0", sout) @@ -137,9 +137,9 @@ class TestMavenProv(unittest.TestCase):
@mavenprov(["jar_extension.xml"]) def test_jar_extension(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] - self.assertEquals(len(sout), 2) + self.assertEqual(len(sout), 2) assertIn(self, "mvn(args4j:args4j:pom:) = 2.0.16", sout) assertIn(self, "mvn(args4j:args4j) = 2.0.16", sout)
diff --git a/test/maven_req_test.py b/test/maven_req_test.py index 0a4d6f5..c2ab6b4 100644 --- a/test/maven_req_test.py +++ b/test/maven_req_test.py @@ -27,65 +27,65 @@ class TestMavenReq(unittest.TestCase):
@mavenreq(["require1/require.xml"]) def test_require1(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("jpackage-utils", "java-headless", "mvn(org.apache.maven:maven-project)") - self.assertEquals(set(want), set(sout)) + self.assertEqual(set(want), set(sout))
@mavenreq(["require-java/require.xml"]) def test_require_java(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("jpackage-utils", "mvn(org.apache.maven:maven-project)", "java-headless >= 1:1.6") - self.assertEquals(set(want), set(sout)) + self.assertEqual(set(want), set(sout))
@mavenreq(["require-java-devel/require.xml"]) def test_require_java_devel(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("jpackage-utils", "java-headless", "mvn(org.apache.maven:maven-project)", "java-devel >= 1:1.6") - self.assertEquals(set(want), set(sout)) + self.assertEqual(set(want), set(sout))
@mavenreq(["require-java-both/require.xml"]) def test_require_java_both(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("jpackage-utils", "mvn(org.apache.maven:maven-project)", "java-headless >= 1:1.6", "java-devel >= 1:1.6") - self.assertEquals(set(want), set(sout)) + self.assertEqual(set(want), set(sout))
@mavenreq(["require_parent/require.xml"]) def test_require_parent(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("jpackage-utils", "java-headless", "ns-mvn(org.codehaus.plexus:plexus-ant-factory)") - self.assertEquals(set(want), set(sout)) + self.assertEqual(set(want), set(sout))
@mavenreq(["require_multi/require.xml"]) def test_require_multi(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("jpackage-utils", "ns-mvn(org.codehaus.plexus:plexus-ant-factory)", "ns-mvn(codehaus:plexus-utils) = 1.2", "java-headless", "mvn(org.apache.maven.wagon:wagon-provider-api::test-jar:)") - self.assertEquals(set(want), set(sout)) + self.assertEqual(set(want), set(sout))
@mavenreq(["require_multi_namespaces/require.xml"]) def test_require_multi_namespace(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("jpackage-utils", "java-headless", "ns2-mvn(codehaus:plexus-cipher)", "ns-mvn(codehaus:plexus-utils)", "mvn(org.apache.maven.wagon:wagon-provider-api::test-jar:)") - self.assertEquals(set(want), set(sout)) + self.assertEqual(set(want), set(sout))
@mavenreq(["require_multi_versioned/require.xml"]) def test_require_multi_versioned(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("java-headless", "jpackage-utils", "ns-mvn(org.codehaus.plexus:plexus-ant-factory:1.0) = 1.0", @@ -93,59 +93,59 @@ class TestMavenReq(unittest.TestCase): "ns-mvn(codehaus:plexus-cipher:1.0) = 1.1", "mvn(org.apache.maven.wagon:wagon-provider-api::test-jar:)", "mvn(org.apache.maven.plugins:maven-idea-plugin:1.5) = 1.4") - self.assertEquals(set(want), set(sout)) + self.assertEqual(set(want), set(sout))
@mavenreq(["require_mixed/require.xml"]) def test_mixed(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("jpackage-utils", "java-headless", "ns-mvn(org.codehaus.plexus:plexus-ant-factory)", "ns-mvn(codehaus:plexus-utils) = 1.2", "mvn(org.apache.maven.wagon:wagon-provider-api::test-jar:)", "mvn(org.apache.maven.plugins:maven-idea-plugin)") - self.assertEquals(set(want), set(sout)) + self.assertEqual(set(want), set(sout))
@mavenreq(["requires_simple_subpackages/require.xml"]) def test_simple_subpackage(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("jpackage-utils", "java-headless", "mvn(org.apache.maven:maven-plugin-api) = 3.2.1") - self.assertEquals(set(want), set(sout)) + self.assertEqual(set(want), set(sout))
@mavenreq(["requires_simple_subpackages2/require.xml"]) def test_simple_subpackage2(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("jpackage-utils", "java-headless", "mvn(org.apache.maven:maven-plugin-api) = 3.2.1", "mvn(org.codehaus.plexus:plexus-utils)") - self.assertEquals(set(want), set(sout)) + self.assertEqual(set(want), set(sout))
@mavenreq(["requires_simple_subpackages2_compat/require.xml"]) def test_simple_subpackage3(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("jpackage-utils", "java-headless", "mvn(org.apache.maven:maven-plugin-api:3.2.0) = 3.2.1") - self.assertEquals(set(want), set(sout)) + self.assertEqual(set(want), set(sout))
@mavenreq(["requires_simple_subpackages2_compat2/require.xml"]) def test_simple_subpackage4(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("jpackage-utils", "java-headless", "mvn(org.apache.maven:maven-plugin-api)") - self.assertEquals(set(want), set(sout)) + self.assertEqual(set(want), set(sout))
@mavenreq(["requires_on_artifact_from_same_package/require.xml"]) def test_simple_artifact_in_same_package(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("jpackage-utils", "java-headless") - self.assertEquals(set(want), set(sout)) + self.assertEqual(set(want), set(sout))
#test for rhbz#1012980 @mavenreq(["require_skipped/require.xml"]) @@ -153,80 +153,80 @@ class TestMavenReq(unittest.TestCase): self.assertNotEqual(return_value, 0) self.assertNotEqual(stderr, '') lines = stderr.split('\n') - self.assertEquals(True, len(lines) > 1) - self.assertEquals(lines[-5], 'org.codehaus.plexus:plexus-ant-factory:1.0 ' \ + self.assertEqual(True, len(lines) > 1) + self.assertEqual(lines[-5], 'org.codehaus.plexus:plexus-ant-factory:1.0 ' \ 'required by org.apache.commons-lang:commons-lang')
# rhbz#1017701 comment 2 @mavenreq(["aether/require.xml"]) def test_rhbz1017701_c2(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("jpackage-utils", "java-headless", "maven31-mvn(org.eclipse.aether:aether-api) = 0.9.0.M3") - self.assertEquals(set(want), set(sout)) + self.assertEqual(set(want), set(sout))
@mavenreq(["require1/require.xml"], config='alternative-java') def test_java_config(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("jpackage-utils", "java-spineless", "mvn(org.apache.maven:maven-project)") - self.assertEquals(set(want), set(sout)) + self.assertEqual(set(want), set(sout))
@mavenreq(["require_multi/require.xml"], config='filtered') def test_dep_filtering(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("ns-mvn(org.codehaus.plexus:plexus-ant-factory)", "java-headless", "mvn(org.apache.maven.wagon:wagon-provider-api::test-jar:)", "jpackage-utils") - self.assertEquals(set(want), set(sout)) + self.assertEqual(set(want), set(sout))
@mavenreq(["require_multi/require.xml"], javaconfdirs=['data/config/filtered']) def test_config_env1(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("ns-mvn(org.codehaus.plexus:plexus-ant-factory)", "java-headless", "mvn(org.apache.maven.wagon:wagon-provider-api::test-jar:)", "jpackage-utils") - self.assertEquals(set(want), set(sout)) + self.assertEqual(set(want), set(sout))
@mavenreq(["require_multi/require.xml"], javaconfdirs=['data/config/filtered', 'data/config/alternative-java']) def test_config_env2(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("ns-mvn(org.codehaus.plexus:plexus-ant-factory)", "java-spineless", "mvn(org.apache.maven.wagon:wagon-provider-api::test-jar:)", "jpackage-utils") - self.assertEquals(set(want), set(sout)) + self.assertEqual(set(want), set(sout))
@mavenreq(["require2/maven-metadata/require.xml"]) def test_deps_from_pom(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("mvn(org.fedoraproject.xmvn:xmvn-core)", "java-headless", "jpackage-utils", "mvn(org.fedoraproject.xmvn:xmvn-api)") - self.assertEquals(set(want), set(sout)) + self.assertEqual(set(want), set(sout))
@mavenreq(["require3/maven-metadata/require.xml"]) def test_deps_from_pom_with_parent(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("mvn(org.fedoraproject.xmvn:xmvn-core)", "jpackage-utils", "mvn(org.fedoraproject.xmvn:xmvn-api:pom:)", "java-headless") - self.assertEquals(set(want), set(sout)) + self.assertEqual(set(want), set(sout))
@mavenreq(["require4/maven-metadata/require.xml"]) def test_deps_from_pom_on_subpkg(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("mvn(org.fedoraproject.xmvn:xmvn-core)", "jpackage-utils", "mvn(org.fedoraproject.xmvn:xmvn-api:pom:) = 1.0", "java-headless") - self.assertEquals(set(want), set(sout)) + self.assertEqual(set(want), set(sout))
@mavenreq(["require5/require.xml"]) def test_unknown_dep(self, stdout, stderr, return_value): diff --git a/test/mvn_alias_test.py b/test/mvn_alias_test.py index f54dbf4..a6925ac 100644 --- a/test/mvn_alias_test.py +++ b/test/mvn_alias_test.py @@ -35,9 +35,9 @@ class TestMvnAlias(unittest.TestCase):
@xmvnconfig('mvn_alias',['aaa:bbb', 'xxx:yyy', ]) def test_simple(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_alias', 'simple'), @@ -46,9 +46,9 @@ class TestMvnAlias(unittest.TestCase):
@xmvnconfig('mvn_alias',['aaa:bbb', 'xxx:yyy:1.2', ]) def test_version(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_alias', 'version'), @@ -57,9 +57,9 @@ class TestMvnAlias(unittest.TestCase):
@xmvnconfig('mvn_alias',['aaa:bbb', 'xxx:yyy:zzz:', ]) def test_extension(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_alias', 'extension'), @@ -68,9 +68,9 @@ class TestMvnAlias(unittest.TestCase):
@xmvnconfig('mvn_alias',['aaa:bbb', 'xxx:yyy:zzz:www:', ]) def test_classifier(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_alias', 'classifier'), @@ -79,9 +79,9 @@ class TestMvnAlias(unittest.TestCase):
@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, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_alias', 'comb1'), @@ -90,9 +90,9 @@ class TestMvnAlias(unittest.TestCase):
@xmvnconfig('mvn_alias',['aaa:bbb:ccc:ddd:2.1', 'xxx:yyy:', ]) def test_comb2(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_alias', 'comb2'), @@ -101,9 +101,9 @@ class TestMvnAlias(unittest.TestCase):
@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, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_alias', 'comb3'), @@ -112,9 +112,9 @@ class TestMvnAlias(unittest.TestCase):
@xmvnconfig('mvn_alias',['aaa:bbb:ccc:4.1', 'xxx:yyy:zzz:', ]) def test_comb4(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_alias', 'comb4'), @@ -131,9 +131,9 @@ class TestMvnAlias(unittest.TestCase): 'zzzzzzzzzzzzzzzzzzzzzzzzzzz:wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww' + 'wwwwwwwwwwwwwwwww:33333333333333333333333333333333333333333333']) def test_longopt(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_alias', 'longopt'), @@ -142,9 +142,9 @@ class TestMvnAlias(unittest.TestCase):
@xmvnconfig('mvn_alias',['*:aaa', 'xxx:yyy', ]) def test_wildcard1(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_alias', 'wildcard1'), @@ -153,9 +153,9 @@ class TestMvnAlias(unittest.TestCase):
@xmvnconfig('mvn_alias',[':aaa', 'xxx:yyy', ]) def test_wildcard2(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_alias', 'wildcard2'), @@ -164,9 +164,9 @@ class TestMvnAlias(unittest.TestCase):
@xmvnconfig('mvn_alias',['aaa::ccc', 'xxx:yyy', ]) def test_wildcard3(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_alias', 'wildcard3'), @@ -190,9 +190,9 @@ class TestMvnAlias(unittest.TestCase):
@xmvnconfig('mvn_alias',['aaa:bbb', 'xxx:', ]) def test_wildcard4(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_alias', 'wildcard4'), @@ -211,9 +211,9 @@ class TestMvnAlias(unittest.TestCase):
@xmvnconfig('mvn_alias',['aaa:bbb', 'ccc:ddd', 'eee:fff', 'ggg:hhh', ]) def test_multi(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_alias', 'multi'), @@ -222,9 +222,9 @@ class TestMvnAlias(unittest.TestCase):
@xmvnconfig('mvn_alias',['aaa:bbb', 'ccc:ddd', 'eee:fff', ]) def test_odd(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_alias', 'odd'), @@ -243,9 +243,9 @@ class TestMvnAlias(unittest.TestCase):
@xmvnconfig('mvn_alias',['x:y', 'a:b:c::1', ]) def test_wildcard9(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_alias', 'wildcard9'), @@ -254,9 +254,9 @@ class TestMvnAlias(unittest.TestCase):
@xmvnconfig('mvn_alias',['*:{aaa,bbb}*', ':@1', ]) def test_backref(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_alias', 'backref'), @@ -270,9 +270,9 @@ class TestMvnAlias(unittest.TestCase):
@xmvnconfig('mvn_alias',['{aa,bb}:{cc,dd}', '@1:@2', ]) def test_backref2(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_alias', 'backref2'), @@ -310,9 +310,9 @@ class TestMvnAlias(unittest.TestCase): @preload_xmvn_config('mvn_alias', 'preexisting.xml') @xmvnconfig('mvn_alias',['aaa:bbb', 'xxx:yyy', ]) def test_preexisting_unindexed(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 2) + self.assertEqual(len(filelist), 2) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_alias', 'simple'), @@ -324,9 +324,9 @@ class TestMvnAlias(unittest.TestCase): update_index=True) @xmvnconfig('mvn_alias',['aaa:bbb', 'xxx:yyy', ]) def test_preexisting(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 2) + self.assertEqual(len(filelist), 2) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_alias', 'preexisting'), diff --git a/test/mvn_build_test.py b/test/mvn_build_test.py index b34a450..9cce0d6 100644 --- a/test/mvn_build_test.py +++ b/test/mvn_build_test.py @@ -28,33 +28,33 @@ class TestMvnBuild(unittest.TestCase):
@xmvnconfig('mvn_build',[]) def test_run_no_args(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) - self.assertEquals(get_actual_args(), + self.assertEqual(return_value, 0, stderr) + self.assertEqual(get_actual_args(), get_expected_args('mvn_build', 'run_no_args'))
@xmvnconfig('mvn_build',['-b', ]) def test_bootstrap(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) - self.assertEquals(get_actual_args(), + self.assertEqual(return_value, 0, stderr) + self.assertEqual(get_actual_args(), get_expected_args('mvn_build', 'bootstrap'))
@xmvnconfig('mvn_build',['-d', ]) def test_xmvn_debug(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) - self.assertEquals(get_actual_args(), + self.assertEqual(return_value, 0, stderr) + self.assertEqual(get_actual_args(), get_expected_args('mvn_build', 'xmvn_debug'))
@xmvnconfig('mvn_build',['-f', ]) def test_force(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) - self.assertEquals(get_actual_args(), + self.assertEqual(return_value, 0, stderr) + self.assertEqual(get_actual_args(), get_expected_args('mvn_build', 'force'))
@xmvnconfig('mvn_build',['-f', ]) def test_force1(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_build', 'force1'), @@ -63,39 +63,39 @@ class TestMvnBuild(unittest.TestCase):
@xmvnconfig('mvn_build',['-g', 'validate']) def test_goal_before(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) - self.assertEquals(get_actual_args(), + self.assertEqual(return_value, 0, stderr) + self.assertEqual(get_actual_args(), get_expected_args('mvn_build', 'goal_before'))
@xmvnconfig('mvn_build',['-G', 'integration-test']) def test_goal_after(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) - self.assertEquals(get_actual_args(), + self.assertEqual(return_value, 0, stderr) + self.assertEqual(get_actual_args(), get_expected_args('mvn_build', 'goal_after'))
@xmvnconfig('mvn_build',['-i', ]) def test_skip_install(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) - self.assertEquals(get_actual_args(), + self.assertEqual(return_value, 0, stderr) + self.assertEqual(get_actual_args(), get_expected_args('mvn_build', 'skip_install'))
@xmvnconfig('mvn_build',['-j', ]) def test_skip_javadoc(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) - self.assertEquals(get_actual_args(), + self.assertEqual(return_value, 0, stderr) + self.assertEqual(get_actual_args(), get_expected_args('mvn_build', 'skip_javadoc'))
@xmvnconfig('mvn_build',['-s', ]) def test_singleton(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) - self.assertEquals(get_actual_args(), + self.assertEqual(return_value, 0, stderr) + self.assertEqual(get_actual_args(), get_expected_args('mvn_build', 'singleton'))
@xmvnconfig('mvn_build',['-s', ]) def test_singleton1(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 2) + self.assertEqual(len(filelist), 2) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_build', 'singleton1'), @@ -104,27 +104,27 @@ class TestMvnBuild(unittest.TestCase):
@xmvnconfig('mvn_build',['-X', ]) def test_debug(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) - self.assertEquals(get_actual_args(), + self.assertEqual(return_value, 0, stderr) + self.assertEqual(get_actual_args(), get_expected_args('mvn_build', 'debug'))
@xmvnconfig('mvn_build',['-ji', ]) def test_skip_both(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) - self.assertEquals(get_actual_args(), + self.assertEqual(return_value, 0, stderr) + self.assertEqual(get_actual_args(), get_expected_args('mvn_build', 'skip_both'))
@xmvnconfig('mvn_build',['-dfijsX', ]) def test_all(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) - self.assertEquals(get_actual_args(), + self.assertEqual(return_value, 0, stderr) + self.assertEqual(get_actual_args(), get_expected_args('mvn_build', 'all'))
@xmvnconfig('mvn_build',['-dfijsX', ]) def test_all1(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 3) + self.assertEqual(len(filelist), 3) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_build', 'all1'), @@ -134,8 +134,8 @@ class TestMvnBuild(unittest.TestCase): @xmvnconfig('mvn_build',['-g', 'validate', 'compile', '-G', 'integration-test', 'verify']) def test_more_goals(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) - self.assertEquals(get_actual_args(), + self.assertEqual(return_value, 0, stderr) + self.assertEqual(get_actual_args(), get_expected_args('mvn_build', 'more_goals'))
if __name__ == '__main__': diff --git a/test/mvn_compat_version_test.py b/test/mvn_compat_version_test.py index 3643985..9f1354d 100644 --- a/test/mvn_compat_version_test.py +++ b/test/mvn_compat_version_test.py @@ -34,9 +34,9 @@ class TestMvnCompatVersion(unittest.TestCase):
@xmvnconfig('mvn_compat_version',['aaa:bbb', '1', ]) def test_simple(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_compat_version', 'simple'), @@ -50,9 +50,9 @@ class TestMvnCompatVersion(unittest.TestCase):
@xmvnconfig('mvn_compat_version',['aaa:bbb', '1', '2', '3', ]) def test_more(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_compat_version', 'more'), @@ -61,9 +61,9 @@ class TestMvnCompatVersion(unittest.TestCase):
@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, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_compat_version', 'version'), @@ -72,9 +72,9 @@ class TestMvnCompatVersion(unittest.TestCase):
@xmvnconfig('mvn_compat_version',[':bbb', '2', ]) def test_wildcard(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, @@ -84,9 +84,9 @@ class TestMvnCompatVersion(unittest.TestCase):
@xmvnconfig('mvn_compat_version',['aa:bb:{1,2}', '@1', ]) def test_backref1(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, diff --git a/test/mvn_config_test.py b/test/mvn_config_test.py index 3a1c16f..9cb21c6 100644 --- a/test/mvn_config_test.py +++ b/test/mvn_config_test.py @@ -44,9 +44,9 @@ class TestMvnConfig(unittest.TestCase):
@xmvnconfig('mvn_config',['aaa', 'bbb', ]) def test_simple(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_config', 'simple'), @@ -55,9 +55,9 @@ class TestMvnConfig(unittest.TestCase):
@xmvnconfig('mvn_config',['a/b/c', 'xxx', ]) def test_path(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_config', 'path'), @@ -66,9 +66,9 @@ class TestMvnConfig(unittest.TestCase):
@xmvnconfig('mvn_config',['a', '<b/>', ]) def test_xml1(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_config', 'xml1'), @@ -77,9 +77,9 @@ class TestMvnConfig(unittest.TestCase):
@xmvnconfig('mvn_config',['a', '<b>c</b>', ]) def test_xml2(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_config', 'xml2'), @@ -88,9 +88,9 @@ class TestMvnConfig(unittest.TestCase):
@xmvnconfig('mvn_config',['a', '<b>c</b><d/>', ]) def test_xml3(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_config', 'xml3'), @@ -99,9 +99,9 @@ class TestMvnConfig(unittest.TestCase):
@xmvnconfig('mvn_config',['a', '<b>c</b><d>e</d>', ]) def test_xml4(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_config', 'xml4'), @@ -110,9 +110,9 @@ class TestMvnConfig(unittest.TestCase):
@xmvnconfig('mvn_config',['a', '<b><c>d</c></b>', ]) def test_nested_xml1(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_config', 'nested_xml1'), @@ -121,9 +121,9 @@ class TestMvnConfig(unittest.TestCase):
@xmvnconfig('mvn_config',['a', '<b><c>d</c>d</b>', ]) def test_nested_xml2(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_config', 'nested_xml2'), @@ -152,9 +152,9 @@ class TestMvnConfig(unittest.TestCase):
@xmvnconfig('mvn_config',['a', '<b>c<d</b>', ]) def test_entity(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_config', 'entity'), @@ -163,9 +163,9 @@ class TestMvnConfig(unittest.TestCase):
@xmvnconfig('mvn_config',['a', 'f<b>c</b>d', ]) def test_mixed(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_config', 'mixed'), diff --git a/test/mvn_file_test.py b/test/mvn_file_test.py index 9b52935..ea0ade8 100644 --- a/test/mvn_file_test.py +++ b/test/mvn_file_test.py @@ -39,9 +39,9 @@ class TestMvnFile(unittest.TestCase):
@xmvnconfig('mvn_file',[':x', 'file', ]) def test_simple(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_file', 'simple'), @@ -50,9 +50,9 @@ class TestMvnFile(unittest.TestCase):
@xmvnconfig('mvn_file',[':guice', 'google/guice', 'guice', ]) def test_symlink(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_file', 'symlink'), @@ -61,9 +61,9 @@ class TestMvnFile(unittest.TestCase):
@xmvnconfig('mvn_file',['a:b', 'file', ]) def test_group(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_file', 'group'), @@ -72,9 +72,9 @@ class TestMvnFile(unittest.TestCase):
@xmvnconfig('mvn_file',[':a:1.3', 'file', ]) def test_version(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_file', 'version'), @@ -83,9 +83,9 @@ class TestMvnFile(unittest.TestCase):
@xmvnconfig('mvn_file',['a:b:c:', 'file', ]) def test_extension(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_file', 'extension'), @@ -94,9 +94,9 @@ class TestMvnFile(unittest.TestCase):
@xmvnconfig('mvn_file',['*:a', 'file', ]) def test_wildcard(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_file', 'wildcard'), @@ -115,9 +115,9 @@ class TestMvnFile(unittest.TestCase):
@xmvnconfig('mvn_file',[':a', 'file', 'sym1', 'sym2', 'sym3', ]) def test_symlinks(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_file', 'symlinks'), @@ -126,9 +126,9 @@ class TestMvnFile(unittest.TestCase):
@xmvnconfig('mvn_file',['a:b:c:d:1', 'sym', ]) def test_classifier(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_file', 'classifier'), @@ -137,9 +137,9 @@ class TestMvnFile(unittest.TestCase):
@xmvnconfig('mvn_file',['a::c:', 'sym', ]) def test_wildcard2(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_file', 'wildcard2'), @@ -150,9 +150,9 @@ class TestMvnFile(unittest.TestCase): '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, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_file', 'more_symlinks'), @@ -161,9 +161,9 @@ class TestMvnFile(unittest.TestCase):
@xmvnconfig('mvn_file',[':{aa,bb}', '@1', ]) def test_backref(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_file', 'backref'), @@ -172,9 +172,9 @@ class TestMvnFile(unittest.TestCase):
@xmvnconfig('mvn_file',['{aa,bb}:{cc,dd}', '@2', '@1', ]) def test_backref1(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_file', 'backref1'), @@ -203,9 +203,9 @@ class TestMvnFile(unittest.TestCase):
@xmvnconfig('mvn_file',['a:b', 'a/file1', ]) def test_relative1(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_file', 'relative1'), @@ -214,9 +214,9 @@ class TestMvnFile(unittest.TestCase):
@xmvnconfig('mvn_file',['a:b', '../file1', ]) def test_relative2(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_file', 'relative2'), @@ -225,9 +225,9 @@ class TestMvnFile(unittest.TestCase):
@xmvnconfig('mvn_file',['a:{bb,cc}', 'a/@1', ]) def test_relative3(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_file', 'relative3'), @@ -236,9 +236,9 @@ class TestMvnFile(unittest.TestCase):
@xmvnconfig('mvn_file',['a:b', 'file', '/usr/share/java/sym']) def test_absolute1(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_file', 'absolute1'), diff --git a/test/mvn_macros_test.py b/test/mvn_macros_test.py index 70abcc5..5854c13 100644 --- a/test/mvn_macros_test.py +++ b/test/mvn_macros_test.py @@ -47,11 +47,11 @@ class MvnMacrosTest(unittest.TestCase): # self.assertEqual(return_value, 0, stderr) # confpath = os.path.join(pack.buildpath, '.xmvn', 'config.d') # filelist = os.listdir(confpath) - # self.assertEquals(len(filelist), 1) + # self.assertEqual(len(filelist), 1) # actfile = os.path.join(confpath, filelist[0]) # expfile = os.path.join(DIRPATH, 'data', 'mvn_alias', 'simple_00001.xml') # report = compare_xml_files(actfile, expfile, ['artifactGlob']) - # self.assertEquals(report, '', report) + # self.assertEqual(report, '', report)
@rpm_test() def test_mvn_alias_backref(self, pack): @@ -60,12 +60,12 @@ class MvnMacrosTest(unittest.TestCase): self.assertEqual(return_value, 0, stderr) confpath = os.path.join(pack.buildpath, '.xmvn', 'config.d') filelist = os.listdir(confpath) - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) actfile = os.path.join(confpath, filelist[0]) expfile = os.path.join(DIRPATH, 'data', 'mvn_alias', 'backref_00001.xml') report = compare_xml_files(actfile, expfile, ['artifactGlob']) - self.assertEquals(report, '', report) + self.assertEqual(report, '', report)
#@rpm_test() #def test_mvn_alias_multi(self, pack): @@ -75,12 +75,12 @@ class MvnMacrosTest(unittest.TestCase): # self.assertEqual(return_value, 0, stderr) # confpath = os.path.join(pack.buildpath, '.xmvn', 'config.d') # filelist = os.listdir(confpath) - # self.assertEquals(len(filelist), 1) + # self.assertEqual(len(filelist), 1) # actfile = os.path.join(confpath, filelist[0]) # expfile = os.path.join(DIRPATH, 'data', 'mvn_alias', # 'multi_00001.xml') # report = compare_xml_files(actfile, expfile, ['artifactGlob']) - # self.assertEquals(report, '', report) + # self.assertEqual(report, '', report)
@rpm_test() def test_mvn_alias_no_args(self, pack): @@ -104,13 +104,13 @@ class MvnMacrosTest(unittest.TestCase): # self.assertEqual(return_value, 0, stderr) # confpath = os.path.join(pack.buildpath, '.xmvn', 'config.d') # filelist = sorted(os.listdir(confpath)) - # self.assertEquals(len(filelist), 2) + # self.assertEqual(len(filelist), 2) # for i in range(2): # actfile = os.path.join(confpath, filelist[i]) # filename = 'more_invocations-0000{i}.xml'.format(i=i + 1) # expfile = os.path.join(DIRPATH, 'data', 'mvn_alias', filename) # report = compare_xml_files(actfile, expfile, ['artifactGlob']) - # self.assertEquals(report, '', report) + # self.assertEqual(report, '', report)
@rpm_test() def test_mvn_file_simple(self, pack): @@ -119,11 +119,11 @@ class MvnMacrosTest(unittest.TestCase): self.assertEqual(return_value, 0, stderr) confpath = os.path.join(pack.buildpath, '.xmvn', 'config.d') filelist = os.listdir(confpath) - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) actfile = os.path.join(confpath, filelist[0]) expfile = os.path.join(DIRPATH, 'data', 'mvn_file', 'simple_00001.xml') report = compare_xml_files(actfile, expfile, ['artifactGlob']) - self.assertEquals(report, '', report) + self.assertEqual(report, '', report)
@rpm_test() def test_mvn_file_symlinks(self, pack): @@ -132,12 +132,12 @@ class MvnMacrosTest(unittest.TestCase): self.assertEqual(return_value, 0, stderr) confpath = os.path.join(pack.buildpath, '.xmvn', 'config.d') filelist = os.listdir(confpath) - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) actfile = os.path.join(confpath, filelist[0]) expfile = os.path.join(DIRPATH, 'data', 'mvn_file', 'symlinks_00001.xml') report = compare_xml_files(actfile, expfile, ['artifactGlob']) - self.assertEquals(report, '', report) + self.assertEqual(report, '', report)
@rpm_test() def test_mvn_file_no_args(self, pack): @@ -160,12 +160,12 @@ class MvnMacrosTest(unittest.TestCase): self.assertEqual(return_value, 0, stderr) confpath = os.path.join(pack.buildpath, '.xmvn', 'config.d') filelist = os.listdir(confpath) - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) actfile = os.path.join(confpath, filelist[0]) expfile = os.path.join(DIRPATH, 'data', 'mvn_compat_version', 'simple_00001.xml') report = compare_xml_files(actfile, expfile, ['artifactGlob']) - self.assertEquals(report, '', report) + self.assertEqual(report, '', report)
@rpm_test() def test_mvn_compat_version_no_args(self, pack): @@ -188,12 +188,12 @@ class MvnMacrosTest(unittest.TestCase): self.assertEqual(return_value, 0, stderr) confpath = os.path.join(pack.buildpath, '.xmvn', 'config.d') filelist = os.listdir(confpath) - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) actfile = os.path.join(confpath, filelist[0]) expfile = os.path.join(DIRPATH, 'data', 'mvn_package', 'simple_00001.xml') report = compare_xml_files(actfile, expfile, ['artifactGlob']) - self.assertEquals(report, '', report) + self.assertEqual(report, '', report)
@rpm_test() def test_mvn_package_no_args(self, pack): @@ -209,12 +209,12 @@ class MvnMacrosTest(unittest.TestCase): self.assertEqual(return_value, 0, stderr) confpath = os.path.join(pack.buildpath, '.xmvn', 'config.d') filelist = os.listdir(confpath) - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) actfile = os.path.join(confpath, filelist[0]) expfile = os.path.join(DIRPATH, 'data', 'mvn_package', 'single_00001.xml') report = compare_xml_files(actfile, expfile, ['artifactGlob']) - self.assertEquals(report, '', report) + self.assertEqual(report, '', report)
@rpm_test() def test_mvn_config_no_args(self, pack): @@ -237,12 +237,12 @@ class MvnMacrosTest(unittest.TestCase): self.assertEqual(return_value, 0, stderr) confpath = os.path.join(pack.buildpath, '.xmvn', 'config.d') filelist = os.listdir(confpath) - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) actfile = os.path.join(confpath, filelist[0]) expfile = os.path.join(DIRPATH, 'data', 'mvn_config', 'path_00001.xml') report = compare_xml_files(actfile, expfile, ['artifactGlob']) - self.assertEquals(report, '', report) + self.assertEqual(report, '', report)
@rpm_test() def test_mvn_config_multiline(self, pack): @@ -255,12 +255,12 @@ class MvnMacrosTest(unittest.TestCase): self.assertEqual(return_value, 0, stderr) confpath = os.path.join(pack.buildpath, '.xmvn', 'config.d') filelist = os.listdir(confpath) - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) actfile = os.path.join(confpath, filelist[0]) expfile = os.path.join(DIRPATH, 'data', 'mvn_config', 'multiline_00001.xml') report = compare_xml_files(actfile, expfile, ['artifactGlob']) - self.assertEquals(report, '', report) + self.assertEqual(report, '', report)
@rpm_test() def test_mvn_build_no_args(self, pack): @@ -274,7 +274,7 @@ class MvnMacrosTest(unittest.TestCase): 'verify org.fedoraproject.xmvn:xmvn-mojo:install ' + \ 'org.apache.maven.plugins:maven-javadoc-plugin:aggregate ' + \ 'org.fedoraproject.xmvn:xmvn-mojo:builddep\n' - self.assertEquals(argsfile.read(), exp) + self.assertEqual(argsfile.read(), exp)
@rpm_test() def test_mvn_build_singleton(self, pack): @@ -283,20 +283,20 @@ class MvnMacrosTest(unittest.TestCase): self.assertEqual(return_value, 0, stderr) confpath = os.path.join(pack.buildpath, '.xmvn', 'config.d') filelist = sorted(os.listdir(confpath)) - self.assertEquals(len(filelist), 2) + self.assertEqual(len(filelist), 2) for i in range(2): actfile = os.path.join(confpath, filelist[i]) filename = 'singleton_0000{i}.xml'.format(i=i + 1) expfile = os.path.join(DIRPATH, 'data', 'mvn_build', filename) report = compare_xml_files(actfile, expfile, ['artifactGlob']) - self.assertEquals(report, '', report) + self.assertEqual(report, '', report)
expfile = os.path.join(pack.buildpath, '.xmvn', 'out') actfile = os.path.join(DIRPATH, 'data', 'mvn_build', 'singleton_out') with open(actfile, 'r') as act: with open(expfile, 'r') as exp: - self.assertEquals(act.read(), exp.read()) + self.assertEqual(act.read(), exp.read())
@rpm_test() def test_mvn_build_environment(self, pack): @@ -323,7 +323,7 @@ class MvnMacrosTest(unittest.TestCase): 'verify org.fedoraproject.xmvn:xmvn-mojo:install ' + \ 'org.apache.maven.plugins:maven-javadoc-plugin:aggregate ' + \ 'org.fedoraproject.xmvn:xmvn-mojo:builddep\n' - self.assertEquals(argsfile.read(), exp) + self.assertEqual(argsfile.read(), exp)
@rpm_test() def test_mvn_build_bootstrap(self, pack): @@ -338,7 +338,7 @@ class MvnMacrosTest(unittest.TestCase): 'verify org.fedoraproject.xmvn:xmvn-mojo:install ' + \ 'org.apache.maven.plugins:maven-javadoc-plugin:aggregate ' + \ 'org.fedoraproject.xmvn:xmvn-mojo:builddep\n' - self.assertEquals(argsfile.read(), exp) + self.assertEqual(argsfile.read(), exp)
@rpm_test() def test_mvn_build_skip_javadoc(self, pack): @@ -352,7 +352,7 @@ class MvnMacrosTest(unittest.TestCase): exp = '--batch-mode --offline ' + \ 'verify org.fedoraproject.xmvn:xmvn-mojo:install ' + \ 'org.fedoraproject.xmvn:xmvn-mojo:builddep\n' - self.assertEquals(argsfile.read(), exp) + self.assertEqual(argsfile.read(), exp)
@rpm_test() def test_mvn_build_skip_test(self, pack): @@ -367,7 +367,7 @@ class MvnMacrosTest(unittest.TestCase): 'package org.fedoraproject.xmvn:xmvn-mojo:install ' + \ 'org.apache.maven.plugins:maven-javadoc-plugin:aggregate ' + \ 'org.fedoraproject.xmvn:xmvn-mojo:builddep\n' - self.assertEquals(argsfile.read(), exp) + self.assertEqual(argsfile.read(), exp)
@rpm_test() def test_mvn_install(self, pack): diff --git a/test/mvn_package_test.py b/test/mvn_package_test.py index 87d2ce9..6dc9bb3 100644 --- a/test/mvn_package_test.py +++ b/test/mvn_package_test.py @@ -35,9 +35,9 @@ class TestMvnPackage(unittest.TestCase):
@xmvnconfig('mvn_package',['aaa:bbb', 'pack', ]) def test_simple(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_package', 'simple'), @@ -46,9 +46,9 @@ class TestMvnPackage(unittest.TestCase):
@xmvnconfig('mvn_package',['aaa:bbb:1.2', 'pack', ]) def test_version(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_package', 'version'), @@ -57,9 +57,9 @@ class TestMvnPackage(unittest.TestCase):
@xmvnconfig('mvn_package',['aaa:bbb:ccc:', 'pack', ]) def test_extension(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_package', 'extension'), @@ -68,9 +68,9 @@ class TestMvnPackage(unittest.TestCase):
@xmvnconfig('mvn_package',['aaa:bbb:ccc:ddd:', 'pack', ]) def test_classifier(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_package', 'classifier'), @@ -79,9 +79,9 @@ class TestMvnPackage(unittest.TestCase):
@xmvnconfig('mvn_package',['aaa:bbb:ccc:ddd:21', 'pack', ]) def test_all(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_package', 'all'), @@ -90,9 +90,9 @@ class TestMvnPackage(unittest.TestCase):
@xmvnconfig('mvn_package',[':bbb', 'pack', ]) def test_wildcard1(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_package', 'wildcard1'), @@ -101,9 +101,9 @@ class TestMvnPackage(unittest.TestCase):
@xmvnconfig('mvn_package',[':', 'pack', ]) def test_wildcard2(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_package', 'wildcard2'), @@ -112,9 +112,9 @@ class TestMvnPackage(unittest.TestCase):
@xmvnconfig('mvn_package',['*:*', 'pack', ]) def test_wildcard3(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_package', 'wildcard3'), @@ -123,9 +123,9 @@ class TestMvnPackage(unittest.TestCase):
@xmvnconfig('mvn_package',[':bbb-{a,b,c}', 'pack', ]) def test_braces1(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_package', 'braces1'), @@ -134,9 +134,9 @@ class TestMvnPackage(unittest.TestCase):
@xmvnconfig('mvn_package',['a-{b,c}:{x,y}-z', 'pack', ]) def test_braces2(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_package', 'braces2'), @@ -145,9 +145,9 @@ class TestMvnPackage(unittest.TestCase):
@xmvnconfig('mvn_package',['aaa:bbb', ]) def test_single(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_package', 'single'), @@ -171,9 +171,9 @@ class TestMvnPackage(unittest.TestCase):
@xmvnconfig('mvn_package',['a-{b,c}:{x,y}-z', '@2', ]) def test_backref1(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_package', 'backref1'), @@ -182,9 +182,9 @@ class TestMvnPackage(unittest.TestCase):
@xmvnconfig('mvn_package',['a-{b,c}:{x,y}-z', '@1', ]) def test_backref2(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_package', 'backref2'), @@ -203,9 +203,9 @@ class TestMvnPackage(unittest.TestCase):
@xmvnconfig('mvn_package',['aaa:bbb', '__noinstall', ]) def test_noinstall(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) filelist = get_config_file_list() - self.assertEquals(len(filelist), 1) + self.assertEqual(len(filelist), 1) for filename in filelist: report = compare_xml_files(get_actual_config(filename), get_expected_config(filename, 'mvn_package', 'noinstall'), diff --git a/test/osgi_prov_test.py b/test/osgi_prov_test.py index 2d839bb..d090cc6 100644 --- a/test/osgi_prov_test.py +++ b/test/osgi_prov_test.py @@ -7,27 +7,27 @@ class TestOSGiProv(unittest.TestCase):
@osgiprov(["/usr/bin/zip"]) def test_rhbz889131(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] - self.assertEquals(len(sout), 0) + self.assertEqual(len(sout), 0)
@osgiprov(["data/osgi/basic/META-INF/MANIFEST.MF"]) def test_basic(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] assertIn(self, "osgi(org.junit) = 4.10.0", sout)
@osgiprov(["data/osgi/basic_jar/basic.jar"]) def test_basic_jar(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] assertIn(self, "osgi(org.junit) = 4.10.0", sout)
@osgiprov(["data/osgi/empty/META-INF/MANIFEST.MF"]) def test_empty(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] - self.assertEquals(len(sout), 0) + self.assertEqual(len(sout), 0)
if __name__ == '__main__': diff --git a/test/osgi_req_test.py b/test/osgi_req_test.py index f05025a..577e72e 100644 --- a/test/osgi_req_test.py +++ b/test/osgi_req_test.py @@ -13,21 +13,21 @@ class TestOSGiReq(unittest.TestCase):
@osgireq(["data/osgi/basic/META-INF/MANIFEST.MF"]) def test_basic(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] assertIn(self, "osgi(org.hamcrest.core)", sout)
@osgireq(["data/osgi/basic_jar/basic.jar"]) def test_basic_jar(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] assertIn(self, "osgi(org.hamcrest.core)", sout)
@osgireq(["data/osgi/empty/META-INF/MANIFEST.MF"]) def test_empty(self, stdout, stderr, return_value): - self.assertEquals(return_value, 0, stderr) + self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] - self.assertEquals(len(sout), 0) + self.assertEqual(len(sout), 0)
if __name__ == '__main__': unittest.main()
java-sig-commits@lists.fedoraproject.org