Ghost User · 28d7ccfa · 9c721032 · da38101f · 4b0cfd8b · 26121605
--- a/src/test/DatabaseApplicationTest.java
+++ b/src/test/DatabaseApplicationTest.java
+        this.clock.setTime(TIME_IN_DISTANT_FUTURE);
+        this.hostAttachedToApp.setLocation(new Coord(1, 1));
+        DisasterData[] usefulData = new DisasterData[ITEMS_PER_MESSAGE];
+        DisasterData[] uselessData = new DisasterData[ITEMS_PER_MESSAGE];
+        for (int i = 0; i < ITEMS_PER_MESSAGE; i++) {
+            usefulData[i] =
+                    DatabaseApplicationTest.createUsefulData(DisasterData.DataType.SKILL, this.hostAttachedToApp);
+            uselessData[i] = new DisasterData(DisasterData.DataType.RESOURCE, 0, SimClock.getTime(), new Coord(0, 0));
+            DisasterDataNotifier.dataCreated(this.hostAttachedToApp, usefulData[i]);
+            DisasterDataNotifier.dataCreated(this.hostAttachedToApp, uselessData[i]);
+        }
+
+        // Create messages.
+        List<DataMessage> messages = floodingApp.wrapRecentUsefulDataIntoMessages(this.hostAttachedToApp, 1);
+        TestCase.assertEquals(UNEXPECTED_NUMBER_DATA_MESSAGES, TWO_DATA_MESSAGES, messages.size());
+        TestCase.assertTrue("Expected all useful data in one message.",
--- a/src/test/DisasterRouterTest.java
+++ b/src/test/DisasterRouterTest.java
+    }
+
+    public void testConstructorThrowsForPowerThresholdAbove1() {
+        try {
+            this.ts.setNameSpace(DisasterRouter.DISASTER_ROUTER_NS);
+            this.ts.putSetting(DisasterRouter.POWER_THRESHOLD, Double.toString(VALUE_ABOVE_ONE));
+            this.ts.restoreNameSpace();
+
+            new DisasterRouter(this.ts);
+            fail();
+        } catch (SettingsError e) {
+            Assert.assertEquals("Expected different error.",
+                    "Power threshold should be in [0, 1], but is " + VALUE_ABOVE_ONE + "!", e.getMessage());
+        }
+    }
+