From 41f989135d79eba4602d4fde828698acf9a9f235 Mon Sep 17 00:00:00 2001
From: apatniv <apatniv@gmail.com>
Date: Sat, 2 May 2020 20:41:11 -0400
Subject: [PATCH] Review Comments: Add other test cases

---
 exercises/conversions/from_into.rs     | 38 +++++++++++++++++++++++++-
 exercises/conversions/from_str.rs      | 34 ++++++++++++++++++++++-
 exercises/conversions/try_from_into.rs | 33 +++++++++++++++++++++-
 3 files changed, 102 insertions(+), 3 deletions(-)

diff --git a/exercises/conversions/from_into.rs b/exercises/conversions/from_into.rs
index 58b860e9..cfcfa309 100644
--- a/exercises/conversions/from_into.rs
+++ b/exercises/conversions/from_into.rs
@@ -29,7 +29,8 @@ impl Default for Person {
 // 1. If the length of the provided string is 0, then return the default of Person
 // 2. Split the given string on the commas present in it
 // 3. Extract the first element from the split operation and use it as the name
-// 4. Extract the other element from the split operation and parse it into a `usize` as the age
+// 4. If the name is empty, then return the default of Person
+// 5. Extract the other element from the split operation and parse it into a `usize` as the age
 // If while parsing the age, something goes wrong, then return the default of Person
 // Otherwise, then return an instantiated Person onject with the results
 impl From<&str> for Person {
@@ -77,4 +78,39 @@ mod tests {
         assert_eq!(p.name, "John");
         assert_eq!(p.age, 30);
     }
+
+    #[test]
+    fn test_missing_comma_and_age() {
+        let p: Person = Person::from("Mark");
+        assert_eq!(p.name, "John");
+        assert_eq!(p.age, 30);
+    }
+
+    #[test]
+    fn test_missing_age() {
+        let p: Person = Person::from("Mark,");
+        assert_eq!(p.name, "John");
+        assert_eq!(p.age, 30);
+    }
+
+    #[test]
+    fn test_missing_name() {
+        let p: Person = Person::from(",1");
+        assert_eq!(p.name, "John");
+        assert_eq!(p.age, 30);
+    }
+
+    #[test]
+    fn test_missing_name_and_age() {
+        let p: Person = Person::from(",");
+        assert_eq!(p.name, "John");
+        assert_eq!(p.age, 30);
+    }
+
+    #[test]
+    fn test_missing_name_and_invalid_age() {
+        let p: Person = Person::from(",one");
+        assert_eq!(p.name, "John");
+        assert_eq!(p.age, 30);
+    }
 }
diff --git a/exercises/conversions/from_str.rs b/exercises/conversions/from_str.rs
index 7b4fdaca..14e9e09d 100644
--- a/exercises/conversions/from_str.rs
+++ b/exercises/conversions/from_str.rs
@@ -15,7 +15,8 @@ struct Person {
 // 1. If the length of the provided string is 0, then return an error
 // 2. Split the given string on the commas present in it
 // 3. Extract the first element from the split operation and use it as the name
-// 4. Extract the other element from the split operation and parse it into a `usize` as the age
+// 4. If the name is empty, then return an error
+// 5. Extract the other element from the split operation and parse it into a `usize` as the age
 // If while parsing the age, something goes wrong, then return an error
 // Otherwise, then return a Result of a Person object
 impl FromStr for Person {
@@ -48,6 +49,37 @@ mod tests {
     #[test]
     #[should_panic]
     fn missing_age() {
+        "John,".parse::<Person>().unwrap();
+    }
+
+    #[test]
+    #[should_panic]
+    fn invalid_age() {
+        "John,twenty".parse::<Person>().unwrap();
+    }
+
+    #[test]
+    #[should_panic]
+    fn missing_comma_and_age() {
         "John".parse::<Person>().unwrap();
     }
+
+    #[test]
+    #[should_panic]
+    fn missing_name() {
+        ",1".parse::<Person>().unwrap();
+    }
+
+    #[test]
+    #[should_panic]
+    fn missing_name_and_age() {
+        ",".parse::<Person>().unwrap();
+    }
+
+    #[test]
+    #[should_panic]
+    fn missing_name_and_invalid_age() {
+        ",one".parse::<Person>().unwrap();
+    }
+
 }
\ No newline at end of file
diff --git a/exercises/conversions/try_from_into.rs b/exercises/conversions/try_from_into.rs
index 834dd932..9968075e 100644
--- a/exercises/conversions/try_from_into.rs
+++ b/exercises/conversions/try_from_into.rs
@@ -22,7 +22,8 @@ struct Person {
 // 1. If the length of the provided string is 0, then return an error
 // 2. Split the given string on the commas present in it
 // 3. Extract the first element from the split operation and use it as the name
-// 4. Extract the other element from the split operation and parse it into a `usize` as the age
+// 4. If the name is empty, then return an error.
+// 5. Extract the other element from the split operation and parse it into a `usize` as the age
 // If while parsing the age, something goes wrong, then return an error
 // Otherwise, then return a Result of a Person object
 impl TryFrom<&str> for Person {
@@ -68,4 +69,34 @@ mod tests {
     fn test_panic_bad_age() {
         let p = Person::try_from("Mark,twenty").unwrap();
     }
+
+    #[test]
+    #[should_panic]
+    fn test_missing_comma_and_age() {
+        let _: Person = "Mark".try_into().unwrap();
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_missing_age() {
+        let _: Person = "Mark,".try_into().unwrap();
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_missing_name() {
+        let _ : Person = ",1".try_into().unwrap();
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_missing_name_and_age() {
+        let _: Person = ",".try_into().unwrap();
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_missing_name_and_invalid_age() {
+        let _: Person = ",one".try_into().unwrap();
+    }
 }
\ No newline at end of file