From 368bcb37b8dc0fc3e32da3a28a7e24c5301e7685 Mon Sep 17 00:00:00 2001
From: David Paquette <david@clearstak.com>
Date: Fri, 17 Apr 2015 15:30:17 -0400
Subject: [PATCH] fixed serializable tests

---
 datastruct.txt                     | Bin 2067 -> 0 bytes
 src/InputOutput/DataStructure.java |   6 +++---
 src/testing/DataStructureTest.java |   3 ++-
 src/testing/DatabaseTest.java      |  17 ++++++++++++-----
 4 files changed, 17 insertions(+), 9 deletions(-)
 delete mode 100644 datastruct.txt

diff --git a/datastruct.txt b/datastruct.txt
deleted file mode 100644
index ab751aebf396d49f116e620f85e9414a2a9d7641..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2067
zcma)7&u<$=6n=5+5IaeoG|)C}64Hva6@pD1h^dt*G-+bh#Z4sQf>0!)$?hbcW`A{d
zw%!y8l>^*B;)IHX_ygdI6sgAoJ@ir`aYS4qaR4MF4jiBo@9o;_4M|ki@@RMFoA14O
z?|pB+{v9%&grSP<`f9~jIBJVbu~j8~UHOtf82I(nr|W<2rXW>?Y`IchT3?>OzNFxI
z^(MQ`CQN2;O(0s>TQgP2I1QUi1;f<@;Y6*@rR8`Ec{fZx6G#}Oy_&Ctsa<7WJ)9rB
zpC3PaZEv>|Qf0`Q4l~M3SB|VeR@Ei<>W*my?(3I<p6*6Bjy?EKDahXNxU3PkcMIN!
z&I6cE1*Z&lTNs+lZuwj(e%aR@+t#?@AH5~REhbE2d`3aH%RH~)NJBxFwL>3hSGdeD
z&^3JTE0m_RLh+JT&<ayifr9+Ju=xM5L;P79j?s`qCeN|>ddnP5_Wp<d6{H`ywz9mA
z|EC@#6&pC-G|*%7MvFc`s$4riM+5_7+&>vVg(>_k90AQJ=rOn_BsUbdTm`AurZHrg
zAi=^|o>Y*wnZ*_KE>cP^cw?(r8MsaNrQ|jyC)`%NbjZ<5CG@xH%KT!n`06`X@j1#B
zA{assN|W?<hK92=3}f}aA(UR{_E`Juv@(k5;xxTs%zKk54JcB_3@l+Ul!m4P^&To`
zEUaYVXv>aT4G$^qP$ez}I(L<D?2B&&@XJRhrc(e|_#-X&%EnEuD-;fAR*W?s>}`Ks
z`upby8;Jy|D=RU=yz3c!{Ex4a2$G-{BOX6_e(v<l@V5sLwYqc~<l2wlPhTiCb{};@
z8WpQE-@{})mymOeL`C-*T%iiCW0A8h#2q60HOQg1_3fHuIwD5b5>%Ml=E9Q6EzB-b
zKI{3eORC{U>@_N=KiWo3VWKKLH50g$h^)dKa!+A{+25IJIO)rlIW3IBL363{i?g#&
z&Xp(}F0~BI*_kj2hi_on?>;|Y{OQ9Kq$}8kgw2<IYlF)wCZFpjqegedMER3%T~+Ab
z6eeHBdTxH_u(Iop5zmm(^p^@w?@xTxYNPZkI2lz#a#ABa)?h;l#iQlP&}JV%R}UG>
z)6kC@G599)P4zY*%YvIm<QxJsdr4qE<cf-vdVGs6^H~x#7+I8tu$kP6EVq#9du=4W
z4YU?I*4hiG<b=~L1Z-j+6PLpNT;eJA-8#+FM?^JeQFz-i(E^zoreOq4`7Uabx0^qn
z8ZOczcG463IH_KmynR$qZ*pdYF^ieQu;ys<Ic!<8!WL>SUYrX_n~Q0@8EmYi^I=xQ
zd+ds1ny6@0y!XNl+j0!CDM)Qp%KzlY3*Y?qNq-7Ds*pBuhIqQMAH4K*f;REc0^EJ{
z?q8!JO^1#LOh~2;L*bxni7R$qO149O1Rwk`a_=Ggq7ynQkoLqK9%=#_X^a{K<kZW-
Ezj5GZZU6uP

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<String, Hashtable<String, Hashtable
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -4390469670958795848L;
-	//private static final long serialVersionUID = 1105146094425728795L;
+	//private static final long serialVersionUID = -4390469670958795848L;
+	private static final long serialVersionUID = 1105146094425728795L;
 	//private Hashtable<String, Hashtable<String, String>> 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<String, String> tempObject;
 		Hashtable<String, Hashtable<String, String>> 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<String, String> 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<String, String> 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");
+        }
 		
 	}