Implements the DataModelTestUsingRules exercise

vogella · vogella · commit d85c8ed32f5b · 2017-04-25T14:19:02.000+02:00
diff --git a/com.vogella.android.test.juntexamples/app/src/main/java/com/vogella/android/test/juntexamples/model/TolkienCharacter.java b/com.vogella.android.test.juntexamples/app/src/main/java/com/vogella/android/test/juntexamples/model/TolkienCharacter.java
@@ -16,6 +16,9 @@ public class TolkienCharacter {
 
     public TolkienCharacter(String name, int age, Race race) {
         super();
+        if (age<0) {
+            throw new IllegalArgumentException("Age is not allowed to be smaller than zero");
+        }
         this.name = name;
         this.age = age;
         this.race = race;
diff --git a/com.vogella.android.test.juntexamples/app/src/test/java/com/vogella/android/test/juntexamples/DataModelTestUsingRules.java b/com.vogella.android.test.juntexamples/app/src/test/java/com/vogella/android/test/juntexamples/DataModelTestUsingRules.java
@@ -2,13 +2,10 @@
 
 import com.vogella.android.test.juntexamples.model.TolkienCharacter;
 
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import java.util.List;
-
 import static com.vogella.android.test.juntexamples.model.Race.HOBBIT;
 
 
@@ -20,24 +17,18 @@ public class DataModelTestUsingRules {
     @Test
     public void testThatAgeMustBeLargerThanZeroViaSetter() {
         rule.expect(IllegalArgumentException.class);
+        rule.expectMessage("Age is not allowed to be smaller than zero");
+
         TolkienCharacter frodo = new TolkienCharacter("Frodo", 33, HOBBIT);
-        // use ExpectedException rule to check that the message is:
-        // Age is not allowed to be smaller than zero
         frodo.setAge(-1);
 
-//        rule.expectMessage("Age is not allowed to be smaller than zero");
 
     }
 
     @Test
-    @Ignore
     public void testThatAgeMustBeLargerThanZeroViaConstructor() {
         rule.expect(IllegalArgumentException.class);
+        rule.expectMessage("Age is not allowed to be smaller than zero");
         TolkienCharacter frodo = new TolkienCharacter("Frodo", -1, HOBBIT);
-        // use ExpectedException rule to check that the message is:
-        // Age is not allowed to be smaller than zero
-
-//        rule.expectMessage("Age is not allowed to be smaller than zero");
-
     }
 }
