diff src/test/java/de/intevation/lada/test/validator/Probe.java @ 539:deb3fec601ed

Use multivalued map for errors and warnings to be able to store more than one error/warning per item.
author Raimund Renkert <raimund.renkert@intevation.de>
date Tue, 24 Feb 2015 14:56:46 +0100
parents bf387959b75e
children 2cff9c6c4a9e
line wrap: on
line diff
--- a/src/test/java/de/intevation/lada/test/validator/Probe.java	Tue Feb 24 10:58:06 2015 +0100
+++ b/src/test/java/de/intevation/lada/test/validator/Probe.java	Tue Feb 24 14:56:46 2015 +0100
@@ -45,7 +45,7 @@
         Violation violation = validator.validate(probe);
         Assert.assertTrue(violation.hasErrors());
         Assert.assertTrue(violation.getErrors().containsKey("hauptprobenNr"));
-        Assert.assertTrue(violation.getErrors().get("hauptprobenNr") == 631);
+        Assert.assertTrue(violation.getErrors().get("hauptprobenNr").contains(631));
         prot.setPassed(true);
     }
 
@@ -61,7 +61,7 @@
         Violation violation = validator.validate(probe);
         Assert.assertTrue(violation.hasErrors());
         Assert.assertTrue(violation.getErrors().containsKey("hauptprobenNr"));
-        Assert.assertTrue(violation.getErrors().get("hauptprobenNr") == 611);
+        Assert.assertTrue(violation.getErrors().get("hauptprobenNr").contains(611));
         prot.setPassed(true);
     }
 
@@ -113,7 +113,7 @@
         Violation violation = validator.validate(probe);
         Assert.assertTrue(violation.hasErrors());
         Assert.assertTrue(violation.getErrors().containsKey("hauptprobenNr"));
-        Assert.assertTrue(violation.getErrors().get("hauptprobenNr") == 611);
+        Assert.assertTrue(violation.getErrors().get("hauptprobenNr").contains(611));
         prot.setPassed(true);
     }
 
@@ -143,7 +143,7 @@
         Violation violation = validator.validate(probe);
         Assert.assertTrue(violation.hasWarnings());
         Assert.assertTrue(violation.getWarnings().containsKey("entnahmeOrt"));
-        Assert.assertTrue(violation.getWarnings().get("entnahmeOrt") == 631);
+        Assert.assertTrue(violation.getWarnings().get("entnahmeOrt").contains(631));
         prot.setPassed(true);
     }
 
@@ -155,6 +155,7 @@
         protocol.add(prot);
         LProbe probe = new LProbe();
         probe.setProbeentnahmeBeginn(new Timestamp(1376287046510l));
+        probe.setProbeentnahmeEnde(new Timestamp(1376287046511l));
         Violation violation = validator.validate(probe);
         if (violation.hasWarnings()) {
             Assert.assertFalse(violation.getWarnings().containsKey("probeentnahmeBegin"));
@@ -172,7 +173,9 @@
         Violation violation = validator.validate(probe);
         Assert.assertTrue(violation.hasWarnings());
         Assert.assertTrue(violation.getWarnings().containsKey("probeentnahmeBegin"));
-        Assert.assertTrue(violation.getWarnings().get("probeentnahmeBegin") == 631);
+        Assert.assertTrue(violation.getWarnings().get("probeentnahmeBegin").contains(631));
+        prot.setPassed(true);
+    }
         prot.setPassed(true);
     }
 }
This site is hosted by Intevation GmbH (Datenschutzerklärung und Impressum | Privacy Policy and Imprint)