Re-refactored Event class

#story[881]
This commit is contained in:
Erika Savell
2017-05-10 23:54:29 +12:00
parent e7f84eaf83
commit a35d9cbc5a
5 changed files with 15 additions and 264 deletions
@@ -1,87 +0,0 @@
//package seng302.Data;
//
//
//import org.junit.Before;
//import org.junit.Test;
//import org.xml.sax.SAXException;
//import seng302.DataInput.RaceDataSource;
//import seng302.DataInput.RaceXMLReader;
//
//import javax.xml.parsers.ParserConfigurationException;
//import java.io.IOException;
//
//import static junit.framework.TestCase.assertTrue;
//
///**
// * Created by esa46 on 25/04/17.
// */
//public class BoatDataTest {
//
//
// private static final String ROOT_TAG = "BoatConfig";
// private static final String[] REQUIRED_TAGS = new String[]{
// "Boats", "GPSposition"
// };
// private static final String[] REQUIRED_ATTRIBUTES = new String[]{
// "SourceID", "ShapeID", "HullNum", "StoweName",
// "ShortName", "BoatName"
// };
//
// String result;
// RaceDataSource raceDataSource;
//
// @Before
// public void initReader() {
// try {
// raceDataSource = new RaceXMLReader("raceXML/bermuda_AC35.xml");
// BoatData boatData = new BoatData(raceDataSource.getBoats());
// result = boatData.createXML();
//
//
// } catch (IOException e) {
// e.printStackTrace();
// } catch (SAXException e) {
// e.printStackTrace();
// } catch (ParserConfigurationException e) {
// e.printStackTrace();
// }
// }
//
// @Test
// public void xmlHasAllNecessaryTags() {
//
// assertTrue(result.contains("<" + ROOT_TAG + ">"));
// for (String tag : REQUIRED_TAGS) {
// assertTrue(result.contains("<" + tag + ">") || result.contains("<" + tag + " "));
// }
// }
//
// @Test
// public void xmlHasAllNecessaryAttributes() {
//
// for (String attribute : REQUIRED_ATTRIBUTES) {
// assertTrue(result.contains(attribute + "="));
// }
// }
//
// @Test
// public void allTagsAreTerminated() {
//
// for (String tag : REQUIRED_TAGS) {
// int lastIndex = 0;
// String openTag = "<" + tag + ">";
// String closeTag = "</" + tag + ">";
// while (lastIndex < result.length() && lastIndex > 0) {
// lastIndex = result.indexOf(openTag, lastIndex);
// if (lastIndex > 0) {
//
// lastIndex = result.indexOf(closeTag, lastIndex);
// assertTrue(lastIndex > 0);
// }
// }
// }
// }
//
//
//
//}
@@ -1,83 +0,0 @@
//package seng302.Data;
//
//import org.junit.Before;
//import org.junit.Test;
//import org.xml.sax.SAXException;
//import seng302.DataInput.RaceDataSource;
//import seng302.DataInput.RaceXMLReader;
//
//import javax.xml.parsers.ParserConfigurationException;
//import java.io.IOException;
//
//import static junit.framework.TestCase.assertTrue;
//
///**
// * Created by esa46 on 25/04/17.
// */
//public class RaceDataTest {
//
// private static final String ROOT_TAG = "Race";
// private static final String[] REQUIRED_TAGS = new String[]{
// "RaceID", "RaceType", "CreationTimeDate", "RaceStartTime", "Participants", "Yacht",
// "CompoundMarkSequence", "Course", "CompoundMark", "Mark", "CourseLimit", "Limit"
// };
// String result;
// RaceDataSource raceDataSource;
//
// @Before
// public void initReader() {
// try {
// raceDataSource = new RaceXMLReader("raceXML/bermuda_AC35.xml");
// RaceData raceData = new RaceData(raceDataSource);
// result = raceData.createXML();
//
//
// } catch (IOException e) {
// e.printStackTrace();
// } catch (SAXException e) {
// e.printStackTrace();
// } catch (ParserConfigurationException e) {
// e.printStackTrace();
// }
// }
//
// @Test
// public void xmlHasAllNecessaryFields() {
//
// assertTrue(result.contains("<" + ROOT_TAG + ">"));
// for (String tag : REQUIRED_TAGS) {
// System.out.println(tag);
// assertTrue(result.contains("<" + tag + ">") || result.contains("<" + tag + " "));
// }
// }
//
// @Test
// public void allTagsAreTerminated() {
//
// for (String tag : REQUIRED_TAGS) {
// int lastIndex = 0;
// String openTag = "<" + tag + ">";
// String closeTag = "</" + tag + ">";
// while (lastIndex < result.length() && lastIndex > 0) {
// lastIndex = result.indexOf(openTag, lastIndex);
// if (lastIndex > 0) {
//
// lastIndex = result.indexOf(closeTag, lastIndex);
// assertTrue(lastIndex > 0);
// }
// }
// }
// }
//
//
// @Test
// public void idAndTypeAreEquivalent() {
// String newId = result.substring(result.indexOf("<RaceID>") + 8, result.indexOf("</RaceID>"));
// String newRaceType = result.substring(result.indexOf("<RaceType>") + 10, result.indexOf("</RaceType>"));
//
// assertTrue(raceDataSource.getRaceId() == Integer.parseInt(newId));
// assertTrue(raceDataSource.getRaceType().equals(newRaceType));
// }
//
//
//}
@@ -1,73 +0,0 @@
package seng302.Data;
import org.junit.Before;
import org.junit.Test;
import org.xml.sax.SAXException;
import seng302.DataInput.RaceDataSource;
import seng302.DataInput.RegattaDataSource;
import seng302.DataInput.RegattaXMLReader;
import javax.xml.parsers.ParserConfigurationException;
import java.io.IOException;
import static junit.framework.TestCase.assertTrue;
/**
* Created by esa46 on 25/04/17.
*/
public class RegattaDataTest {
private static final String ROOT_TAG = "RegattaConfig";
private static final String[] REQUIRED_TAGS = new String[]{
"RegattaID", "RegattaName", "CourseName", "CentralLatitude", "CentralLongitude",
"CentralAltitude", "UtcOffset", "MagneticVariation"
};
String result;
RegattaDataSource regattaDataSource;
@Before
public void initReader() {
try {
regattaDataSource = new RegattaXMLReader("mockXML/regattaTest.xml");
RegattaData regattaData = new RegattaData(regattaDataSource);
result = regattaData.createXML();
} catch (IOException e) {
e.printStackTrace();
} catch (SAXException e) {
e.printStackTrace();
} catch (ParserConfigurationException e) {
e.printStackTrace();
}
}
@Test
public void xmlHasAllNecessaryFields() {
assertTrue(result.contains("<" + ROOT_TAG + ">"));
for (String tag : REQUIRED_TAGS) {
System.out.println(tag);
assertTrue(result.contains("<" + tag + ">") || result.contains("<" + tag + " "));
}
}
@Test
public void allTagsAreTerminated() {
for (String tag : REQUIRED_TAGS) {
int lastIndex = 0;
String openTag = "<" + tag + ">";
String closeTag = "</" + tag + ">";
while (lastIndex < result.length() && lastIndex > 0) {
lastIndex = result.indexOf(openTag, lastIndex);
if (lastIndex > 0) {
lastIndex = result.indexOf(closeTag, lastIndex);
assertTrue(lastIndex > 0);
}
}
}
}
}