diff --git a/res/userdb.db b/res/userdb.db index a6b3481..efe0b7c 100644 Binary files a/res/userdb.db and b/res/userdb.db differ diff --git a/src/main/java/seng202/group9/Controller/Dataset.java b/src/main/java/seng202/group9/Controller/Dataset.java index 2f21011..364c57b 100644 --- a/src/main/java/seng202/group9/Controller/Dataset.java +++ b/src/main/java/seng202/group9/Controller/Dataset.java @@ -668,7 +668,6 @@ public class Dataset { while(IDResult.next()){ nextID = Integer.parseInt(IDResult.getString("seq")) + 1;//for some reason sqlite3 stores incremental values as a string... } - System.out.println(nextID); stmt.close(); stmt = c.createStatement(); //ADDED @@ -729,7 +728,6 @@ public class Dataset { c.close(); flightPaths.add(flightPathToAdd); - System.out.println(flightPathToAdd.getFlightPoints().get(0).getID()); updateFlightPointInfo(flightPathToAdd); flightPathDictionary.put(flightPathToAdd.getID(), flightPathToAdd); } catch ( Exception e ) { diff --git a/src/test/java/seng202/group9/DatasetTest.java b/src/test/java/seng202/group9/DatasetTest.java index be4403a..6609cc1 100644 --- a/src/test/java/seng202/group9/DatasetTest.java +++ b/src/test/java/seng202/group9/DatasetTest.java @@ -220,6 +220,15 @@ public class DatasetTest { assertEquals(dataset.getFlightPaths().get(0).getFlightPoints().get(5).getName(), flightPoint1.getName()); assertEquals(dataset.getFlightPaths().get(0).getFlightPoints().get(6).getName(), flightPoint.getName()); + //edit order + FlightPoint wasLast = dataset.getFlightPaths().get(0).getFlightPoints().get(dataset.getFlightPaths().get(0).getFlightPoints().size() - 1); + FlightPoint wasSecondToLast = dataset.getFlightPaths().get(0).getFlightPoints().get(dataset.getFlightPaths().get(0).getFlightPoints().size() - 2); + FlightPoint wasFirst = dataset.getFlightPaths().get(0).getFlightPoints().get(0); + dataset.moveFlightPoint(wasLast, 0); + assertTrue(dataset.getFlightPaths().get(0).getFlightPoints().indexOf(wasLast) == 0); + assertTrue(dataset.getFlightPaths().get(0).getFlightPoints().indexOf(wasSecondToLast) == dataset.getFlightPaths().get(0).getFlightPoints().size() - 1); + assertTrue(dataset.getFlightPaths().get(0).getFlightPoints().indexOf(wasFirst) == 1); + app.deleteDataset(app.getCurrentDataset()); }