diff --git a/datastruct.txt b/datastruct.txt deleted file mode 100644 index ab751ae..0000000 Binary files a/datastruct.txt and /dev/null differ diff --git a/src/InputOutput/DataStructure.java b/src/InputOutput/DataStructure.java index fae0fc7..e839137 100644 --- a/src/InputOutput/DataStructure.java +++ b/src/InputOutput/DataStructure.java @@ -16,8 +16,8 @@ public class DataStructure extends Hashtable> internalStructure; private final String FILE_NAME = "datastruct.txt"; private Thermostatable owner; @@ -35,7 +35,7 @@ public void updateTable(String tableName, String key, String subKey, String valu String query = "Inserting Value: "+value + " FOR KEY: "+subKey+" FOR Object: "+key+" INTO: "+tableName; - System.out.println(query); + // System.out.println(query); Hashtable tempObject; Hashtable> tempTable; diff --git a/src/testing/DataStructureTest.java b/src/testing/DataStructureTest.java index d791431..2cb7b55 100644 --- a/src/testing/DataStructureTest.java +++ b/src/testing/DataStructureTest.java @@ -1,9 +1,10 @@ package testing; +import java.io.Serializable; import java.util.Hashtable; import InputOutput.*; -public class DataStructureTest implements Thermostatable{ +public class DataStructureTest implements Thermostatable, Serializable{ public DataStructureTest(){ DataStructure struct = new DataStructure(this); diff --git a/src/testing/DatabaseTest.java b/src/testing/DatabaseTest.java index 77794a5..faa7066 100644 --- a/src/testing/DatabaseTest.java +++ b/src/testing/DatabaseTest.java @@ -1,4 +1,5 @@ package testing; +import java.io.Serializable; import java.util.Hashtable; import InputOutput.*; @@ -10,17 +11,23 @@ import org.junit.runners.JUnit4; -public class DatabaseTest implements Thermostatable{ +public class DatabaseTest implements Thermostatable, Serializable{ /** * @param args */ public DatabaseTest(){ Database testbase =new Database(this); - 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"); + + testbase.createUser("herp@derp.com", "herpderp", "123456789.0"); + Hashtable testuser = testbase.getUserFromEmail("herp@derp.com"); + + if(testuser.get("email").equals("herp@derp.com")){ + System.out.println("email pass"); + } + if(testuser.get("ipaddress").equals("123456789.0")){ + System.out.println("ip pass"); + } }