From b825790acdcb8d4dff17f304b874c6ea862bc149 Mon Sep 17 00:00:00 2001 From: Joseph Gardner Date: Wed, 19 Apr 2017 17:24:00 +1200 Subject: [PATCH] Moved package to correct spot --- .../seng302/{Controllers => }/Mock/Regatta.java | 2 +- .../Mock/RegattaXMLReader.java | 3 +-- src/test/java/seng302/Mock/RegattaXMLTest.java | 17 +++++++++++++---- 3 files changed, 15 insertions(+), 7 deletions(-) rename src/main/java/seng302/{Controllers => }/Mock/Regatta.java (98%) rename src/main/java/seng302/{Controllers => }/Mock/RegattaXMLReader.java (97%) diff --git a/src/main/java/seng302/Controllers/Mock/Regatta.java b/src/main/java/seng302/Mock/Regatta.java similarity index 98% rename from src/main/java/seng302/Controllers/Mock/Regatta.java rename to src/main/java/seng302/Mock/Regatta.java index 9a9867f0..3b749256 100644 --- a/src/main/java/seng302/Controllers/Mock/Regatta.java +++ b/src/main/java/seng302/Mock/Regatta.java @@ -1,4 +1,4 @@ -package seng302.Controllers.Mock; +package seng302.Mock; /** * Created by jjg64 on 19/04/17. diff --git a/src/main/java/seng302/Controllers/Mock/RegattaXMLReader.java b/src/main/java/seng302/Mock/RegattaXMLReader.java similarity index 97% rename from src/main/java/seng302/Controllers/Mock/RegattaXMLReader.java rename to src/main/java/seng302/Mock/RegattaXMLReader.java index 4a361128..6291825f 100644 --- a/src/main/java/seng302/Controllers/Mock/RegattaXMLReader.java +++ b/src/main/java/seng302/Mock/RegattaXMLReader.java @@ -1,7 +1,6 @@ -package seng302.Controllers.Mock; +package seng302.Mock; import org.w3c.dom.Element; -import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; import seng302.XMLReader; diff --git a/src/test/java/seng302/Mock/RegattaXMLTest.java b/src/test/java/seng302/Mock/RegattaXMLTest.java index d630c514..dd09c362 100644 --- a/src/test/java/seng302/Mock/RegattaXMLTest.java +++ b/src/test/java/seng302/Mock/RegattaXMLTest.java @@ -1,15 +1,24 @@ package seng302.Mock; +import org.junit.Before; import org.junit.Test; -import org.xml.sax.SAXException; -import seng302.Controllers.Mock.RegattaXMLReader; +import seng302.RaceXMLReader; -import javax.xml.parsers.ParserConfigurationException; -import java.io.IOException; +import static org.junit.Assert.fail; /** * Created by jjg64 on 19/04/17. */ public class RegattaXMLTest { RegattaXMLReader regattaXMLReader; + + @Before + public void canFindFile(){ + try { + regattaXMLReader = new RegattaXMLReader("mockXML/regattaXML/regattaTest.xml", false); + } catch (Exception e) { + fail("Cannot find mockXML/regattaXML/regattaTest.xml in the resources folder"); + } + } + }