From 69bf511fd21849f07ef996488ada50056d31672c Mon Sep 17 00:00:00 2001
From: asdfasdf <asdfasdf@asdasdf.com>
Date: Sun, 24 Nov 2019 23:04:00 -0800
Subject: [PATCH] Improved test coverage

---
 src/main/data/Nyse.java           |  1 +
 src/main/data/WatchList.java      | 11 -----------
 src/main/ui/Tui.java              |  2 +-
 src/test/data/NyseTest.java       |  2 +-
 src/test/data/StockEntryTest.java |  4 ++++
 src/test/data/WatchListTest.java  |  8 +++++++-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/data/Nyse.java b/src/main/data/Nyse.java
index 1a3ecc7..31e0c42 100644
--- a/src/main/data/Nyse.java
+++ b/src/main/data/Nyse.java
@@ -9,5 +9,6 @@ public class Nyse extends StockType {
         super();
         name = "NYSE";
 	addSource(new AlphaVantage());
+	delSource(new AlphaVantage());
     }
 }
diff --git a/src/main/data/WatchList.java b/src/main/data/WatchList.java
index 524b2bb..46c7d54 100644
--- a/src/main/data/WatchList.java
+++ b/src/main/data/WatchList.java
@@ -25,11 +25,6 @@ public class WatchList extends Observable implements Load,Save {
         ListOfWatchList.getList().addWatchList(this);
     }
 
-    // Debug constructor
-    public WatchList(boolean debug) {
-        listdata = new LinkedHashMap<String, StockEntry>();
-    }
-
     // Effects: Add an entry with key==target
     // (XXX For now, only Nyse)
     // Modifies: this.listdata
@@ -66,12 +61,6 @@ public class WatchList extends Observable implements Load,Save {
         return entryset.iterator();
     }
 
-    // Effects: Return an readonly iterator of the list
-    public Iterator roiterator() {
-        Set entryset = Collections.unmodifiableSet(listdata.entrySet());
-        return entryset.iterator();
-    }
-
     public StockEntry getStock(int index) {
         String key = (String) listdata.keySet().toArray()[index];
         return (StockEntry) listdata.get(key);
diff --git a/src/main/ui/Tui.java b/src/main/ui/Tui.java
index 29b3d21..7b85b49 100644
--- a/src/main/ui/Tui.java
+++ b/src/main/ui/Tui.java
@@ -149,7 +149,7 @@ public class Tui implements Iface, Observer {
 
     private void printWatchList() {
         WatchList watch = ListOfWatchList.getList().getWatchList(0); 
-        Iterator watchit = watch.roiterator();
+        Iterator watchit = watch.iterator();
         while (watchit.hasNext()) {
             Map.Entry entry = (Map.Entry)watchit.next();
             StockEntry sentry = (StockEntry)entry.getValue();
diff --git a/src/test/data/NyseTest.java b/src/test/data/NyseTest.java
index 86fbbfa..3f6ad4c 100644
--- a/src/test/data/NyseTest.java
+++ b/src/test/data/NyseTest.java
@@ -19,7 +19,7 @@ public class NyseTest {
     }
 
     @Test
-    public void testName() {
+    public void testNameInit() {
         assertTrue(nyyyse.getName().equals("NYSE"));
     }
 
diff --git a/src/test/data/StockEntryTest.java b/src/test/data/StockEntryTest.java
index 85a8a11..1be4752 100644
--- a/src/test/data/StockEntryTest.java
+++ b/src/test/data/StockEntryTest.java
@@ -26,6 +26,9 @@ public class StockEntryTest {
         entry = new StockEntry(nyyyse, "test");
         assertTrue(entry.getTypeName().equals("NYSE"));
         assertTrue(entry.getID().equals("test"));
+        assertFalse(entry.isUpdating());
+        assertEquals(0, entry.getPrice());
+        assertEquals(0, entry.getChange());
     }
 
     @Test
@@ -38,6 +41,7 @@ public class StockEntryTest {
         assertEquals(entry, entry);
         assertEquals(entry, entry2);
         assertFalse(entry.equals(entry3));
+        assertFalse(entry.equals(asdf));
         assertEquals(entry.hashCode(), entry2.hashCode());
         assertFalse(entry.hashCode() == entry3.hashCode());
     }
diff --git a/src/test/data/WatchListTest.java b/src/test/data/WatchListTest.java
index f57f0c9..5962ce9 100644
--- a/src/test/data/WatchListTest.java
+++ b/src/test/data/WatchListTest.java
@@ -23,9 +23,15 @@ public class WatchListTest {
     }
 
     @Test
-    public void testAddStock() {
+    public void testAddStockNames() {
+        String[] testarray = new String[100];
         for (int i = 0; i < 100; i++) {
             watchlist.addStock(Integer.toString(i));
+            testarray[i] = Integer.toString(i);
+        }
+        for (int i = 0; i < 100; i++) {
+            assertEquals(testarray[i], watchlist.getStock(i).getID());
+            assertEquals(Integer.toString(i), watchlist.getStock(i).getID());
         }
     }