From cdddc819bc4c3c7905c2efebfb07ec9f5ff5ab06 Mon Sep 17 00:00:00 2001
From: Chad Wilson <chad.wilson@gmx.net>
Date: Fri, 20 Jan 2012 00:41:58 +0800
Subject: [PATCH] failUnless -> assert (impending deprecation)

---
 test/test_script.py | 182 ++++++++++++++++++++++----------------------
 1 file changed, 91 insertions(+), 91 deletions(-)

diff --git a/test/test_script.py b/test/test_script.py
index 9226e69a8..89c38908e 100644
--- a/test/test_script.py
+++ b/test/test_script.py
@@ -16,33 +16,33 @@ class ScriptParserTest(unittest.TestCase):
         self.parser = ScriptParser()
 
     def test_cmd_noop(self):
-        self.failUnlessEqual(self.parser.eval("$noop()"), "")
+        self.assertEqual(self.parser.eval("$noop()"), "")
 
     def test_cmd_if(self):
-        self.failUnlessEqual(self.parser.eval("$if(1,a,b)"), "a")
-        self.failUnlessEqual(self.parser.eval("$if(,a,b)"), "b")
+        self.assertEqual(self.parser.eval("$if(1,a,b)"), "a")
+        self.assertEqual(self.parser.eval("$if(,a,b)"), "b")
 
     def test_cmd_if2(self):
-        self.failUnlessEqual(self.parser.eval("$if2(,a,b)"), "a")
-        self.failUnlessEqual(self.parser.eval("$if2($noop(),b)"), "b")
+        self.assertEqual(self.parser.eval("$if2(,a,b)"), "a")
+        self.assertEqual(self.parser.eval("$if2($noop(),b)"), "b")
 
     def test_cmd_left(self):
-        self.failUnlessEqual(self.parser.eval("$left(abcd,2)"), "ab")
+        self.assertEqual(self.parser.eval("$left(abcd,2)"), "ab")
 
     def test_cmd_right(self):
-        self.failUnlessEqual(self.parser.eval("$right(abcd,2)"), "cd")
+        self.assertEqual(self.parser.eval("$right(abcd,2)"), "cd")
 
     def test_cmd_set(self):
-        self.failUnlessEqual(self.parser.eval("$set(test,aaa)%test%"), "aaa")
+        self.assertEqual(self.parser.eval("$set(test,aaa)%test%"), "aaa")
 
     def test_cmd_set_empty(self):
-        self.failUnlessEqual(self.parser.eval("$set(test,)%test%"), "")
+        self.assertEqual(self.parser.eval("$set(test,)%test%"), "")
 
     def test_cmd_set_multi_valued(self):
         context = Metadata()
         context["source"] = ["multi", "valued"]
         self.parser.eval("$set(test,%source%)", context)
-        self.failUnlessEqual(context.getall("test"), ["multi; valued"]) # list has only a single value
+        self.assertEqual(context.getall("test"), ["multi; valued"]) # list has only a single value
 
     def test_cmd_setlist_multi_valued(self):
         context = Metadata()
@@ -79,144 +79,144 @@ class ScriptParserTest(unittest.TestCase):
     def test_cmd_get(self):
         context = Metadata()
         context["test"] = "aaa"
-        self.failUnlessEqual(self.parser.eval("$get(test)", context), "aaa")
+        self.assertEqual(self.parser.eval("$get(test)", context), "aaa")
         context["test2"] = ["multi", "valued"]
-        self.failUnlessEqual(self.parser.eval("$get(test2)", context), "multi; valued")
+        self.assertEqual(self.parser.eval("$get(test2)", context), "multi; valued")
 
     def test_cmd_num(self):
