@@ -183,12 +183,15 @@ public void testNoName() {
183183 assertEquals ("Name may not be null or empty. ...not that anyone here advocates name calling!" ,
184184 e .getMessage ());
185185 }
186+ }
187+
188+ @ Test
189+ public void testAddSensor () {
190+ Parameters p = NetworkTestHarness .getParameters ().copy ();
191+ p = p .union (NetworkTestHarness .getDayDemoTestEncoderParams ());
192+ p .set (KEY .RANDOM , new UniversalRandom (42 ));
186193
187194 try {
188- p = NetworkTestHarness .getParameters ().copy ();
189- p = p .union (NetworkTestHarness .getDayDemoTestEncoderParams ());
190- p .set (KEY .RANDOM , new UniversalRandom (42 ));
191-
192195 PublisherSupplier supplier = PublisherSupplier .builder ()
193196 .addHeader ("dayOfWeek" )
194197 .addHeader ("int" )
@@ -211,30 +214,6 @@ public void testNoName() {
211214 e .printStackTrace ();
212215 }
213216 }
214-
215- @ Test
216- public void testAddSensor () {
217- Parameters p = NetworkTestHarness .getParameters ().copy ();
218- p = p .union (NetworkTestHarness .getDayDemoTestEncoderParams ());
219- p .set (KEY .RANDOM , new UniversalRandom (42 ));
220-
221- try {
222- new Network ("Name" , p )
223- .add (Network .createRegion ("" )
224- .add (Network .createLayer ("" , p )
225- .add (Sensor .create (
226- FileSensor ::create ,
227- SensorParams .create (
228- Keys ::path , "" , ResourceLocator .path ("rec-center-hourly-small.csv" ))))));
229-
230- fail (); // Fails due to no name...
231- }catch (Exception e ) {
232- e .printStackTrace ();
233- assertEquals (IllegalStateException .class , e .getClass ());
234- assertEquals ("All Networks must have a name. Increases digestion, and overall happiness!" ,
235- e .getMessage ());
236- }
237- }
238217
239218 @ Test
240219 public void testGetAllValues () {
0 commit comments