Car.toString() && Car.decelerate() w/Tests

.gitignore

@@ -1,2 +1,2 @@
-bin/*.class
-.DS_Store
+ 
+/bin/

src/Car.java

@@ -44,13 +44,16 @@ public void accelerate(int amount){
 		}
 	}
 
+	public void decelerate(int amount) {
+		speed -= speed-amount < 0 ? speed : amount;
+	}
+
 	/**
 	 * Displays the object as a string in the format
 	 * "Color: red, Speed: 100"
 	 * @return string representation of object. 
 	 */
 	public String toString(){
-		// not implemented!
-		return("");
+		return("Color: " + color + ", Speed: " + speed);
 	}
 }

test/CarTest.java

@@ -32,7 +32,19 @@ public void canDoToString(){
 	}
 
 	// Create and pass test for deceleration.
+	@Test
+	public void canDecelerate() {
+		Car car1 = new Car("Red", 100);
+		car1.accelerate(100);
+		car1.decelerate(5);
+		assertThat(car1.getSpeed(), is(95));
+	}
 
 	// Create and pass test for no deceleration below 0.
-
+	@Test
+	public void cannotDeceleratePastZero() {
+		Car car1 = new Car("Red", 100);
+		car1.decelerate(5);
+		assertThat(car1.getSpeed(), is(0));
+	}
 }