From b125336ae49dcb9326fbf99d7ec33aa305dd8e6e Mon Sep 17 00:00:00 2001
From: Justin Lin <caterpillar@openhome.cc>
Date: Mon, 27 Jan 2020 14:53:26 +0800
Subject: [PATCH] refactor deps

---
 test/test_hexagons.scad | 76 ++++++++++++-----------------------------
 1 file changed, 21 insertions(+), 55 deletions(-)

diff --git a/test/test_hexagons.scad b/test/test_hexagons.scad
index 2650d48d..fa4dfaff 100644
--- a/test/test_hexagons.scad
+++ b/test/test_hexagons.scad
@@ -1,4 +1,23 @@
-include <unittest.scad>;
+use <unittest.scad>;
+use <hexagons.scad>;
+
+module test_each_hexagon(hex_r, pts_all_lines) {
+    // ==== test_hexagons_lv2 ====
+    assertEqualNum(19, hex_r);
+    
+    expects = [
+            [[-34.641, 0], [0, 0], [34.641, 0]],
+            [[-17.3205, 30], [17.3205, 30]],
+            [[-17.3205, -30], [17.3205, -30]]
+    ];
+    
+    for(i = [0:len(pts_all_lines) - 1]) {
+        assertEqualPoints(
+            expects[i], 
+            pts_all_lines[i]
+        );
+    }
+} 
 
 module test_hexagons_lv2() {
     echo("==== test_hexagons_lv2 ===="); 
@@ -7,60 +26,7 @@ module test_hexagons_lv2() {
     spacing = 2;
     levels = 2;
             
-    include <hexagons.scad>;
-    
-    module test_each_hexagon(hex_r, pts_all_lines) {
-        assertEqualNum(19, hex_r);
-        
-        expects = [
-             [[-34.641, 0], [0, 0], [34.641, 0]],
-             [[-17.3205, 30], [17.3205, 30]],
-             [[-17.3205, -30], [17.3205, -30]]
-        ];
-        
-        for(i = [0:len(pts_all_lines) - 1]) {
-            assertEqualPoints(
-                expects[i], 
-                pts_all_lines[i]
-            );
-        }
-        
-    } 
-    
     hexagons(radius, spacing, levels);
 }
 
-module test_hexagons_lv3() {
-    echo("==== test_hexagons_lv3 ===="); 
-
-    radius = 20;
-    spacing = 2;
-    levels = 3;
-            
-    include <hexagons.scad>;
-    
-    module test_each_hexagon(hex_r, pts_all_lines) {
-        assertEqualNum(19, hex_r);
-        
-        expects = [
-              [[-69.282, 0], [-34.641, 0], [0, 0], [34.641, 0], [69.282, 0]],
-             [[-51.9615, 30], [-17.3205, 30], [17.3205, 30], [51.9615, 30]],
-             [[-34.641, 60], [0, 60], [34.641, 60]],
-             [[-51.9615, -30], [-17.3205, -30], [17.3205, -30], [51.9615, -30]],
-             [[-34.641, -60], [0, -60], [34.641, -60]]
-        ];
-        
-        for(i = [0:len(pts_all_lines) - 1]) {
-            assertEqualPoints(
-                expects[i], 
-                pts_all_lines[i]
-            );
-        }
-        
-    } 
-    
-    hexagons(radius, spacing, levels);
-}
-
-test_hexagons_lv2();
-test_hexagons_lv3();
+test_hexagons_lv2();
\ No newline at end of file