Update data loading tests

CS2103AUG2016-W11-C2 · Oct 25, 2016 · 1f081df · 1f081df
1 parent 8c6de35
commit 1f081df
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/test/java/seedu/agendum/storage/StorageManagerTest.java b/src/test/java/seedu/agendum/storage/StorageManagerTest.java
@@ -19,6 +19,7 @@
 import seedu.agendum.commons.events.model.ChangeSaveLocationRequestEvent;
 import seedu.agendum.commons.events.model.LoadDataRequestEvent;
 import seedu.agendum.commons.events.model.ToDoListChangedEvent;
+import seedu.agendum.commons.events.storage.DataLoadingExceptionEvent;
 import seedu.agendum.commons.events.storage.DataSavingExceptionEvent;
 import seedu.agendum.commons.exceptions.DataConversionException;
 import seedu.agendum.commons.exceptions.FileDeletionException;
@@ -97,17 +98,20 @@ public void handleSaveLocationChangedEvent_validFilePath() {
 
     @Test
     public void handleLoadDataRequestEvent_validPathToFile_invalidFile() throws IOException, FileDeletionException {
+        EventsCollector eventCollector = new EventsCollector();
         String validPath = "data/testLoad.xml";
         assert !FileUtil.isFileExists(validPath);
 
         // File does not exist
-        //thrown.expect(NoSuchElementException.class);
         storageManager.handleLoadDataRequestEvent(new LoadDataRequestEvent(validPath));
+        DataLoadingExceptionEvent dlee = (DataLoadingExceptionEvent)eventCollector.get(0);
+        assertTrue(dlee.exception instanceof NoSuchElementException);
 
         // File in wrong format
         FileUtil.createFile(new File(validPath));
-        //thrown.expect(DataConversionException.class);
         storageManager.handleLoadDataRequestEvent(new LoadDataRequestEvent(validPath));
+        dlee = (DataLoadingExceptionEvent)eventCollector.get(1);
+        assertTrue(dlee.exception instanceof DataConversionException);
         FileUtil.deleteFile(validPath);
     }