-        self.failUnlessEqual(self.parser.eval("$num(3,3)"), "003")
-        self.failUnlessEqual(self.parser.eval("$num(03,3)"), "003")
-        self.failUnlessEqual(self.parser.eval("$num(123,2)"), "123")
+        self.assertEqual(self.parser.eval("$num(3,3)"), "003")
+        self.assertEqual(self.parser.eval("$num(03,3)"), "003")
+        self.assertEqual(self.parser.eval("$num(123,2)"), "123")
 
     def test_cmd_or(self):
-        self.failUnlessEqual(self.parser.eval("$or(,)"), "")
-        self.failUnlessEqual(self.parser.eval("$or(,q)"), "1")
-        self.failUnlessEqual(self.parser.eval("$or(q,)"), "1")
-        self.failUnlessEqual(self.parser.eval("$or(q,q)"), "1")
+        self.assertEqual(self.parser.eval("$or(,)"), "")
+        self.assertEqual(self.parser.eval("$or(,q)"), "1")
+        self.assertEqual(self.parser.eval("$or(q,)"), "1")
+        self.assertEqual(self.parser.eval("$or(q,q)"), "1")
 
     def test_cmd_and(self):
-        self.failUnlessEqual(self.parser.eval("$and(,)"), "")
-        self.failUnlessEqual(self.parser.eval("$and(,q)"), "")
-        self.failUnlessEqual(self.parser.eval("$and(q,)"), "")
-        self.failUnlessEqual(self.parser.eval("$and(q,q)"), "1")
+        self.assertEqual(self.parser.eval("$and(,)"), "")
+        self.assertEqual(self.parser.eval("$and(,q)"), "")
+        self.assertEqual(self.parser.eval("$and(q,)"), "")
+        self.assertEqual(self.parser.eval("$and(q,q)"), "1")
 
     def test_cmd_not(self):
-        self.failUnlessEqual(self.parser.eval("$not($noop())"), "1")
-        self.failUnlessEqual(self.parser.eval("$not(q)"), "")
+        self.assertEqual(self.parser.eval("$not($noop())"), "1")
+        self.assertEqual(self.parser.eval("$not(q)"), "")
 
     def test_cmd_add(self):
-        self.failUnlessEqual(self.parser.eval("$add(1,2)"), "3")
+        self.assertEqual(self.parser.eval("$add(1,2)"), "3")
 
     def test_cmd_sub(self):
-        self.failUnlessEqual(self.parser.eval("$sub(1,2)"), "-1")
-        self.failUnlessEqual(self.parser.eval("$sub(2,1)"), "1")
+        self.assertEqual(self.parser.eval("$sub(1,2)"), "-1")
+        self.assertEqual(self.parser.eval("$sub(2,1)"), "1")
 
     def test_cmd_div(self):
-        self.failUnlessEqual(self.parser.eval("$div(9,3)"), "3")
-        self.failUnlessEqual(self.parser.eval("$div(10,3)"), "3")
+        self.assertEqual(self.parser.eval("$div(9,3)"), "3")
+        self.assertEqual(self.parser.eval("$div(10,3)"), "3")
 
     def test_cmd_mod(self):
-        self.failUnlessEqual(self.parser.eval("$mod(9,3)"), "0")
-        self.failUnlessEqual(self.parser.eval("$mod(10,3)"), "1")
+        self.assertEqual(self.parser.eval("$mod(9,3)"), "0")
+        self.assertEqual(self.parser.eval("$mod(10,3)"), "1")
 
     def test_cmd_mul(self):
-        self.failUnlessEqual(self.parser.eval("$mul(9,3)"), "27")
-        self.failUnlessEqual(self.parser.eval("$mul(10,3)"), "30")
+        self.assertEqual(self.parser.eval("$mul(9,3)"), "27")
+        self.assertEqual(self.parser.eval("$mul(10,3)"), "30")
 
     def test_cmd_eq(self):
