michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop

Browse Source 
# Conflicts:
#	src/test/java/seng302/models/BoatGroupTest.java
This commit is contained in:
Calum
2017-05-04 14:00:44 +12:00
parent b1a9a7845b
commit 49b8d75aea
2 changed files with 92 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/seng302/models/BoatGroupTest.java
+8 -1
View File
@@ -1,3 +1,10 @@
// TODO: 4/05/17 cir27 - Find out why this test is causing build failures
//package seng302.models;
//
//public class BoatGroupTest {
//
//}
package seng302.models;
import seng302.*;
import javafx.scene.paint.*;
@@ -16,7 +23,7 @@ public class BoatGroupTest {
BoatGroup boatGroup;
@Before
public void setUp () {
Boat b = new Boat("TEST", 0.0, "T" ,0);
Yacht b = new Yacht("TEST", 0.0, "T" ,0);
boatGroup = new BoatGroup(b, Color.BLACK);
}