From ef3a3fc240cb492a80c05628efecdc29bd5f0374 Mon Sep 17 00:00:00 2001 From: YaFedImYaEatIm Date: Mon, 19 Sep 2016 02:16:20 +1200 Subject: [PATCH] Added Testables to AppTest --- res/userdb.db | Bin 4371456 -> 4388864 bytes .../java/seng202/group9/Controller/App.java | 74 +++++------------- .../seng202/group9/Controller/Dataset.java | 5 ++ src/test/java/seng202/group9/AppTest.java | 50 ++++++------ 4 files changed, 48 insertions(+), 81 deletions(-) diff --git a/res/userdb.db b/res/userdb.db index 470fc21862e3ed6187ce9be5c48850485d115bba..2176ae1855014bfbad994c9e7a1626208371f0f8 100644 GIT binary patch delta 2950 zcmd7U?@t?b90&04k8%u|+PXrK z=X<(iF*O?N?g@4VVu7d{lPD+l#Be-uFkYFx#U|mKeEsjY_}x~)DK(imm!#adb;8&0 z9{1BRJ8z?gGnpiAmvS?i`S(QN=Lr8TRVjbRnVo8V)D%B?Uwz^HrQ-92@2x9A1^mmPoo*PN@_YNjT`iv(i z8X@24h^T>>>WT$UKc~6|?s>t$s||v3F`8ZWGdqu-7#&Z_E z1{_RK0Ro6{A4pIMRj?1tP!0P*1`FH|HDHBWuz><~V220b06Yi|s0Sywzzq%HfktS8 zhu|O_f@U}j55o~S3di6Pcoe+w7#s&5v_LDgfgeu5lNH2s>M}`Ew zD~YMNnbPP-nFeGu@&YWuBBbCNd=6>24mUxMhgdF0?Wns)O-A!S~FWDjQR=n z^DFqAB%hLAl5~G*@mD$>;@%bWjK?8vD`unG-Rca(x;mQg8~J(}HLGp3)?b=^!!0V& zD0?qlM!#e$(QxKMOXZ4nxs2(vmuR!TYuef72JNL5kBA*zoeE|9rbH~{TLO)Hudcxm zeQ(KJS!r;lQBYn}85tdaW%$kb-tpZmROXONQ1-Smcl(|y>`!~~{}_dJ>D6A&drFg9r%Gh!4psDD zT=BGCshrsezrxNlTQ;BdJk~QhpVfM9=jG4k^IIQVl;6qejJc<{!b>Ddc@;j}pxy_^)Ju4 zS3^!WA&%GN-?P>T%}{qk7I^xSdrB8EnxjibS5w|}uC*hy&FP<~>;f7F?3k=(8)nM3 z2;16lzDs;%Zk{sY*A!KoP%VFQJB00YbKjX0?~L*MZoETSryKvq1fKc%-4+}BM2zev zVL#gz$4ABuQau(C2J%+QhWSf*Ew3t?x-J+5W+s>0rrha(2YKFkO7dUQn3MFV;#J*K}6ny)2`+8tR8%H363$d?sa%%-kp#pQ+h^l~aB z%E{_VMXUXvLoiz`D|f4vzr_eFmeguR>J3k>&$@gpMq|zJCYyWs=$6~$&E@FhX)RwU zDeCP~QBw-F>Z+>Lq?%H}-O`O}X{B6|D$1&~|Dyh6CKb=7#B4lqB_+yx9Bl7BS=Prh z*NsJw(R)9KkK$X}qpi0~3h%3|`zJhUrJuFZ6gXgDfIcvS3CzHQ1+35yHW&aqIKT-9 zzy$)h!2@3Kfgc882oAz99D)%LVHCz70Eb~5j=%&2VG@qQ6olXy9EWK*0bw`^GZ2AO ca2ld83uoXgoP+al0WQKE#2~)WN+&Xf-=457X#fBK diff --git a/src/main/java/seng202/group9/Controller/App.java b/src/main/java/seng202/group9/Controller/App.java index c0ae8d6..6d214a6 100644 --- a/src/main/java/seng202/group9/Controller/App.java +++ b/src/main/java/seng202/group9/Controller/App.java @@ -25,9 +25,9 @@ public class App extends Application private ArrayList datasets = new ArrayList(); private Dataset currentDataset = null; private Stage primaryStage = null; - private VBox mainContainer; - private Session session; - private MenuController menuController; + private VBox mainContainer = null; + private Session session = null; + private MenuController menuController = null; public static void main( String[] args ) { @@ -65,60 +65,11 @@ public class App extends Application //testing out dataset try { currentDataset = new Dataset("test's", Dataset.getExisting); + datasets.add(currentDataset); }catch (DataException e){ e.printStackTrace(); } - -/* - AirlineFilter filter = new AirlineFilter(currentDataset.getAirlines()); - filter.filterName("NZ"); - filter.filterAlias("flight"); - filter.printFilter(); - - //testout single route adding - try { - currentDataset.addRoute("D2", "MAC", "WIN", "Y", "0", "NOW"); - }catch (DataException e){ - e.printStackTrace(); - } - //testout single airport adding - try { - currentDataset.addAirport("Windows 10", "PC", "Windows", "WIN", "WIND", "0.0", "0.0", "0.0", "0.0", "U", "PC/Windows"); - }catch (DataException e){ - e.printStackTrace(); - } - //testout single airline adding - try { - currentDataset.addAirline("Dota2", "Valve", "D2", "DOT", "Defence of the Ancients", "Steam", "Y"); - }catch (DataException e){ - e.printStackTrace(); - } - //testing out airport parser - try { - System.out.println(currentDataset.importAirport("res/Samples/Airports.txt")); - } catch (DataException e) { - e.printStackTrace(); - } - //testing out airline parser - try{ - System.out.println(currentDataset.importAirline("res/Samples/Airlines.txt")); - } catch (DataException e){ - e.printStackTrace(); - } - //testing out route parser - try { - System.out.println(currentDataset.importRoute("res/Samples/Routes.txt")); - } catch (DataException e) { - e.printStackTrace(); - } - - //testing out flight parser - try { - System.out.println(currentDataset.importFlight("res/Samples/NZCH-WSSS.csv")); - } catch (DataException e) { - e.printStackTrace(); - }*/ //after all loading then load the previous session try{ FileInputStream fileIn = new FileInputStream("res/session.ser"); @@ -189,8 +140,25 @@ public class App extends Application return currentDataset; } + public void createDataset(String datasetName) throws DataException{ + Dataset newDataset = new Dataset(datasetName, Dataset.createNew); + datasets.add(newDataset); + currentDataset = newDataset; + } + + public ArrayList getDatasets() { + return datasets; + } + public void deleteDataset(Dataset dataset){ dataset.deleteDataset(); datasets.remove(dataset); + if (dataset == currentDataset){ + if (datasets.size() > 0){ + currentDataset = datasets.get(0); + }else{ + currentDataset = null; + } + } } } diff --git a/src/main/java/seng202/group9/Controller/Dataset.java b/src/main/java/seng202/group9/Controller/Dataset.java index 15e22bb..1d87ca0 100644 --- a/src/main/java/seng202/group9/Controller/Dataset.java +++ b/src/main/java/seng202/group9/Controller/Dataset.java @@ -873,6 +873,10 @@ public class Dataset { } } + public String getName() { + return name; + } + public void addAirport(Airport airportToAdd) throws DataException{ if (airportToAdd.getIATA_FFA().length() != 0 && airportToAdd.getIATA_FFA().length() != 3){ throw new DataException("IATA/FFA either empty or 3 letters"); @@ -907,6 +911,7 @@ public class Dataset { ResultSet airportIDRes= stmt.executeQuery(airportIDQuery); int airportID = 0; while (airportIDRes.next()){ + airportID = Integer.parseInt(airportIDRes.getString("seq")); } airportToAdd.setID(airportID); diff --git a/src/test/java/seng202/group9/AppTest.java b/src/test/java/seng202/group9/AppTest.java index c275403..2f2e80f 100644 --- a/src/test/java/seng202/group9/AppTest.java +++ b/src/test/java/seng202/group9/AppTest.java @@ -1,38 +1,32 @@ package seng202.group9; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.Test; +import seng202.group9.Controller.App; +import seng202.group9.Controller.DataException; + +import static org.junit.Assert.*; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } +public class AppTest { + @Test + public void testApp(){ + App app = new App(); + assertTrue(app.getMenuController() == null); + assertTrue(app.getPrimaryStage() == null); + try { + app.createDataset("FORUNITTESTINGDATASET"); + } catch (DataException e) { + e.printStackTrace(); + } + assertEquals(app.getCurrentDataset().getName(), "FORUNITTESTINGDATASET"); - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } + app.deleteDataset(app.getCurrentDataset()); - /** - * Rigourous Test :-) - */ - public void testApp() - { - assertTrue( true ); + for (int i = 0; i < app.getDatasets().size(); i++){ + assertTrue(!app.getDatasets().get(i).getName().equals("FORUNITTESTINGDATASET")); + } + //more to come as the program upgrades for for as of now this is the limit. } }