From eaafe5545bace6f381404e1edc8fa58f395746ce Mon Sep 17 00:00:00 2001 From: Jon Huang Date: Fri, 17 Apr 2015 15:19:02 -0400 Subject: [PATCH] Tests...... --- datastruct.txt | Bin 2228 -> 2067 bytes src/InputOutput/DataStructure.java | 4 +++- src/InputOutput/Database.java | 5 +++-- src/InputOutput/Thermostatable.java | 2 +- src/server/server.java | 5 ++--- src/testing/DataStructureTest.java | 3 +-- src/testing/DatabaseTest.java | 11 +++++------ 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/datastruct.txt b/datastruct.txt index de80668cfaaeadbf3161c07d4f45cdd5b9acbcbb..ab751aebf396d49f116e620f85e9414a2a9d7641 100644 GIT binary patch delta 465 zcmZXQPfJ2U6vb!W)2F3|3R+@`xv`8Sf>NU_!i7|;6k5vUoAQM|ZRYxCRqJXc^D$~? zi}tnY3q*^)LDZ&A%Vw-3=)wDOIfrxZaBl;`Z``~gCuic)h`R3suT%ZX$6bH#8teVf zWvq(@9K$ZLgNqq`a|@}@-E~WPv*h@j^9*we2|&iWWm}LRnfV`6m#%nny=aTQFBIx~Jpcdz delta 584 zcmZuvyGjE=6rEYu&5{@sb&-(xh!G4?2%`8zG(r%?Lcv!(#=(rqZsP3S7%U7zz``ob z7ueV+h-l>}*je}uRyKZtGs*@F2j*}u=iGBIb4Ns>Htu?3P_us2V}UEGg4M1F+jRQ zYzn9=PipKa?Iw4CfTF_UM$2sLD>W*D*d4C1V}u#IrHdX#R9iFbF8g z90qc3c20MIdj;?~Jz!95C$18P<%qSvWf3lWRXAPa6+6$|Qd>3fS7j_I_vJPj1i8M- zKl=j|_E(ubAvK~*#@c0lDwVZ8zGhc8|3|m?qf;;;H((Ry$p11XE(0lX7)!`z Bp(OwS diff --git a/src/InputOutput/DataStructure.java b/src/InputOutput/DataStructure.java index bf0738b..fae0fc7 100644 --- a/src/InputOutput/DataStructure.java +++ b/src/InputOutput/DataStructure.java @@ -12,10 +12,12 @@ public class DataStructure extends Hashtable>> implements Serializable { + /** * */ - private static final long serialVersionUID = 1105146094425728795L; + private static final long serialVersionUID = -4390469670958795848L; + //private static final long serialVersionUID = 1105146094425728795L; //private Hashtable> internalStructure; private final String FILE_NAME = "datastruct.txt"; private Thermostatable owner; diff --git a/src/InputOutput/Database.java b/src/InputOutput/Database.java index 361c9d7..ea7c60e 100644 --- a/src/InputOutput/Database.java +++ b/src/InputOutput/Database.java @@ -1,17 +1,18 @@ package InputOutput; +import java.io.Serializable; import java.util.Hashtable; //represents local methods for when the server structure calls this -public class Database extends DataStructure implements Thermostatable{ +public class Database extends DataStructure implements Thermostatable, Serializable{ public Database(Thermostatable owner){ super(owner); } - public boolean createUser(String username, String password, String ip, String email){ + public boolean createUser(String email, String password, String ip){ this.updateTable("UserTable", email, "email", email); this.updateTable("UserTable", email, "password", password); this.updateTable("UserTable", email, "ipaddress", ip); diff --git a/src/InputOutput/Thermostatable.java b/src/InputOutput/Thermostatable.java index b05a795..e4717af 100644 --- a/src/InputOutput/Thermostatable.java +++ b/src/InputOutput/Thermostatable.java @@ -5,7 +5,7 @@ //Methods for calling thermostat information public interface Thermostatable { - public boolean createUser(String username, String password, String ip, String email); + public boolean createUser(String email, String password, String ip); public boolean createThermostat(String serial, String name, String desiredTemp); diff --git a/src/server/server.java b/src/server/server.java index 824c585..8eefb1f 100644 --- a/src/server/server.java +++ b/src/server/server.java @@ -24,7 +24,7 @@ public server() { String ip = "127.0.0.1"; String email = "admin@uconn.edu"; Database dataStorage = new Database(this); - dataStorage.createUser(admin, adminpassword, ip, email); + dataStorage.createUser(email, adminpassword, ip); } public void receiveCurrentTemp() throws Exception { @@ -32,8 +32,7 @@ public void receiveCurrentTemp() throws Exception { } @Override - public boolean createUser(String username, String password, String ip, - String email) { + public boolean createUser(String email, String password, String ip) { // TODO Auto-generated method stub return false; } diff --git a/src/testing/DataStructureTest.java b/src/testing/DataStructureTest.java index 323f602..d791431 100644 --- a/src/testing/DataStructureTest.java +++ b/src/testing/DataStructureTest.java @@ -63,8 +63,7 @@ public static void main(String[] args){ } @Override - public boolean createUser(String username, String password, String ip, - String email) { + public boolean createUser(String email, String password, String ip) { // TODO Auto-generated method stub return false; } diff --git a/src/testing/DatabaseTest.java b/src/testing/DatabaseTest.java index 23b828e..77794a5 100644 --- a/src/testing/DatabaseTest.java +++ b/src/testing/DatabaseTest.java @@ -17,16 +17,15 @@ public class DatabaseTest implements Thermostatable{ */ 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"); + assert(testbase.createUser("herp@derp.com", "herpderp", "123456789.0")== 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) { + public boolean createUser(String email, String password, String ip) { // TODO Auto-generated method stub return false; }