From dcf92b4333dbae4d8734cf7336f9462bda047558 Mon Sep 17 00:00:00 2001 From: Fan-Wu Yang Date: Wed, 5 Apr 2017 13:06:09 +1200 Subject: [PATCH] Added UnitTests for some classes --- src/main/java/controllers/MainController.java | 6 ++--- src/main/java/model/DataManager.java | 4 --- .../java/controllers/MainControllerTest.java | 24 ++++++++++++++++++ src/test/java/model/DataManagerTest.java | 8 ++++++ .../classes/controllers/MainController.class | Bin 1903 -> 1996 bytes target/classes/model/DataManager.class | Bin 1356 -> 1122 bytes .../controllers/MainControllerTest.class | Bin 0 -> 917 bytes .../test-classes/model/DataManagerTest.class | Bin 724 -> 1127 bytes 8 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 src/test/java/controllers/MainControllerTest.java create mode 100644 target/test-classes/controllers/MainControllerTest.class diff --git a/src/main/java/controllers/MainController.java b/src/main/java/controllers/MainController.java index 23cc980..738ac4c 100644 --- a/src/main/java/controllers/MainController.java +++ b/src/main/java/controllers/MainController.java @@ -21,8 +21,8 @@ public class MainController extends Controller{ @FXML PasswordField password; - public boolean validateLogin(){ - if (username.getText().equals(password.getText())){ + public boolean validateLogin(String user, String pass){ + if (user.equals(pass)){ return true; } return false; @@ -30,7 +30,7 @@ public class MainController extends Controller{ public void login() throws Exception { //validate login - if (validateLogin()){ + if (validateLogin(username.getText(), password.getText())){ parent.getSession().setUserCode(username.getText()); changeScene(SceneCode.HOME); }else{ diff --git a/src/main/java/model/DataManager.java b/src/main/java/model/DataManager.java index 7fc4817..addba08 100644 --- a/src/main/java/model/DataManager.java +++ b/src/main/java/model/DataManager.java @@ -21,10 +21,6 @@ public class DataManager { return rides; } - public void setRides(ObservableList rides) { - this.rides = rides; - } - public void addRides(Ride ride){ rides.add(ride); } diff --git a/src/test/java/controllers/MainControllerTest.java b/src/test/java/controllers/MainControllerTest.java new file mode 100644 index 0000000..ea163bb --- /dev/null +++ b/src/test/java/controllers/MainControllerTest.java @@ -0,0 +1,24 @@ +package controllers;/** + * Created by Gondr on 5/04/2017. + */ + +import static org.junit.Assert.*; + +import org.junit.Test; + +public class MainControllerTest { + + @Test + public void testLogin(){ + //Tests if login is behaving properly + MainController controller = new MainController(); + String user1 = "fwy13"; + String pass1 = "fwy13"; + assertTrue(controller.validateLogin(user1, pass1)); + + String user2 = "fwy13"; + String pass2 = "79984862"; + assertTrue(!controller.validateLogin(user2, pass2)); + } + +} \ No newline at end of file diff --git a/src/test/java/model/DataManagerTest.java b/src/test/java/model/DataManagerTest.java index 7235d6f..a53653d 100644 --- a/src/test/java/model/DataManagerTest.java +++ b/src/test/java/model/DataManagerTest.java @@ -13,6 +13,14 @@ public class DataManagerTest { DataManager dataManager = new DataManager(); Ride ride = new Ride("Nissan March", "Blue", "HB9999", 2008, 4); dataManager.addRides(ride); + assertTrue(dataManager.getRides().get(0) == ride); + + dataManager.removeRide(0); + assertTrue(dataManager.getRides().size() == 0); + + dataManager.addRides(ride); + dataManager.removeRide(ride); + assertTrue(dataManager.getRides().size() == 0); } } \ No newline at end of file diff --git a/target/classes/controllers/MainController.class b/target/classes/controllers/MainController.class index 6450b7fe3b8d9ac3efc27f08ca43c57b0ab0d8a9..ba4bd8a0ff7f6f4890a5a45b4dc9acb34c49f490 100644 GIT binary patch delta 533 zcmXYtPfrt36vcmUX4*HMywn7&v5HlJS}4_`RzWL>;vdvnMf?kD9TaPgA%?08Hzp>2 z0P|L?Tx%UV=NGKJRa)-CzuGB-SLa@=be7w7(VmChuI;Fjx@6z0PYq4OaG9oI zD>=;-!&PPt+sSLL8TQg|nB%(UhT$f+G`9_RnAa>A?sCs?pOz*xJYvbda~9plwCx|K zX+O9%Rj}(`&Nkgy`^){Uo_zW2y;g4)aB$@_%t$4|StaGIxoa}J?2?*Iv^+jL2(96HkEZ^g=>OUO^&6=3Dc}^<7$>O(%rZCr zT?u3{7ckG&K*nohtr2jY8v#ugV%+4`cyT*Mi#tAdeHML|#?rFpp633~epGpGvDC9a zR6#wkf7SOD!!)Ng4-JoaY)FvQtZ3SX4o?i{$r_&WO!M5(WmU6gc)?4}E5kZH!)xAX zHVy9>*pV}E-}AxFx*a=ox9nH9Zd2Yr^>Mi8?Wj~22POFu-7o`dm?PuL6l_*b6C@xWvvksTV4EH8Y|w8d4*+b_J8A#` diff --git a/target/classes/model/DataManager.class b/target/classes/model/DataManager.class index 8578b975b024c496822c82b644ad670b8d543bbc..0ad6ffd53c884750349c9d4442b598e1625d574c 100644 GIT binary patch delta 175 zcmX@Z^@v07)W2Q(7#J8#7>u|WI2aVU7?c>4IT_d)RJa*b8Pq_8I*8Cdk#%w?^Nh*CEL!T44BQM- z41z#g#2A=>BoBiSgD{W=u_S>qj6f*OATfCfi}vJN78zEs*km6TsmWZd;*-y_sIf8t H^(g=VMlBf3 delta 336 zcmYjLOG*Pl6s*@1Gf7W_KMX_@jnRymw2nqcU3di-B4M^NYC{46#facJdgC>+aFc}x z5I0`Hh2RA|fcSa>A`R8`imF%dv-Bq8*PqD?fCNVpCA1_$Y?a}o9Uwx-fp)O%W5-84 zjuTQNbALX#HX}mVwlOsuCs9hMoZehz!!)}aWS2wJd%QJ0M+k{Cbw!lg3wo&UD(qoN zp$zGxtFVs)#qBv9+Hd-xqJ0-nMqrlDI)mT`6g&DE-k6z(IYybQRm@-+^E_9kE-YY? zC-%GjAXJ$v{-=s#0dv7A!U}4(?`iwx)q*-!Ss|>kHev0!5K_acg4Qigg#S9!Ux&gv Lnt5s?-?{k0NZ$IAdRAql7SeCDclX?Jp=dgAcbWe zWgQiP8zFp8UP!Aiovzgg zJmqx5=DGBJHlv}BPha#qG zuGh7C1G-_2NE;1z;C1XH6&f&mUDtZZDGLJ`fw{4$zbzoKS8v~KY-Lf!s*bfR)?o>x z9`Ek%Z0|fG;l+P1hg3*ztp0hsXLtTA4Gp303)xqvGO$NRFPE>ocD+(L;r(On2R6;;ltY*u1U;_AW7+ri{k>=mEg@t$vcyP;1_ z${l=vp!Z{-IVDzd{kUf1I_7OGU{T_Rjhnb7v1B8UWg9D4wXueEmCZL_h}R7Pv*gG3 zgC~9@FzKW>%3j@j`qC{{!_Y6rLA4UOo4b);tE(Sw1W~*wFmddVfKFL~A*XO8>4sjV zM5QuCsnA=kmE7`vr4hvLazuH~T3$QZuI>8*hVv->kX+5*tJZzxPjLms8By?xmF}bq zm_RQtSA7};cnicqRxYDpOk_Snd}z0ah#hUR6DOG4Dj!1v!#K%O;1svD_V!Om=;ZdA zkF``I+k&MZqKnV;4$^oJL;nOjtGAF;twVGRy!oe*YoRks==on)dC{S~WMC1KFwu<> z^dQBf%<%{dv~iacTXeZYb2}mZDZ}GOp8onZ;dAXYeUET-6ldstj8g;X_=RbSl*D*m W4ClpYo)5-`I{R5hfpbI+=l=jv?{kR& delta 274 zcmYL@JyOC@6otQ+h0bUu0MBD}RLOh3kOKQn1dB_R(j(rGt40!r@|12Ui z^<&P9g?Y0vgP0+sVrSNKa$Jym9tLSt>zba0Mp&DCW4_AohU#fao^hc*t^{0?XfiZq z_Db`T0AE~Ito(HL?@n|YQdz0GG)R@>lCnyDOtQ4O;#!Ga?Yp6+)V5S^cSq=Wckb;0 D-qaPh