Changeset 656

Timestamp:

2008/11/09 14:36:29 (4 years ago)

Author:

egtra

Message:

文字列比較のテストを3引数版UnitTestの呼出に変更

Location:

trunk/ab5.0/ablib/TestCase/SimpleTestCase

Files:

• CollectionTest.ab (modified) (1 diff)
• DelegateTest.ab (modified) (2 diffs)
• GCHandleTest.ab (modified) (1 diff)
• Generics.ab (modified) (1 diff)
• ObjectTest.ab (modified) (1 diff)
• PathTest.ab (modified) (1 diff)
• SimpleTestCase.ab (modified) (1 diff)
• StreamTest.ab (modified) (1 diff)
• StringBuilderTest.ab (modified) (1 diff)
• VersionTest.ab (modified) (1 diff)

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

@@ -9 +9 @@
     d.Add("茶", "Tea")
 
-    UnitTest("Dictionary.Add, Item (1)", d.Item["赤"] = "Red")
-    UnitTest("Dictionary.Add, Item (2)", d.Item["黄"] = "Yellow")
-    UnitTest("Dictionary.Add, Item (3)", d.Item("緑") = "Green")
-    UnitTest("Dictionary.Add, Item (4)", d.Item("青") = "Blue")
+    UnitTest("Dictionary.Add, Item (1)", d.Item["赤"], "Red")
+    UnitTest("Dictionary.Add, Item (2)", d.Item["黄"], "Yellow")
+    UnitTest("Dictionary.Add, Item (3)", d.Item("緑"), "Green")
+    UnitTest("Dictionary.Add, Item (4)", d.Item("青"), "Blue")
 
     UnitTest("Dictionary.Remove", d.Remove("茶"))

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

@@ -5 +5 @@
 Public
     Sub StringEx( str As String )
-        String( str )
+        String( StrPtr(str), str.Length )
     End Sub
 End Class
@@ -119 +119 @@
 
     Dim dg7 = New Callback7( AddressOf(TestClass.Proc7) )   ' 共変戻り値サポートのテスト
-    UnitTest( "Delegate2", dg7( "test value" ) = "Proc7 result[test value]" )
+    UnitTest( "Delegate2", dg7( "test value" ), "Proc7 result[test value]" )
 
     Dim dg184 = New CallbackTicket184( AddressOf( testObj.Ticket184 ) )

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

@@ -21 +21 @@
 End Namespace
 
-GCHandleTest.TestMain()
+'GCHandleTest.TestMain()

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

@@ -31 +31 @@
     ' TODO: より多くのパターンで試す必要あり
     Dim bar = New Bar<Long>
-    UnitTest( "Generic ... complex", bar.GetTypeName( New String() ) = "String" )
+    UnitTest( "Generic ... complex", bar.GetTypeName( New String() ), "String" )
 End Sub
 

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

@@ -18 +18 @@
     UnitTest( "Object.GetHashCode", obj1.GetHashCode() = ObjPtr( obj1 ) )
 
-    UnitTest( "Object.ToString", obj1.ToString() = "Object" )
+    UnitTest( "Object.ToString", obj1.ToString(), "Object" )
 
-    UnitTest( "Object.GetType", obj1.GetType().Name = "Object" )
+    UnitTest( "Object.GetType", obj1.GetType().Name, "Object" )
 End Sub
 
 End Namespace
 
-ObjectTest.TestMain()
+'ObjectTest.TestMain()

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

@@ -9 +9 @@
 Sub TestMain()
     Dim testPath = New String("C:\Dir.Name\file.name.ext")
-    UnitTest("Path.GetFileName", Path.GetFileName(testPath) = "file.name.ext")
+    UnitTest("Path.GetFileName", Path.GetFileName(testPath), "file.name.ext")
 
-    UnitTest("Path.GetFileNameWithoutExtension", Path.GetFileNameWithoutExtension(testPath) = "file.name")
+    UnitTest("Path.GetFileNameWithoutExtension", Path.GetFileNameWithoutExtension(testPath), "file.name")
 
 
-    UnitTest("Path.GetExtension", Path.GetExtension(testPath) = ".ext")
+    UnitTest("Path.GetExtension", Path.GetExtension(testPath), ".ext")
 
-    UnitTest("Path.ChangeExtension", Path.ChangeExtension(testPath, ".newExt") = "C:\Dir.Name\file.name.newExt")
+    UnitTest("Path.ChangeExtension", Path.ChangeExtension(testPath, ".newExt"), "C:\Dir.Name\file.name.newExt")
 
     UnitTest("Path.HasExtension (Case1)", Path.HasExtension(testPath) = True)
     UnitTest("Path.HasExtension (Case2)", Path.HasExtension("fileName") = False)
 
