Seperate status class.

aviate-labs · Mar 19, 2022 · d76d98d · d76d98d
1 parent d4ea0bb
commit d76d98d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 32 deletions.
diff --git a/src/Status.mo b/src/Status.mo
@@ -0,0 +1,18 @@
+import { debugPrint } = "mo:⛔";
+
+module {
+    public class Status() {
+        var _pass = 0;
+        public func pass() { _pass += 1 };
+        public func passed() : Nat { _pass };
+
+        var _fail = 0;
+        public func fail() { _fail += 1 };
+        public func failed() : Nat { _fail };
+
+        public func printStatus() {
+            let total = debug_show(_pass + _fail);
+            debugPrint("🟢 " # debug_show(_pass) # "/" # total # " | 🛑 " # debug_show(_fail) # "/" # total # "\n");
+        };
+    };
+};
diff --git a/src/Suite.mo b/src/Suite.mo
@@ -1,4 +1,5 @@
 import { debugPrint } = "mo:⛔";
+import Status "Status";
 import Testify "Testify";
 
 module {
@@ -32,23 +33,8 @@ module {
         #Test(name, test);
     };
 
-    private class Status() {
-        var _pass = 0;
-        public func pass() { _pass += 1 };
-        public func passed() : Nat { _pass };
-
-        var _fail = 0;
-        public func fail() { _fail += 1 };
-        public func failed() : Nat { _fail };
-
-        public func printStatus() {
-            let total = debug_show(_pass + _fail);
-            debugPrint("🟢 " # debug_show(_pass) # "/" # total # " | 🛑 " # debug_show(_fail) # "/" # total # "\n");
-        };
-    };
-
     public class Suite() {
-        let s : Status = Status();
+        let s = Status.Status();
 
         var indent = 0;
         public func print(t : Text) {

diff --git a/src/SuiteState.mo b/src/SuiteState.mo
@@ -1,4 +1,5 @@
 import { debugPrint } = "mo:⛔";
+import Status "Status";
 import Testify "Testify";
 
 module {
@@ -36,25 +37,10 @@ module {
         #Test(name, test);
     };
 
-    private class Status() {
-        var _pass = 0;
-        public func pass() { _pass += 1 };
-        public func passed() : Nat { _pass };
-
-        var _fail = 0;
-        public func fail() { _fail += 1 };
-        public func failed() : Nat { _fail };
-
-        public func printStatus() {
-            let total = debug_show(_pass + _fail);
-            debugPrint("🟢 " # debug_show(_pass) # "/" # total # " | 🛑 " # debug_show(_fail) # "/" # total # "\n");
-        };
-    };
-
     private func doNothing<T>() : Testing<T> { func (_ : T) {} };
 
     public class Suite<T>(state : T) {
-        let s : Status = Status();
+        let s = Status.Status();
 
         var _before : Testing<T> = doNothing<T>();
         public func before(c : Testing<T>) { _before := c; };