Revert "Fix statistics race condition on big flows"

[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / impl / registry / meter / DeviceMeterRegistryImplTest.java

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/registry/meter/DeviceMeterRegistryImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/registry/meter/DeviceMeterRegistryImplTest.java
index dbc3e3aedc85c7e3e6cbc568bcd6747cf060a133..08bd755c85c657a9080213fd7ad8aa8d038e2411 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/registry/meter/DeviceMeterRegistryImplTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/registry/meter/DeviceMeterRegistryImplTest.java
@@ -40,29 +40,29 @@ public class DeviceMeterRegistryImplTest {
 
     @Test
     public void testRemoveMarked() throws Exception {
-        deviceMeterRegistry.addMark(meterId);
-        deviceMeterRegistry.processMarks();
+        deviceMeterRegistry.markToBeremoved(meterId);
+        deviceMeterRegistry.removeMarked();
         Assert.assertEquals(0, deviceMeterRegistry.getAllMeterIds().size());
     }
 
     @Test
     public void testRemoveMarkedNegative() throws Exception {
-        deviceMeterRegistry.addMark(meterId2);
-        deviceMeterRegistry.processMarks();
+        deviceMeterRegistry.markToBeremoved(meterId2);
+        deviceMeterRegistry.removeMarked();
         Assert.assertEquals(1, deviceMeterRegistry.getAllMeterIds().size());
     }
 
 
     @Test
     public void testClose() throws Exception {
-        deviceMeterRegistry.addMark(meterId);
+        deviceMeterRegistry.markToBeremoved(meterId);
         deviceMeterRegistry.close();
 
         Assert.assertEquals(0, deviceMeterRegistry.getAllMeterIds().size());
         deviceMeterRegistry.store(meterId);
         Assert.assertEquals(1, deviceMeterRegistry.getAllMeterIds().size());
-        deviceMeterRegistry.processMarks();
+        deviceMeterRegistry.removeMarked();
         Assert.assertEquals(1, deviceMeterRegistry.getAllMeterIds().size());
 
     }
-}
+}
\ No newline at end of file