From f50bed31b85a2e6e352934e9c41c7bb33b458d12 Mon Sep 17 00:00:00 2001
From: otya128 <otya128@users.noreply.github.com>
Date: Sat, 8 Jul 2017 18:55:50 +0900
Subject: [PATCH] Fix unittest

---
 SMILEBASIC/TEST.txt        | 2 +-
 SMILEBASIC/main.d          | 8 --------
 SMILEBASIC/petitcomputer.d | 7 +++++++
 appveyor.yml               | 2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/SMILEBASIC/TEST.txt b/SMILEBASIC/TEST.txt
index f8f1bfa..2b44b23 100644
--- a/SMILEBASIC/TEST.txt
+++ b/SMILEBASIC/TEST.txt
@@ -336,4 +336,4 @@ ASSERT__ _4==4, "DATA"
 ASSERT__ ARY[1]==5, "DATA"
 LOCATE 10,
 COLOR 1,15
-PRINT "テスト正常終了"
+PRINT "Test has been run successfully."
diff --git a/SMILEBASIC/main.d b/SMILEBASIC/main.d
index 6f5575f..30e64ef 100644
--- a/SMILEBASIC/main.d
+++ b/SMILEBASIC/main.d
@@ -32,11 +32,3 @@ int main(string[] argv)
     }*/
     return 0;
 }
-
-unittest
-{
-    auto petitcomputer = new PetitComputer();
-    petitcomputer.run(true, "TEST.txt", false, true);
-    assert(petitcomputer.lastError is null);
-}
-
diff --git a/SMILEBASIC/petitcomputer.d b/SMILEBASIC/petitcomputer.d
index 8229ae0..8fb9c86 100644
--- a/SMILEBASIC/petitcomputer.d
+++ b/SMILEBASIC/petitcomputer.d
@@ -1853,3 +1853,10 @@ class PetitComputer
     }
     public Random random;
 }
+
+unittest
+{
+    auto petitcomputer = new PetitComputer();
+    petitcomputer.run(true, "TEST.txt", false, true);
+    assert(petitcomputer.lastError is null);
+}
diff --git a/appveyor.yml b/appveyor.yml
index db38caa..2571d98 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -48,7 +48,7 @@ after_build:
 
 test_script:
   - cd c:\projects\otyaSMILEBASIC
-  - c:\projects\dub\dub.exe test -- --no-direct-mode --file c:\projects\otyaSMILEBASIC\SMILEBASIC\TEST.TXT --redirect-console
+  - c:\projects\dub\dub.exe test
 
 artifacts:
   - path: otyasmilebasic.zip