Changeset 641 for trunk/ab5.0

Timestamp:

Oct 9, 2008, 8:05:40 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

使用するUnitTest多重定義の変更

Location:

trunk/ab5.0/ablib/TestCase/SimpleTestCase

Files:

• SPrintFTest.ab (modified) (1 diff)
• StringTest.ab (modified) (2 diffs)

trunk/ab5.0/ablib/TestCase/SimpleTestCase/SPrintFTest.ab

@@ -91 +91 @@
     '現状では末尾の桁の誤差を制御しきれないので、文字列全体の一致比較を避けている。
     s = FormatFloatF(12345678901234567e3, 2, 0, None)
-    UnitTest("FormatFloatF(1.00, precision = 2)", Right$(s, 6) = "000.00")
+    UnitTest("FormatFloatF(1.00, precision = 2)", Right$(s, 6), "000.00")
 
     s = FormatIntegerLO(&hFFFFFFFFFFFFFFFF, 0, 0, Alt)

trunk/ab5.0/ablib/TestCase/SimpleTestCase/StringTest.ab

@@ -6 +6 @@
 
 Sub TestMain()
+
     Dim s1 = Nothing As String
-
 
     s1 = New String("hello")
 
-    UnitTest("String.GetType", s1.GetType().Name = "String")
+    UnitTest("String.GetType", s1.GetType().Name, "String")
 
 
     UnitTest("String.String (case 0)", (memcmp(s1.StrPtr, "hello", SizeOf (Char) * 6) = 0))
 
-    UnitTest("String.String (case 1)", (s1 = "hello"))
+    UnitTest("String.String (case 1)", s1, "hello")
 
     Dim nsz[2] = [&h31, &h32, &h33] As SByte
     s1 = New String(nsz, 3)
-    UnitTest("String.String (case 2)", (s1 = "123"))
+    UnitTest("String.String (case 2)", s1, "123")
 
     Dim wsz[4] = [&h31, &h32, &h33, &h34, &h35] As WCHAR
     s1 = New String(wsz, 5)
-    UnitTest("String.String (case 3)", (s1 = "12345"))
+    UnitTest("String.String (case 3)", s1, "12345")
 
     s1 = New String(&h30 As Char, 4)
-    UnitTest("String.String (case 4)", (s1 = "0000"))
+    UnitTest("String.String (case 4)", s1, "0000")
 
     s1 = "literal"
-    UnitTest("String.String (case 5)", (s1 = "literal"))
+    UnitTest("String.String (case 5)", s1, "literal")
 
     UnitTest("String.Length", (s1.Length = 7))
 
-    UnitTest("String.ToString", (s1.ToString() = "literal"))
-    UnitTest("String.Clone", (s1.Clone() = "literal"))
+    UnitTest("String.ToString", s1.ToString(), "literal")
+    UnitTest("String.Clone", s1.Clone(), "literal")
 
     UnitTest("String.Operator []", (s1[7] = 0))
@@ -51 +51 @@
     Dim o1 = New Object
     Dim o2 = s1 As Object
-    UnitTest("String.Concat", (String.Concat(o1, o2) = "Objectabc"))
+    UnitTest("String.Concat", String.Concat(o1, o2), "Objectabc")
 
-    UnitTest("String.Operator +", ((s1 + "def") = "abcdef"))
-    UnitTest("String.Operator &", ((s1 + "xyz") = "abcxyz"))
+    UnitTest("String.Operator +", (s1 + "def"), "abcdef")
+    UnitTest("String.Operator &", (s1 + "xyz"), "abcxyz")
 
     s1 = "へのへの"