From 8a42ff5cc42262bf7f19fc72a796d4fff9ffcaeb Mon Sep 17 00:00:00 2001 From: Jon Huang Date: Fri, 17 Apr 2015 15:02:21 -0400 Subject: [PATCH] time to test --- datastruct.txt | Bin 790 -> 2228 bytes src/InputOutput/Database.java | 4 +- src/testing/DataStructureTest.java | 66 ++++++++++++++++++++++++-- src/testing/DatabaseTest.java | 73 +++++++++++++++++++++++++++-- 4 files changed, 133 insertions(+), 10 deletions(-) diff --git a/datastruct.txt b/datastruct.txt index 6f29230f3e7ff92f9f1255e03e77266d3d3e8f22..de80668cfaaeadbf3161c07d4f45cdd5b9acbcbb 100644 GIT binary patch literal 2228 zcma)7-%lJ>6h17wWLZiV1S_S`VihoI2A0a&4WvQ~n{M5L2}>J8BDu_5*jwgT@7!UB znrKa`KIyBeiSZAxuO>}=^jBhEjERrN7m~hc;+qfJ#B*lY*=d2)+3d~Cz2E)Lx#yhk z+&llre{JE;`{NH! zr65&>&T^%?xV|)hby2}H)f;SwO_%WE)u= zyYQb<(7EbyStD-mCcFpf1DJLN0|wg>hUT)HK39s*`MP7<8aMo-w`91*gh`B91zDGQ zUc-@wf(~n!KG3dknPH%7_}*P8O=*SVd99!orltY~`FUaS|6zytb2Q{>=t3sXvG{t^ z98GpVL4OYEd#@}nt>gcx2T8>S`t}WU*}T!D50EO?%FhwOz!>*T#!q1ie;1E{W)yT8 z+!K-;id(LN)a%nYrTbEH8v`Fs70+W7F=v8>;T=$rwwc8h99y6)je8?2SS*Jey;MSf z_g$G^C>CFP`!YU9xk3bk=s{_c-iGk4I8AS-X*f&68LZ#%ByLe9E(SVxm2m8rt_AS$qZ8AS(1x4v<&7I$ zS126LtQc#2ySM#G>7U;tY$Ot-t}Mq0^R{R3(Z9Y*B1nQ-jQIJ{nG1t6L*E@h)aue{ zkZZsGFg;#s+<(vxX;iGvd=Df4Y(ma45*6KTaD^(kibc-05O;{|*C2=5*0*bt>4-SJ zmY~8s?k_Bw+`>T2I%M_V_~c4!DJYGlli8)PRO$0rV%-Zz|39}m=C$4`lK76NtgL7iRz0i zN<-L8?naiI$n@P7lHPio3vFwy1r&P1=_UfOXC8gQ;3>!>j7N0g?4Ld&syPe7+m4Cm z$kY%G!)VHPQI5RT_wm$lCy5vlwouq(#4R4vUl*z#f5gN)$!&S8O}uw_SvuBZ=0nR( z^BuFqej%pFVVx!}y|`AfchmXk&JB-7md4^;ee{W2dz%<4?L%;@A&!Puuvy~0WMeUp zg@qN~qL&=g#D0SP#(Qzqwj4uj3eq|W>EHZl;p;y>?MXpf71Aco5Kk7b;a8td&>}v0 z5pF+t=kL=YO`ERZL_)AF7|Ir1OI+~tQnFq0BlzH#;k!SwFWRB40%;Gk63P-9X-pgh Id&Q_7#Jt|D^8rAz{oW5hmi@By#oUXaFlZZ zNp2u!E@9v(NGvWc&o4?TVPMOx1aV3jSW|NoGjj?V>KNE2$1$3iW6=nb getUserFromEmail(String email) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Hashtable getDeviceFromSerial(String serialnumber) { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getCurrentTempFromSerialNumber(String serialnumber) { + // TODO Auto-generated method stub + return null; + } + + @Override + public void setCurrentTempForSerialNumber(String serialNumber, + String currtemp) { + // TODO Auto-generated method stub + + } + + @Override + public void setDesiredTempForSerialNumber(String serialnumber, + String desiredtemp) { + // TODO Auto-generated method stub + + } + + @Override + public String getDevicesFromEmail(String email) { + // TODO Auto-generated method stub + return null; + } + + @Override + public void datastructureLogEvent(String query) { + // TODO Auto-generated method stub + + } } diff --git a/src/testing/DatabaseTest.java b/src/testing/DatabaseTest.java index 1502eab..23b828e 100644 --- a/src/testing/DatabaseTest.java +++ b/src/testing/DatabaseTest.java @@ -1,4 +1,6 @@ package testing; +import java.util.Hashtable; + import InputOutput.*; import static org.junit.Assert.assertEquals; @@ -8,17 +10,80 @@ import org.junit.runners.JUnit4; -public class DatabaseTest { +public class DatabaseTest implements Thermostatable{ /** * @param args */ - public static void main(String[] args) { - Database testbase =new Database(); - testbase.set + public DatabaseTest(){ + Database testbase =new Database(this); + assert(testbase.createUser("herp@derp.com", "herpderp", "123456789.0", "herp@derp.com")== true); + Hashtable testuser = testbase.getUserFromEmail("herp@derp.com"); + assert(testuser.get("email")=="herp@derp.com"); + assert(testuser.get("ip")=="123456789.0"); + } + + @Override + public boolean createUser(String username, String password, String ip, + String email) { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean createThermostat(String serial, String name, + String desiredTemp) { + // TODO Auto-generated method stub + return false; + } + + @Override + public Hashtable getUserFromEmail(String email) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Hashtable getDeviceFromSerial(String serialnumber) { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getCurrentTempFromSerialNumber(String serialnumber) { + // TODO Auto-generated method stub + return null; + } + + @Override + public void setCurrentTempForSerialNumber(String serialNumber, + String currtemp) { + // TODO Auto-generated method stub + + } + + @Override + public void setDesiredTempForSerialNumber(String serialnumber, + String desiredtemp) { + // TODO Auto-generated method stub + } + @Override + public String getDevicesFromEmail(String email) { + // TODO Auto-generated method stub + return null; } + @Override + public void datastructureLogEvent(String query) { + // TODO Auto-generated method stub + + } + public static void main(String[] args) { + new DatabaseTest(); + + } + }