-        self.failUnlessEqual(self.parser.eval("$eq(,)"), "1")
-        self.failUnlessEqual(self.parser.eval("$eq(,$noop())"), "1")
-        self.failUnlessEqual(self.parser.eval("$eq(,q)"), "")
-        self.failUnlessEqual(self.parser.eval("$eq(q,q)"), "1")
-        self.failUnlessEqual(self.parser.eval("$eq(q,)"), "")
+        self.assertEqual(self.parser.eval("$eq(,)"), "1")
+        self.assertEqual(self.parser.eval("$eq(,$noop())"), "1")
+        self.assertEqual(self.parser.eval("$eq(,q)"), "")
+        self.assertEqual(self.parser.eval("$eq(q,q)"), "1")
+        self.assertEqual(self.parser.eval("$eq(q,)"), "")
 
     def test_cmd_ne(self):
-        self.failUnlessEqual(self.parser.eval("$ne(,)"), "")
-        self.failUnlessEqual(self.parser.eval("$ne(,$noop())"), "")
-        self.failUnlessEqual(self.parser.eval("$ne(,q)"), "1")
-        self.failUnlessEqual(self.parser.eval("$ne(q,q)"), "")
-        self.failUnlessEqual(self.parser.eval("$ne(q,)"), "1")
+        self.assertEqual(self.parser.eval("$ne(,)"), "")
+        self.assertEqual(self.parser.eval("$ne(,$noop())"), "")
+        self.assertEqual(self.parser.eval("$ne(,q)"), "1")
+        self.assertEqual(self.parser.eval("$ne(q,q)"), "")
+        self.assertEqual(self.parser.eval("$ne(q,)"), "1")
 
     def test_cmd_lower(self):
-        self.failUnlessEqual(self.parser.eval("$lower(AbeCeDA)"), "abeceda")
+        self.assertEqual(self.parser.eval("$lower(AbeCeDA)"), "abeceda")
 
     def test_cmd_upper(self):
-        self.failUnlessEqual(self.parser.eval("$upper(AbeCeDA)"), "ABECEDA")
+        self.assertEqual(self.parser.eval("$upper(AbeCeDA)"), "ABECEDA")
 
     def test_cmd_rreplace(self):
