fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/sprint4_master' into story31.2_alternateTack

Browse Source 
# Conflicts:
#	visualiser/src/main/java/seng302/Mock/StreamedRace.java
#	visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
Resolved.
This commit is contained in:
fjc40
2017-05-22 14:26:45 +12:00
parent de0abf94e0 1234cbbb1f
commit c8157f3476
6 changed files with 228 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mock/src/test/java/seng302/DataInput/BoatXMLReaderTest.java
+2 -1
View File
@@ -12,7 +12,8 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import static org.testng.Assert.*;
import static org.junit.Assert.assertEquals;
//import static org.testng.Assert.*;
/**
* Created by cbt24 on 10/05/17.
mock/src/test/java/seng302/Model/CompoundMarkTest.java
+2 -1
View File
@@ -3,8 +3,9 @@ package seng302.Model;
import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.testng.AssertJUnit.assertEquals;
//import static org.testng.AssertJUnit.assertEquals;
/**
* Created by esa46 on 29/03/17.