Remove tests3 and add solution to tests4

2 files changed, 32 insertions, 54 deletions

diff --git a/exercises/17_tests/tests3.rs b/exercises/17_tests/tests3.rs
index d1cb489..9fc9318 100644
--- a/exercises/17_tests/tests3.rs
+++ b/exercises/17_tests/tests3.rs
@@ -1,9 +1,19 @@
-// This test isn't testing our function -- make it do that in such a way that
-// the test passes. Then write a second test that tests whether we get the
-// result we expect to get when we call `is_even(5)`.
+struct Rectangle {
+    width: i32,
+    height: i32,
+}
+
+impl Rectangle {
+    // Don't change this function.
+    fn new(width: i32, height: i32) -> Self {
+        if width <= 0 || height <= 0 {
+            // Returning a `Result` would be better here. But we want to learn
+            // how to test functions that can panic.
+            panic!("Rectangle width and height can't be negative");
+        }
 
-fn is_even(num: i32) -> bool {
-    num % 2 == 0
+        Rectangle { width, height }
+    }
 }
 
 fn main() {
@@ -15,12 +25,25 @@ mod tests {
     use super::*;
 
     #[test]
-    fn is_true_when_even() {
-        assert!();
+    fn correct_width_and_height() {
+        // TODO: This test should check if the rectangle has the size that we
+        // pass to its constructor.
+        let rect = Rectangle::new(10, 20);
+        assert_eq!(???, 10); // Check width
+        assert_eq!(???, 20); // Check height
+    }
+
+    // TODO: This test should check if the program panics when we try to create
+    // a rectangle with negative width.
+    #[test]
+    fn negative_width() {
+        let _rect = Rectangle::new(-10, 10);
     }
 
+    // TODO: This test should check if the program panics when we try to create
+    // a rectangle with negative height.
     #[test]
-    fn is_false_when_odd() {
-        assert!();
+    fn negative_height() {
+        let _rect = Rectangle::new(10, -10);
     }
 }
diff --git a/exercises/17_tests/tests4.rs b/exercises/17_tests/tests4.rs
deleted file mode 100644
index 4303ed0..0000000
--- a/exercises/17_tests/tests4.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Make sure that we're testing for the correct conditions!
-
-struct Rectangle {
-    width: i32,
-    height: i32,
-}
-
-impl Rectangle {
-    // Only change the test functions themselves
-    fn new(width: i32, height: i32) -> Self {
-        if width <= 0 || height <= 0 {
-            panic!("Rectangle width and height cannot be negative!")
-        }
-        Rectangle { width, height }
-    }
-}
-
-fn main() {
-    // You can optionally experiment here.
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn correct_width_and_height() {
-        // This test should check if the rectangle is the size that we pass into its constructor
-        let rect = Rectangle::new(10, 20);
-        assert_eq!(???, 10); // check width
-        assert_eq!(???, 20); // check height
-    }
-
-    #[test]
-    fn negative_width() {
-        // This test should check if program panics when we try to create rectangle with negative width
-        let _rect = Rectangle::new(-10, 10);
-    }
-
-    #[test]
-    fn negative_height() {
-        // This test should check if program panics when we try to create rectangle with negative height
-        let _rect = Rectangle::new(10, -10);
-    }
-}