-        self.failUnlessEqual(
+        self.assertEqual(
             self.parser.eval(r'''$rreplace(test \(disc 1\),\\s\\\(disc \\d+\\\),)'''),
             "test"
         )
 
     def test_cmd_rsearch(self):
-        self.failUnlessEqual(
+        self.assertEqual(
             self.parser.eval(r"$rsearch(test \(disc 1\),\\\(disc \(\\d+\)\\\))"),
             "1"
         )
 
     def test_arguments(self):
-        self.failUnless(
+        self.assertTrue(
             self.parser.eval(
                 r"$set(bleh,$rsearch(test \(disc 1\),\\\(disc \(\\d+\)\\\)))) $set(wer,1)"))
 
     def test_cmd_gt(self):
-        self.failUnlessEqual(self.parser.eval("$gt(10,4)"), "1")
-        self.failUnlessEqual(self.parser.eval("$gt(6,4)"), "1")
+        self.assertEqual(self.parser.eval("$gt(10,4)"), "1")
+        self.assertEqual(self.parser.eval("$gt(6,4)"), "1")
 
     def test_cmd_gte(self):
-        self.failUnlessEqual(self.parser.eval("$gte(10,10)"), "1")
-        self.failUnlessEqual(self.parser.eval("$gte(10,4)"), "1")
-        self.failUnlessEqual(self.parser.eval("$gte(6,4)"), "1")
+        self.assertEqual(self.parser.eval("$gte(10,10)"), "1")
+        self.assertEqual(self.parser.eval("$gte(10,4)"), "1")
+        self.assertEqual(self.parser.eval("$gte(6,4)"), "1")
 
     def test_cmd_lt(self):
-        self.failUnlessEqual(self.parser.eval("$lt(4,10)"), "1")
-        self.failUnlessEqual(self.parser.eval("$lt(4,6)"), "1")
+        self.assertEqual(self.parser.eval("$lt(4,10)"), "1")
+        self.assertEqual(self.parser.eval("$lt(4,6)"), "1")
 
     def test_cmd_lte(self):
-        self.failUnlessEqual(self.parser.eval("$lte(10,10)"), "1")
-        self.failUnlessEqual(self.parser.eval("$lte(4,10)"), "1")
-        self.failUnlessEqual(self.parser.eval("$lte(4,6)"), "1")
+        self.assertEqual(self.parser.eval("$lte(10,10)"), "1")
+        self.assertEqual(self.parser.eval("$lte(4,10)"), "1")
+        self.assertEqual(self.parser.eval("$lte(4,6)"), "1")
 
     def test_cmd_len(self):
-        self.failUnlessEqual(self.parser.eval("$len(abcdefg)"), "7")
-        self.failUnlessEqual(self.parser.eval("$len()"), "0")
+        self.assertEqual(self.parser.eval("$len(abcdefg)"), "7")
+        self.assertEqual(self.parser.eval("$len()"), "0")
 
     def test_cmd_firstalphachar(self):
-        self.failUnlessEqual(self.parser.eval("$firstalphachar(abc)"), "A")
-        self.failUnlessEqual(self.parser.eval("$firstalphachar(Abc)"), "A")
-        self.failUnlessEqual(self.parser.eval("$firstalphachar(1abc)"), "#")
-        self.failUnlessEqual(self.parser.eval("$firstalphachar(...abc)"), "#")
-        self.failUnlessEqual(self.parser.eval("$firstalphachar(1abc,_)"), "_")
-        self.failUnlessEqual(self.parser.eval("$firstalphachar(...abc,_)"), "_")
-        self.failUnlessEqual(self.parser.eval("$firstalphachar()"), "#")
-        self.failUnlessEqual(self.parser.eval("$firstalphachar(,_)"), "_")
-        self.failUnlessEqual(self.parser.eval("$firstalphachar( abc)"), "#")
+        self.assertEqual(self.parser.eval("$firstalphachar(abc)"), "A")
+        self.assertEqual(self.parser.eval("$firstalphachar(Abc)"), "A")
+        self.assertEqual(self.parser.eval("$firstalphachar(1abc)"), "#")
+        self.assertEqual(self.parser.eval("$firstalphachar(...abc)"), "#")
+        self.assertEqual(self.parser.eval("$firstalphachar(1abc,_)"), "_")
+        self.assertEqual(self.parser.eval("$firstalphachar(...abc,_)"), "_")
+        self.assertEqual(self.parser.eval("$firstalphachar()"), "#")
+        self.assertEqual(self.parser.eval("$firstalphachar(,_)"), "_")
+        self.assertEqual(self.parser.eval("$firstalphachar( abc)"), "#")
 
     def test_cmd_initials(self):
-        self.failUnlessEqual(self.parser.eval("$initials(Abc def Ghi)"), "AdG")
-        self.failUnlessEqual(self.parser.eval("$initials(Abc #def Ghi)"), "AG")
-        self.failUnlessEqual(self.parser.eval("$initials(Abc 1def Ghi)"), "AG")
-        self.failUnlessEqual(self.parser.eval("$initials(Abc)"), "A")
-        self.failUnlessEqual(self.parser.eval("$initials()"), "")
+        self.assertEqual(self.parser.eval("$initials(Abc def Ghi)"), "AdG")
+        self.assertEqual(self.parser.eval("$initials(Abc #def Ghi)"), "AG")
+        self.assertEqual(self.parser.eval("$initials(Abc 1def Ghi)"), "AG")
+        self.assertEqual(self.parser.eval("$initials(Abc)"), "A")
+        self.assertEqual(self.parser.eval("$initials()"), "")
 
     def test_cmd_firstwords(self):
-        self.failUnlessEqual(self.parser.eval("$firstwords(Abc Def Ghi,11)"), "Abc Def Ghi")
-        self.failUnlessEqual(self.parser.eval("$firstwords(Abc Def Ghi,12)"), "Abc Def Ghi")
-        self.failUnlessEqual(self.parser.eval("$firstwords(Abc Def Ghi,7)"), "Abc Def")
-        self.failUnlessEqual(self.parser.eval("$firstwords(Abc Def Ghi,8)"), "Abc Def")
-        self.failUnlessEqual(self.parser.eval("$firstwords(Abc Def Ghi,6)"), "Abc")
-        self.failUnlessEqual(self.parser.eval("$firstwords(Abc Def Ghi,0)"), "")
-        self.failUnlessEqual(self.parser.eval("$firstwords(Abc Def Ghi,NaN)"), "")
-        self.failUnlessEqual(self.parser.eval("$firstwords(Abc Def Ghi,)"), "")
+        self.assertEqual(self.parser.eval("$firstwords(Abc Def Ghi,11)"), "Abc Def Ghi")
+        self.assertEqual(self.parser.eval("$firstwords(Abc Def Ghi,12)"), "Abc Def Ghi")
+        self.assertEqual(self.parser.eval("$firstwords(Abc Def Ghi,7)"), "Abc Def")
+        self.assertEqual(self.parser.eval("$firstwords(Abc Def Ghi,8)"), "Abc Def")
+        self.assertEqual(self.parser.eval("$firstwords(Abc Def Ghi,6)"), "Abc")
+        self.assertEqual(self.parser.eval("$firstwords(Abc Def Ghi,0)"), "")
+        self.assertEqual(self.parser.eval("$firstwords(Abc Def Ghi,NaN)"), "")
+        self.assertEqual(self.parser.eval("$firstwords(Abc Def Ghi,)"), "")
 
     def test_cmd_truncate(self):
-        self.failUnlessEqual(self.parser.eval("$truncate(abcdefg,0)"), "")
-        self.failUnlessEqual(self.parser.eval("$truncate(abcdefg,7)"), "abcdefg")
-        self.failUnlessEqual(self.parser.eval("$truncate(abcdefg,3)"), "abc")
-        self.failUnlessEqual(self.parser.eval("$truncate(abcdefg,10)"), "abcdefg")
-        self.failUnlessEqual(self.parser.eval("$truncate(abcdefg,)"), "abcdefg")
-        self.failUnlessEqual(self.parser.eval("$truncate(abcdefg,NaN)"), "abcdefg")
+        self.assertEqual(self.parser.eval("$truncate(abcdefg,0)"), "")
+        self.assertEqual(self.parser.eval("$truncate(abcdefg,7)"), "abcdefg")
+        self.assertEqual(self.parser.eval("$truncate(abcdefg,3)"), "abc")
+        self.assertEqual(self.parser.eval("$truncate(abcdefg,10)"), "abcdefg")
+        self.assertEqual(self.parser.eval("$truncate(abcdefg,)"), "abcdefg")
+        self.assertEqual(self.parser.eval("$truncate(abcdefg,NaN)"), "abcdefg")
 
     def test_cmd_copy(self):
         context = Metadata()
@@ -224,11 +224,11 @@ class ScriptParserTest(unittest.TestCase):
         context["source"] = tagsToCopy
         context["target"] = ["will", "be", "overwritten"]
         self.parser.eval("$copy(target,source)", context)
-        self.failUnlessEqual(self.parser.context.getall("target"), tagsToCopy)
+        self.assertEqual(self.parser.context.getall("target"), tagsToCopy)
 
     def _eval_and_check_copymerge(self, context, expected):
         self.parser.eval("$copymerge(target,source)", context)
-        self.failUnlessEqual(self.parser.context.getall("target"), expected)
+        self.assertEqual(self.parser.context.getall("target"), expected)
 
     def test_cmd_copymerge_notarget(self):
         context = Metadata()