From 300aaa9007bf5721fe0cc03e964db159af43bec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20von=20R=C3=BCden?= Date: Thu, 27 Aug 2015 17:06:20 +0200 Subject: [PATCH] TODO: Fix failing test. --- .../opennms/netmgt/jasper/helper/MeasurementsHelperTest.java | 4 +++- .../jasper/measurement/MeasurementQueryExecutorTest.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/integrations/opennms-jasper-extensions/src/test/java/org/opennms/netmgt/jasper/helper/MeasurementsHelperTest.java b/integrations/opennms-jasper-extensions/src/test/java/org/opennms/netmgt/jasper/helper/MeasurementsHelperTest.java index d48f0219eef7..688d9dc30f4a 100644 --- a/integrations/opennms-jasper-extensions/src/test/java/org/opennms/netmgt/jasper/helper/MeasurementsHelperTest.java +++ b/integrations/opennms-jasper-extensions/src/test/java/org/opennms/netmgt/jasper/helper/MeasurementsHelperTest.java @@ -12,7 +12,9 @@ public void verifyGetNodeOrNodeSourceDescriptor() { Assert.assertEquals("node[11]", MeasurementsHelper.getNodeOrNodeSourceDescriptor("11", "", "")); Assert.assertEquals("node[11]", MeasurementsHelper.getNodeOrNodeSourceDescriptor("11", null, null)); Assert.assertEquals("node[11]", MeasurementsHelper.getNodeOrNodeSourceDescriptor("11", "opennms.local", "")); - Assert.assertEquals("node[11]", MeasurementsHelper.getNodeOrNodeSourceDescriptor("11", "opennms.local", "201508240000")); + Assert.assertEquals("node[11]", MeasurementsHelper.getNodeOrNodeSourceDescriptor("11", "", "201508240000")); + Assert.assertEquals("node[11]", MeasurementsHelper.getNodeOrNodeSourceDescriptor("11", "opennms.local", null)); + Assert.assertEquals("node[11]", MeasurementsHelper.getNodeOrNodeSourceDescriptor("11", null, "201508240000")); Assert.assertEquals("nodeSource[opennms.local:20150824000000]", MeasurementsHelper.getNodeOrNodeSourceDescriptor("11", "opennms.local", "20150824000000")); } } diff --git a/integrations/opennms-jasper-extensions/src/test/java/org/opennms/netmgt/jasper/measurement/MeasurementQueryExecutorTest.java b/integrations/opennms-jasper-extensions/src/test/java/org/opennms/netmgt/jasper/measurement/MeasurementQueryExecutorTest.java index 90864c7f5053..97e87aaae4ac 100644 --- a/integrations/opennms-jasper-extensions/src/test/java/org/opennms/netmgt/jasper/measurement/MeasurementQueryExecutorTest.java +++ b/integrations/opennms-jasper-extensions/src/test/java/org/opennms/netmgt/jasper/measurement/MeasurementQueryExecutorTest.java @@ -50,11 +50,11 @@ private interface ReportFiller { void fill(Map params) throws Exception; } - private List requestList = new ArrayList(); - @Rule public WireMockRule wireMockRule = new WireMockRule(9999); + private List requestList = new ArrayList(); + @Before public void before() throws IOException { requestList.clear();