-    UnitTest("Path.GetPathRoot", Path.GetPathRoot(testPath) = "C:\")
+    UnitTest("Path.GetPathRoot", Path.GetPathRoot(testPath), "C:\")
 
     UnitTest("Path.IsPathRooted (Case1)", Path.IsPathRooted(testPath) = True)
     UnitTest("Path.IsPathRooted (Case2)", Path.IsPathRooted("Dir.Name\file.name.ext") = False)
 
-    UnitTest("Path.Combine (Case1)", Path.Combine("C:\dir", "filename.txt") = "C:\dir\filename.txt")
-    UnitTest("Path.Combine (Case2)", Path.Combine("C:\dir\", "filename.txt") = "C:\dir\filename.txt")
+    UnitTest("Path.Combine (Case1)", Path.Combine("C:\dir", "filename.txt"), "C:\dir\filename.txt")
+    UnitTest("Path.Combine (Case2)", Path.Combine("C:\dir\", "filename.txt"), "C:\dir\filename.txt")
 
 /*

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

@@ -25 +25 @@
 
 'Initialize()
-
-Dim prevBackColor = System.Console.BackgroundColor
-Dim prevForeColor = System.Console.ForegroundColor
 
 #include "SimpleTestCase.idx"

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

@@ -13 +13 @@
     UnitTest("sr.Read() - 2", sr.Read() = &h20)
     UnitTest("sr.Peek()", sr.Peek() = &h61)
-    UnitTest("sr.ReadLine() \n", sr.ReadLine() = "abc")
-    UnitTest("sr.ReadLine() \r\n", sr.ReadLine() = "123")
+    UnitTest("sr.ReadLine() \n", sr.ReadLine(), "abc")
+    UnitTest("sr.ReadLine() \r\n", sr.ReadLine(), "123")
     Dim s = sr.ReadToEnd()
-    UnitTest("sr.ReadToEnd() \r\n", s = Ex"あいうえお\r\nアイウエオ")
+    UnitTest("sr.ReadToEnd() \r\n", s, Ex"あいうえお\r\nアイウエオ")
 End Sub
 

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

@@ -9 +9 @@
 Sub TestMain()
     Dim sb = New StringBuilder("Hello")
-    UnitTest("StringBuilder - Constractor & ToString", sb.ToString, "Hello")
+    UnitTest("StringBuilder - Constractor & ToString", sb.ToString(), "Hello")
     UnitTest("StringBuilder.ToString(index, count)", sb.ToString(1, 3), "ell")
-    UnitTest("StringBuilder.Append", sb.Append("StringBuilder").ToString, "HelloStringBuilder")
-    UnitTest("StringBuilder.Insert (String)", sb.Insert(5, ", ").ToString, "Hello, StringBuilder")
+    UnitTest("StringBuilder.Append", sb.Append("StringBuilder").ToString(), "HelloStringBuilder")
+    UnitTest("StringBuilder.Insert (String)", sb.Insert(5, ", ").ToString(), "Hello, StringBuilder")
     sb.Length = 0
-    UnitTest("StringBuilder.Length = 0", sb.ToString, "")
+    UnitTest("StringBuilder.Length = 0", sb.ToString(), "")
     sb.Append("でてこいでてこいいけのこい")
     sb.Replace("こい", "いけ").Replace("いけ", "こい")
-    UnitTest("StringBuilder.Replace (String)", sb.ToString, "でてこいでてこいこいのこい")
+    UnitTest("StringBuilder.Replace (String)", sb.ToString(), "でてこいでてこいこいのこい")
     sb.Length = 0
     sb.Append(123)
-    UnitTest("StringBuilder.Append (Long)", sb.ToString, "123")
+    UnitTest("StringBuilder.Append (Long)", sb.ToString(), "123")
 End Sub
 

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

@@ -10 +10 @@
     Dim v1234 = New System.Version(1, 2, 3, 4)
 
-    UnitTest("Version(major, minor)", String.Compare(v12.ToString(), "1.2") = 0)
-    UnitTest("Version(major, minor, build)", String.Compare(v123.ToString(), "1.2.3") = 0)
-    UnitTest("Version(major, minor, build, revision)", String.Compare(v1234.ToString(), "1.2.3.4") = 0)
+    UnitTest("Version(major, minor)", v12.ToString(), "1.2")
+    UnitTest("Version(major, minor, build)", v123.ToString(), "1.2.3")
+    UnitTest("Version(major, minor, build, revision)", v1234.ToString(), "1.2.3.4")
 
-    UnitTest("Version.ToString(0)", String.Compare(v1234.ToString(0), "") = 0)
-    UnitTest("Version.ToString(1)", String.Compare(v1234.ToString(1), "1") = 0)
-    UnitTest("Version.ToString(2)", String.Compare(v1234.ToString(2), "1.2") = 0)
-    UnitTest("Version.ToString(3)", String.Compare(v1234.ToString(3), "1.2.3") = 0)
-    UnitTest("Version.ToString(4)", String.Compare(v1234.ToString(4), "1.2.3.4") = 0)
+    UnitTest("Version.ToString(0)", v1234.ToString(0), "")
+    UnitTest("Version.ToString(1)", v1234.ToString(1), "1")
+    UnitTest("Version.ToString(2)", v1234.ToString(2), "1.2")
+    UnitTest("Version.ToString(3)", v1234.ToString(3), "1.2.3")
+    UnitTest("Version.ToString(4)", v1234.ToString(4), "1.2.3.4")
 
     UnitTest("Version.Major", v1234.Major = 1)