From ee271cb06b1e17abbd7e295c31e06331e2653351 Mon Sep 17 00:00:00 2001
From: Viktor Kovacs <viktorkovacs@gmail.com>
Date: Sat, 15 May 2021 12:52:55 +0200
Subject: [PATCH] Move cube model generation to test utils.

---
 test/tests/modelutils_test.js | 27 +------------------------
 test/tests/taskrunner_test.js |  6 ++++--
 test/utils/testutils.js       | 37 ++++++++++++++++++++++++++++++++++-
 3 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/test/tests/modelutils_test.js b/test/tests/modelutils_test.js
index bd11e51..56301c9 100644
--- a/test/tests/modelutils_test.js
+++ b/test/tests/modelutils_test.js
@@ -121,32 +121,7 @@ describe ('Model Utils', function () {
             return Math.sqrt (areaSquare);
         }
 
-        var model = new OV.Model ();
-        var cube = new OV.Mesh ();
-        cube.AddVertex (new OV.Coord3D (0.0, 0.0, 0.0));
-        cube.AddVertex (new OV.Coord3D (1.0, 0.0, 0.0));
-        cube.AddVertex (new OV.Coord3D (1.0, 1.0, 0.0));
-        cube.AddVertex (new OV.Coord3D (0.0, 1.0, 0.0));
-        cube.AddVertex (new OV.Coord3D (0.0, 0.0, 1.0));
-        cube.AddVertex (new OV.Coord3D (1.0, 0.0, 1.0));
-        cube.AddVertex (new OV.Coord3D (1.0, 1.0, 1.0));
-        cube.AddVertex (new OV.Coord3D (0.0, 1.0, 1.0));
-        cube.AddTriangle (new OV.Triangle (0, 1, 5));
-        cube.AddTriangle (new OV.Triangle (0, 5, 4));
-        cube.AddTriangle (new OV.Triangle (1, 2, 6));
-        cube.AddTriangle (new OV.Triangle (1, 6, 5));
-        cube.AddTriangle (new OV.Triangle (2, 3, 7));
-        cube.AddTriangle (new OV.Triangle (2, 7, 6));
-        cube.AddTriangle (new OV.Triangle (3, 0, 4));
-        cube.AddTriangle (new OV.Triangle (3, 4, 7));
-        cube.AddTriangle (new OV.Triangle (0, 3, 2));
-        cube.AddTriangle (new OV.Triangle (0, 2, 1));
-        cube.AddTriangle (new OV.Triangle (4, 5, 6));
-        cube.AddTriangle (new OV.Triangle (4, 6, 7));
-        model.AddMesh (cube);
-        OV.FinalizeModel (model, function () {
-            return new OV.Material ();
-        });
+        var model = testUtils.GetCubeModel ();
         let surface = 0.0;
         let volume = 0.0;
         for (let i = 0; i < model.MeshCount (); i++) {
diff --git a/test/tests/taskrunner_test.js b/test/tests/taskrunner_test.js
index 20f2866..dd3b180 100644
--- a/test/tests/taskrunner_test.js
+++ b/test/tests/taskrunner_test.js
@@ -1,7 +1,7 @@
 var assert = require ('assert');
 
 describe ('Task Runner', function () {
-    it ('Run task zero times', function () {
+    it ('Run task zero times', function (done) {
         var tr = new OV.TaskRunner ();
         var numbers = [];
         tr.Run (0, {
@@ -11,11 +11,12 @@ describe ('Task Runner', function () {
             },
             onReady : function () {
                 assert.deepStrictEqual (numbers, []);
+                done ();
             }
         });
     });
 
-    it ('Run task three times', function () {
+    it ('Run task three times', function (done) {
         var tr = new OV.TaskRunner ();
         var numbers = [];
         tr.Run (3, {
@@ -25,6 +26,7 @@ describe ('Task Runner', function () {
             },
             onReady : function () {
                 assert.deepStrictEqual (numbers, [0, 1, 2]);
+                done ();
             }
         });
     });        
diff --git a/test/utils/testutils.js b/test/utils/testutils.js
index 5eca5a5..6a38c46 100644
--- a/test/utils/testutils.js
+++ b/test/utils/testutils.js
@@ -135,5 +135,40 @@ module.exports =
         }
 
         return obj;
-    }
+    },
+
+    GetCubeMesh ()
+    {
+        var cube = new OV.Mesh ();
+        cube.AddVertex (new OV.Coord3D (0.0, 0.0, 0.0));
+        cube.AddVertex (new OV.Coord3D (1.0, 0.0, 0.0));
+        cube.AddVertex (new OV.Coord3D (1.0, 1.0, 0.0));
+        cube.AddVertex (new OV.Coord3D (0.0, 1.0, 0.0));
+        cube.AddVertex (new OV.Coord3D (0.0, 0.0, 1.0));
+        cube.AddVertex (new OV.Coord3D (1.0, 0.0, 1.0));
+        cube.AddVertex (new OV.Coord3D (1.0, 1.0, 1.0));
+        cube.AddVertex (new OV.Coord3D (0.0, 1.0, 1.0));
+        cube.AddTriangle (new OV.Triangle (0, 1, 5));
+        cube.AddTriangle (new OV.Triangle (0, 5, 4));
+        cube.AddTriangle (new OV.Triangle (1, 2, 6));
+        cube.AddTriangle (new OV.Triangle (1, 6, 5));
+        cube.AddTriangle (new OV.Triangle (2, 3, 7));
+        cube.AddTriangle (new OV.Triangle (2, 7, 6));
+        cube.AddTriangle (new OV.Triangle (3, 0, 4));
+        cube.AddTriangle (new OV.Triangle (3, 4, 7));
+        cube.AddTriangle (new OV.Triangle (0, 3, 2));
+        cube.AddTriangle (new OV.Triangle (0, 2, 1));
+        cube.AddTriangle (new OV.Triangle (4, 5, 6));
+        cube.AddTriangle (new OV.Triangle (4, 6, 7));
+        return cube;
+    },
+
+    GetCubeModel ()
+    {
+        var model = new OV.Model ();
+        var cube = this.GetCubeMesh ();
+        model.AddMesh (cube);
+        OV.FinalizeModel (model, function () { new OV.Material () });
+        return model;
+    }    
 }