TODO: Fix failing test.

OpenNMS · Aug 27, 2015 · 300aaa9 · 300aaa9
1 parent 12772f5
commit 300aaa9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...per-extensions/src/test/java/org/opennms/netmgt/jasper/helper/MeasurementsHelperTest.java b/...per-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/...ons/src/test/java/org/opennms/netmgt/jasper/measurement/MeasurementQueryExecutorTest.java b/...ons/src/test/java/org/opennms/netmgt/jasper/measurement/MeasurementQueryExecutorTest.java
@@ -50,11 +50,11 @@ private interface ReportFiller {
         void fill(Map<String, Object> params) throws Exception;
     }
 
-    private List<Request> requestList = new ArrayList<Request>();
-
     @Rule
     public WireMockRule wireMockRule = new WireMockRule(9999);
 
+    private List<Request> requestList = new ArrayList<Request>();
+
     @Before
     public void before() throws IOException {
         requestList.clear();