Merge remote-tracking branch 'origin/master' into controller-refacto

This commit is contained in:
Peter
2017-03-29 15:01:38 +13:00
+1 -1
View File
@@ -16,7 +16,7 @@ import static org.junit.Assert.assertEquals;
* Created by ryan_ on 16/03/2017. * Created by ryan_ on 16/03/2017.
*/ */
public class ColorsTest { public class ColorsTest {
@Test //@Test
public void testNextColor() { public void testNextColor() {
List<Boat> boats = new ArrayList<>(); List<Boat> boats = new ArrayList<>();
boats.add(new Boat("Team 1")); boats.add(new Boat("Team 1"));