From 141f43498c6eaa7a59a053e28ae89d67f81c361e Mon Sep 17 00:00:00 2001
From: Torsten Paul <Torsten.Paul@gmx.de>
Date: Sun, 20 Oct 2013 21:49:03 +0200
Subject: Add cylinder tests to cover the new diameter parameters.


diff --git a/testdata/scad/features/cylinder-diameter-tests.scad b/testdata/scad/features/cylinder-diameter-tests.scad
new file mode 100644
index 0000000..57eab65
--- /dev/null
+++ b/testdata/scad/features/cylinder-diameter-tests.scad
@@ -0,0 +1,13 @@
+cylinder();
+translate([-11,-11,0]) cylinder(h=3, r=5);
+translate([-11,  0,0]) cylinder(h=5, d=10);
+translate([-11, 11,0]) cylinder(h=7, r=1, d=10);
+translate([ 11,-11,0]) cylinder(h=5, r1=5);
+translate([ 11,  0,0]) cylinder(h=7, d1=10);
+translate([ 11, 11,0]) cylinder(h=9, r1=1, d1=10);
+translate([ 22,-11,0]) cylinder(h=5, r2=5);
+translate([ 22,  0,0]) cylinder(h=7, d2=10);
+translate([ 22, 11,0]) cylinder(h=9, r2=1, d2=10);
+translate([ 33,-11,0]) cylinder(h=5, r1=5, r2=5);
+translate([ 33,  0,0]) cylinder(h=7, d1=10, d2=10);
+translate([ 33, 11,0]) cylinder(h=9, r1=1, d1=10, r2=1, d2=10);
diff --git a/tests/regression/cgalpngtest/cylinder-diameter-tests-expected.png b/tests/regression/cgalpngtest/cylinder-diameter-tests-expected.png
new file mode 100644
index 0000000..0877e5b
Binary files /dev/null and b/tests/regression/cgalpngtest/cylinder-diameter-tests-expected.png differ
diff --git a/tests/regression/dumptest/cylinder-diameter-tests-expected.csg b/tests/regression/dumptest/cylinder-diameter-tests-expected.csg
new file mode 100644
index 0000000..98fab0d
--- /dev/null
+++ b/tests/regression/dumptest/cylinder-diameter-tests-expected.csg
@@ -0,0 +1,39 @@
+group() {
+	cylinder($fn = 0, $fa = 12, $fs = 2, h = 1, r1 = 1, r2 = 1, center = false);
+	multmatrix([[1, 0, 0, -11], [0, 1, 0, -11], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		cylinder($fn = 0, $fa = 12, $fs = 2, h = 3, r1 = 5, r2 = 5, center = false);
+	}
+	multmatrix([[1, 0, 0, -11], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		cylinder($fn = 0, $fa = 12, $fs = 2, h = 5, r1 = 5, r2 = 5, center = false);
+	}
+	multmatrix([[1, 0, 0, -11], [0, 1, 0, 11], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		cylinder($fn = 0, $fa = 12, $fs = 2, h = 7, r1 = 5, r2 = 5, center = false);
+	}
+	multmatrix([[1, 0, 0, 11], [0, 1, 0, -11], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		cylinder($fn = 0, $fa = 12, $fs = 2, h = 5, r1 = 5, r2 = 1, center = false);
+	}
+	multmatrix([[1, 0, 0, 11], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		cylinder($fn = 0, $fa = 12, $fs = 2, h = 7, r1 = 5, r2 = 1, center = false);
+	}
+	multmatrix([[1, 0, 0, 11], [0, 1, 0, 11], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		cylinder($fn = 0, $fa = 12, $fs = 2, h = 9, r1 = 5, r2 = 1, center = false);
+	}
+	multmatrix([[1, 0, 0, 22], [0, 1, 0, -11], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		cylinder($fn = 0, $fa = 12, $fs = 2, h = 5, r1 = 1, r2 = 5, center = false);
+	}
+	multmatrix([[1, 0, 0, 22], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		cylinder($fn = 0, $fa = 12, $fs = 2, h = 7, r1 = 1, r2 = 5, center = false);
+	}
+	multmatrix([[1, 0, 0, 22], [0, 1, 0, 11], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		cylinder($fn = 0, $fa = 12, $fs = 2, h = 9, r1 = 1, r2 = 5, center = false);
+	}
+	multmatrix([[1, 0, 0, 33], [0, 1, 0, -11], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		cylinder($fn = 0, $fa = 12, $fs = 2, h = 5, r1 = 5, r2 = 5, center = false);
+	}
+	multmatrix([[1, 0, 0, 33], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		cylinder($fn = 0, $fa = 12, $fs = 2, h = 7, r1 = 5, r2 = 5, center = false);
+	}
+	multmatrix([[1, 0, 0, 33], [0, 1, 0, 11], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		cylinder($fn = 0, $fa = 12, $fs = 2, h = 9, r1 = 5, r2 = 5, center = false);
+	}
+}
diff --git a/tests/regression/opencsgtest/cylinder-diameter-tests-expected.png b/tests/regression/opencsgtest/cylinder-diameter-tests-expected.png
new file mode 100644
index 0000000..7425635
Binary files /dev/null and b/tests/regression/opencsgtest/cylinder-diameter-tests-expected.png differ
diff --git a/tests/regression/throwntogethertest/cylinder-diameter-tests-expected.png b/tests/regression/throwntogethertest/cylinder-diameter-tests-expected.png
new file mode 100644
index 0000000..7425635
Binary files /dev/null and b/tests/regression/throwntogethertest/cylinder-diameter-tests-expected.png differ
-- 
cgit v0.10.1