Changeset 468 for trunk/TestCase/SimpleTestCase

Timestamp:

Mar 9, 2008, 12:00:01 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

TextWriter, StreamWriterの追加。
SPrintfの浮動小数点数変換で、NaN, Infiniteの出力に対応。
PathとDirectoryInfoのCreateDirectoryで、対象が既に存在するときには例外を投げないように修正。
SimpleTestCase内で使用する一時フォルダの場所にGetTempPathで取得する版を追加（コメントアウト）。

Location:

trunk/TestCase/SimpleTestCase

Files:

• SPrintFTest.ab (modified) (2 diffs)
• SimpleTestCase.ab (modified) (5 diffs)
• StringBuilderTest.ab (modified) (2 diffs)
• XmlTest.ab (modified) (1 diff)

trunk/TestCase/SimpleTestCase/SPrintFTest.ab

@@ -118 +118 @@
     s = FormatFloatG(0.0000123456, 4, 0, None)
     UnitTest("FormatFloatG(0.0000123456, precision = 4) = 1.234e-05", s, "1.234e-05")
+    s = FormatFloatG(ActiveBasic.Math.Detail.GetNaN(), DWORD_MAX, 0, None)
+    UnitTest(Ex"FormatFloatG(NaN) = \qnan\q", s, "nan")
+    s = FormatFloatG(ActiveBasic.Math.Detail.GetInf(False), DWORD_MAX, 0, Sign)
+    UnitTest(Ex"FormatFloatG(Inf, Sign) = \q+infinity\q", s, "+infinity")
 
     s = FormatFloatA(1, DWORD_MAX, 0, None)
@@ -127 +131 @@
     s = FormatFloatA(3.1415926535897932384626433832795, DWORD_MAX, 0, None)
     UnitTest("FormatFloatA(π) = 0x1.921fb54442d18p+1", s, "0x1.921fb54442d18p+1")
+    s = FormatFloatA(3.1415926535897932384626433832795, 4, 0, None)
+    UnitTest("FormatFloatA(π, precision = 4) = 0x1.921fp+1", s, "0x1.921fp+1")
     s = FormatFloatA(0, DWORD_MAX, 0, None)
     UnitTest("FormatFloatA(0)", s, "0x0p+0")

trunk/TestCase/SimpleTestCase/SimpleTestCase.ab

@@ -5 +5 @@
 Dim hStdOut = _System_hConsoleOut
 
+Function GetTempDirectory() As String
+    Return System.IO.Path.GetDirectoryName( System.Windows.Forms.Application.ExecutablePath ) + "\temp\"
+'   Return System.IO.Path.GetTempPath()
+End Function
+
 Sub Initialize()
     ' 初期化関数
 
     ' 一時ディレクトリを空にしておく
-    Dim tempDir = System.IO.Path.GetDirectoryName( System.Windows.Forms.Application.ExecutablePath ) + "\temp"
+    Dim tempDir = GetTempDirectory()
     If System.IO.Directory.Exists( tempDir ) Then
-        ' 存在するときは一旦消す
-        System.IO.Directory.Delete( tempDir, True )
+        Try
+            ' 存在するときは一旦消す
+            System.IO.Directory.Delete( tempDir, True )
+        Catch e As System.IO.IOException
+            OutputDebugString(e.ToString)
+        End Try
     End If
     System.IO.Directory.CreateDirectory( tempDir )
@@ -24 +33 @@
 #include "SimpleTestCase.idx"
 
+Dim failureCount = 0 As DWord
+
 Sub UnitTest( msg As String, isSuccessful As Boolean )
     Dim resultStr = Nothing As String
@@ -30 +41 @@
     Else
         resultStr = Ex"FAILURE!"
+        failureCount++
     End If
 
@@ -49 +61 @@
         SetConsoleTextAttribute(hStdOut, BACKGROUND_RED Or BACKGROUND_GREEN Or BACKGROUND_INTENSITY)
         Print Ex"FAILURE!"; msg
-        Print "  test string = '" + test + "'"
+        Print "  期待 = '" + expectation + "'" + " 結果 = '" + test + "'"
         SetConsoleTextAttribute(hStdOut, csbi.wAttributes)
+        failureCount++
     End If
 End Sub
 
 Function GetExclusiveTempDirPath( testCaseName As String ) As String
-    Dim tempDir = System.IO.Path.GetDirectoryName( System.Windows.Forms.Application.ExecutablePath ) + "\temp"
-    Dim exclusiveTempDirPath = tempDir + "\" + testCaseName
+    Dim tempDir = GetTempDirectory()
+    Dim exclusiveTempDirPath = tempDir + testCaseName
 
     If Not System.IO.Directory.Exists( exclusiveTempDirPath ) Then
@@ -66 +79 @@
 End Function
 
+Print "失敗"; failureCount; "個"
 Print "Please Enter key"
 System.Console.ReadLine()

trunk/TestCase/SimpleTestCase/StringBuilderTest.ab

@@ -18 +18 @@
     sb.Replace("こい", "いけ").Replace("いけ", "こい")
     UnitTest("StringBuilder.Replace (String)", sb.ToString, "でてこいでてこいこいのこい")
+    sb.Length = 0
+    sb.Append(123)
+    UnitTest("StringBuilder.Append (Long)", sb.ToString, "123")
 End Sub
 
@@ -23 +26 @@
 
 StringBuilderTest.TestMain()
-

trunk/TestCase/SimpleTestCase/XmlTest.ab

@@ -19 +19 @@
 
     ' 書いて
-    doc.Save( tempDir + "\test.xml" )
+    doc.Save( tempDir + "test.xml" )
 
     ' 読んで
     Dim clone = New System.Xml.XmlDocument
-    clone.Load( tempDir + "\test.xml" )
+    clone.Load( tempDir + "test.xml" )
 
     ' 比較してみる