Author: chatellier Date: 2009-09-02 14:02:38 +0000 (Wed, 02 Sep 2009) New Revision: 2577 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java Log: Improve test on rules Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java 2009-09-02 13:47:36 UTC (rev 2576) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java 2009-09-02 14:02:38 UTC (rev 2577) @@ -204,7 +204,7 @@ info.addRuleInitTime("rule1", 30); info.addRuleInitTime("rule2", 8); info.addRuleInitTime("rule3", 321); - info.addRuleInitTime("rule4", 321); + info.addRuleInitTime("rule4", 123); // time must be added info.addRulePreTime("rule1", 20); @@ -212,8 +212,8 @@ info.addRulePreTime("rule1", 20); info.addRulePostTime("rule1", 25); - info.addRulePreTime("rule2", 20); - info.addRulePostTime("rule2", 25); + info.addRulePreTime("rule2", 18); + info.addRulePostTime("rule2", 500); info.addRulePreTime("rule3", 20); // no additional time for rule 4 @@ -222,10 +222,24 @@ SimulationInformation testInfo = new SimulationInformation(file); Assert.assertFalse(testInfo.hasError()); - //Assert.assertEquals(30, testInfo.getExportTime("export1")); - //Assert.assertEquals(40, testInfo.getExportTime("export2")); - //Assert.assertEquals(50, testInfo.getExportTime("export3")); - //Assert.assertEquals(60, testInfo.getExportTime("export4")); - //Assert.assertTrue(testInfo.toString().indexOf("export1") > 0); + Assert.assertEquals(30, testInfo.getRuleInitTime("rule1")); + Assert.assertEquals(8, testInfo.getRuleInitTime("rule2")); + Assert.assertEquals(321, testInfo.getRuleInitTime("rule3")); + Assert.assertEquals(123, testInfo.getRuleInitTime("rule4")); + + Assert.assertEquals(20 + 20, testInfo.getRulePreTime("rule1")); + Assert.assertEquals(25 + 25, testInfo.getRulePostTime("rule1")); + + Assert.assertEquals(18, testInfo.getRulePreTime("rule2")); + Assert.assertEquals(500, testInfo.getRulePostTime("rule2")); + + Assert.assertEquals(20, testInfo.getRulePreTime("rule3")); + Assert.assertEquals(0, testInfo.getRulePostTime("rule3")); + + Assert.assertEquals(0, testInfo.getRulePreTime("rule4")); + Assert.assertEquals(0, testInfo.getRulePostTime("rule4")); + + // total time present rule2 + Assert.assertTrue(testInfo.toString().indexOf("rule2 : 0.526") > 0); } }