fix tests and add one

Signed-off-by: Jess Frazelle <[email protected]>

Author: jessfraz

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "zoo"
-version = "0.2.108"
+version = "0.2.109"
 edition = "2021"
 build = "build.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Cargo.toml

@@ -454,7 +454,10 @@ impl Context<'_> {
         if path.is_dir() {
             path = path.join("main.kcl");
             if !path.exists() {
-                return Err(anyhow::anyhow!("Directory does not contain a main.kcl file"));
+                return Err(anyhow::anyhow!(
+                    "Directory `{}` does not contain a main.kcl file",
+                    path.display()
+                ));
             }
         } else {
             // Otherwise be sure we have a kcl file.

src/context.rs

@@ -9,6 +9,7 @@ pub struct TestItem {
     want_out: String,
     want_err: String,
     want_code: i32,
+    current_directory: Option<std::path::PathBuf>,
 }
 
 struct MainContext {
@@ -158,6 +159,7 @@ async fn test_main(ctx: &mut MainContext) {
             want_out: "✔ Logged in as ".to_string(),
             want_err: "".to_string(),
             want_code: 0,
+            ..Default::default()
         },
         TestItem {
             name: "api /user".to_string(),
@@ -213,9 +215,7 @@ async fn test_main(ctx: &mut MainContext) {
                 "user".to_string(),
                 "--include".to_string(),
             ],
-            want_out: r#"HTTP/2.0 200 OK
-access-control-allow-credentials:  """#
-                .to_string(),
+            want_out: r#"HTTP/2.0 200 OK"#.to_string(),
             want_err: "".to_string(),
             want_code: 0,
             ..Default::default()
@@ -452,6 +452,21 @@ access-control-allow-credentials:  """#
             want_code: 0,
             ..Default::default()
         },
+        TestItem {
+            name: "snapshot a kcl assembly as png with .".to_string(),
+            current_directory: Some(std::env::current_dir().unwrap().join("tests/walkie-talkie")),
+            args: vec![
+                "zoo".to_string(),
+                "kcl".to_string(),
+                "snapshot".to_string(),
+                ".".to_string(),
+                "walkie-talkie.png".to_string(),
+            ],
+            want_out: r#"Snapshot saved to `walkie-talkie.png`"#.to_string(),
+            want_err: "".to_string(),
+            want_code: 0,
+            ..Default::default()
+        },
         TestItem {
             name: "get the mass of a kcl file".to_string(),
             args: vec![
@@ -796,11 +811,19 @@ access-control-allow-credentials:  """#
             debug: false,
         };
 
+        let old_current_directory = std::env::current_dir().unwrap();
+        if let Some(current_directory) = t.current_directory {
+            std::env::set_current_dir(&current_directory).unwrap();
+        }
+
         let result = crate::do_main(t.args, &mut ctx).await;
 
         let stdout = std::fs::read_to_string(stdout_path).unwrap_or_default();
         let stderr = std::fs::read_to_string(stderr_path).unwrap_or_default();
 
+        // Reset the cwd.
+        std::env::set_current_dir(old_current_directory).unwrap();
+
         assert!(
             stdout.contains(&t.want_out),
             "test {} ->\nstdout: {}\nwant: {}\n\nstderr: {}",

src/tests.rs

@@ -89,7 +89,7 @@ holeRadius = 1
 startAngle = asin(keywayWidth / 2 / holeRadius)
 
 // Sketch the keyway and center hole and extrude
-keyWay = startSketchOn(body, 'END')
+keyWay = startSketchOn(body, face = 'END')
   |> startProfileAt([
        holeRadius * cos(startAngle),
        holeRadius * sin(startAngle)

tests/gear.kcl

@@ -89,7 +89,7 @@ holeRadius = 1
 startAngle = asin(keywayWidth / 2 / holeRadius)
 
 // Sketch the keyway and center hole and extrude
-keyWay = startSketchOn(body, 'END')
+keyWay = startSketchOn(body, face = 'END')
   |> startProfileAt([
        holeRadius * cos(startAngle),
        holeRadius * sin(startAngle)

tests/nested-settings/subdir/gear.kcl

@@ -1,49 +1,32 @@
-@settings(defaultLengthUnit = in)
-
-// Antenna
+// Walkie Talkie Antenna
+// Antenna for the walkie talkie assembly
 
 // Set units
+@settings(defaultLengthUnit = in)
 
-// import constants
-import height, width, antennaBaseWidth, antennaBaseHeight, antennaTopWidth, antennaTopHeight from "globals.kcl"
-
-// Calculate the origin
-origin = [-width / 2 + .45, -0.10]
-
-// Create the antenna
-antennaX = origin[0]
-antennaY = origin[1]
-
-antennaPlane = {
-  plane = {
-    origin = { x = 0, y = 0, z = height / 2 },
-    xAxis = { x = 1, y = 0, z = 0 },
-    yAxis = { x = 0, y = 1, z = 0 },
-    zAxis = { x = 0, y = 0, z = 1 }
-  }
-}
+// Import parameters
+import antennaLength, antennaBaseWidth, antennaBaseHeight, antennaTopWidth, antennaTopHeight from "parameters.kcl"
 
 // Create the antenna base sketch
-sketch001 = startSketchOn(antennaPlane)
-  |> startProfileAt([origin[0], origin[1]], %)
+antennaBaseSketch = startSketchOn(XY)
+  |> startProfileAt([0, 0], %)
   |> line(end = [antennaBaseWidth, 0])
   |> line(end = [0, -antennaBaseHeight])
   |> line(end = [-antennaBaseWidth, 0])
   |> close()
 
 // Create the antenna top sketch
-loftPlane = offsetPlane(XY, offset = height / 2 + 3)
-
-sketch002 = startSketchOn(loftPlane)
+loftPlane = offsetPlane(XY, offset = antennaLength)
+antennaTopSketch = startSketchOn(loftPlane)
   |> startProfileAt([
-       origin[0] + (antennaBaseWidth - antennaTopWidth) / 2,
-       origin[1] - ((antennaBaseHeight - antennaTopHeight) / 2)
+       (antennaBaseWidth - antennaTopWidth) / 2,
+       (antennaBaseHeight - antennaTopHeight) / 2
      ], %)
   |> xLine(length = antennaTopWidth)
   |> yLine(length = -antennaTopHeight)
   |> xLine(length = -antennaTopWidth)
   |> close()
 
 // Create the antenna using a loft
-loft([sketch001, sketch002])
+loft([antennaBaseSketch, antennaTopSketch])
   |> appearance(color = "#000000")

tests/walkie-talkie.png

@@ -1,19 +1,20 @@
-@settings(defaultLengthUnit = in)
-
-// Walkie talkie body
+// Walkie Talkie Body
+// The main body of the walkie talkie assembly
 
 // Set units
+@settings(defaultLengthUnit = in)
 
-// Import constants
-import height, width, thickness, chamferLength, offset, screenWidth, screenHeight, screenYPosition, screenDepth, speakerBoxWidth, speakerBoxHeight from "globals.kcl"
+// Import parameters
+import height, width, thickness, chamferLength, offset, screenWidth, screenHeight, screenYPosition, screenDepth, speakerBoxWidth, speakerBoxHeight from "parameters.kcl"
 
-bodySketch = startSketchOn(XZ)
+// Sketch and extrude the body of the walkie talkie
+body = startSketchOn(XZ)
   |> startProfileAt([-width / 2, height / 2], %)
   |> xLine(length = width, tag = $chamfer1)
   |> yLine(length = -height, tag = $chamfer2)
   |> xLine(length = -width, tag = $chamfer3)
   |> close(tag = $chamfer4)
-bodyExtrude = extrude(bodySketch, length = thickness)
+  |> extrude(%, length = thickness)
   |> chamfer(
        length = chamferLength,
        tags = [
@@ -24,53 +25,48 @@ bodyExtrude = extrude(bodySketch, length = thickness)
        ],
      )
 
-// Define the offset for the indentation
-sketch002 = startSketchOn(bodyExtrude, 'END')
+// Cut out the indentation for the case
+caseIndentSketch = startSketchOn(body, face = END)
   |> startProfileAt([
        -width / 2 + offset,
        height / 2 - (chamferLength + offset / 2 * cos(toRadians(45)))
      ], %)
-  |> angledLineToY({ angle = 45, to = height / 2 - offset }, %)
+  |> angledLine(angle = 45, endAbsoluteY = height / 2 - offset)
   |> line(endAbsolute = [
        width / 2 - (chamferLength + offset / 2 * cos(toRadians(45))),
        height / 2 - offset
      ])
-  |> angledLineToX({ angle = -45, to = width / 2 - offset }, %)
+  |> angledLine(angle = -45, endAbsoluteX = width / 2 - offset)
   |> line(endAbsolute = [
        width / 2 - offset,
        -(height / 2 - (chamferLength + offset / 2 * cos(toRadians(45))))
      ])
-  |> angledLineToY({
-       angle = -135,
-       to = -height / 2 + offset
-     }, %)
+  |> angledLine(angle = -135, endAbsoluteY = -height / 2 + offset)
   |> line(endAbsolute = [
        -(width / 2 - (chamferLength + offset / 2 * cos(toRadians(45)))),
        -height / 2 + offset
      ])
-  |> angledLineToX({
-       angle = -225,
-       to = -width / 2 + offset
-     }, %)
+  |> angledLine(angle = -225, endAbsoluteX = -width / 2 + offset)
   |> close()
-extrude002 = extrude(sketch002, length = -0.0625)
+extrude002 = extrude(caseIndentSketch, length = -0.0625)
 
 // Create the pocket for the screen
-sketch003 = startSketchOn(extrude002, 'start')
+screenCutout = startSketchOn(extrude002, face = START)
   |> startProfileAt([-screenWidth / 2, screenYPosition], %)
   |> xLine(length = screenWidth, tag = $seg01)
   |> yLine(length = -screenHeight)
   |> xLine(length = -segLen(seg01))
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-extrude003 = extrude(sketch003, length = screenDepth)
+extrude003 = extrude(screenCutout, length = screenDepth)
 
 // Create the speaker box
-sketch004 = startSketchOn(extrude002, 'start')
+speakerBox = startSketchOn(extrude002, face = START)
   |> startProfileAt([-1.25 / 2, -.125], %)
   |> xLine(length = speakerBoxWidth)
   |> yLine(length = -speakerBoxHeight)
   |> xLine(length = -speakerBoxWidth)
   |> close()
-extrude(sketch004, length = -.5)
+
+extrude(speakerBox, length = -.5)
   |> appearance(color = "#277bb0")

tests/walkie-talkie/antenna.kcl

@@ -1,30 +1,24 @@
+// Walkie Talkie Button
+// Button for the walkie talkie
+
+// Set units
 @settings(defaultLengthUnit = in)
 
-// Walkie Talkie button
+// Import parameters
+import buttonWidth, buttonHeight, buttonThickness from "parameters.kcl"
 
-// Set units
+// Create a function for the button. We need to create a function to use multiple buttons.
 
-// Import constants
-import screenHeight, buttonWidth, tolerance, buttonHeight, buttonThickness from "globals.kcl"
 
-// Create a function for the button
-export fn button(origin, rotation, plane) {
-  buttonSketch = startSketchOn(plane)
-    |> startProfileAt([origin[0], origin[1]], %)
-    |> angledLine({
-         angle = 180 + rotation,
-         length = buttonWidth
-       }, %, $tag1)
-    |> angledLine({
-         angle = 270 + rotation,
-         length = buttonHeight
-       }, %, $tag2)
-    |> angledLine({
-         angle = 0 + rotation,
-         length = buttonWidth
-       }, %)
+export fn button() {
+  // Sketch the button profile and extrude
+  buttonSketch = startSketchOn(XZ)
+    |> startProfileAt([0, 0], %)
+    |> angledLine(angle = 180, length = buttonWidth, tag = $tag1)
+    |> angledLine(angle = 270, length = buttonHeight, tag = $tag2)
+    |> angledLine(angle = 0, length = buttonWidth)
     |> close()
-  buttonExtrude = extrude(buttonSketch, length = buttonThickness)
+  button = extrude(buttonSketch, length = buttonThickness)
     |> chamfer(
          length = .050,
          tags = [
@@ -34,5 +28,5 @@ export fn button(origin, rotation, plane) {
        )
     |> appearance(color = "#ff0000")
 
-  return buttonExtrude
+  return button
 }