Added code to intent unit tests to pre-emptively unbind ID generator to avoid cascading failures.
Change-Id: I2e5aff44a90ceeaaad71d7154b79f20edab620a7
diff --git a/apps/newoptical/src/test/java/org/onosproject/newoptical/OpticalConnectivityTest.java b/apps/newoptical/src/test/java/org/onosproject/newoptical/OpticalConnectivityTest.java
index 4f122e1..7d26dcd 100644
--- a/apps/newoptical/src/test/java/org/onosproject/newoptical/OpticalConnectivityTest.java
+++ b/apps/newoptical/src/test/java/org/onosproject/newoptical/OpticalConnectivityTest.java
@@ -72,6 +72,7 @@
}
};
+ Intent.unbindIdGenerator(idGenerator);
Intent.bindIdGenerator(idGenerator);
}
diff --git a/apps/newoptical/src/test/java/org/onosproject/newoptical/OpticalPathProvisionerTest.java b/apps/newoptical/src/test/java/org/onosproject/newoptical/OpticalPathProvisionerTest.java
index 254df53..78a58b5 100644
--- a/apps/newoptical/src/test/java/org/onosproject/newoptical/OpticalPathProvisionerTest.java
+++ b/apps/newoptical/src/test/java/org/onosproject/newoptical/OpticalPathProvisionerTest.java
@@ -248,6 +248,7 @@
return counter++;
}
};
+ Intent.unbindIdGenerator(idGenerator);
Intent.bindIdGenerator(idGenerator);
}
diff --git a/apps/newoptical/src/test/java/org/onosproject/newoptical/PacketLinkRealizedByOpticalTest.java b/apps/newoptical/src/test/java/org/onosproject/newoptical/PacketLinkRealizedByOpticalTest.java
index 4252edd..610d2bd 100644
--- a/apps/newoptical/src/test/java/org/onosproject/newoptical/PacketLinkRealizedByOpticalTest.java
+++ b/apps/newoptical/src/test/java/org/onosproject/newoptical/PacketLinkRealizedByOpticalTest.java
@@ -54,6 +54,7 @@
}
};
+ Intent.unbindIdGenerator(idGenerator);
Intent.bindIdGenerator(idGenerator);
}
diff --git a/apps/optical-model/src/test/java/org/onosproject/net/optical/intent/impl/compiler/OpticalCircuitIntentCompilerTest.java b/apps/optical-model/src/test/java/org/onosproject/net/optical/intent/impl/compiler/OpticalCircuitIntentCompilerTest.java
index 1c0eceb..1ce3e6c 100644
--- a/apps/optical-model/src/test/java/org/onosproject/net/optical/intent/impl/compiler/OpticalCircuitIntentCompilerTest.java
+++ b/apps/optical-model/src/test/java/org/onosproject/net/optical/intent/impl/compiler/OpticalCircuitIntentCompilerTest.java
@@ -377,6 +377,7 @@
sut.intentService = new TestIntentService();
sut.intentSetMultimap = new MockIntentSetMultimap();
+ Intent.unbindIdGenerator(idGenerator);
Intent.bindIdGenerator(idGenerator);
intentExtensionService = createMock(IntentExtensionService.class);
diff --git a/apps/optical-model/src/test/java/org/onosproject/net/optical/intent/impl/compiler/OpticalOduIntentCompilerTest.java b/apps/optical-model/src/test/java/org/onosproject/net/optical/intent/impl/compiler/OpticalOduIntentCompilerTest.java
index f3d3e43..fd3d0ae 100644
--- a/apps/optical-model/src/test/java/org/onosproject/net/optical/intent/impl/compiler/OpticalOduIntentCompilerTest.java
+++ b/apps/optical-model/src/test/java/org/onosproject/net/optical/intent/impl/compiler/OpticalOduIntentCompilerTest.java
@@ -274,6 +274,7 @@
sut.resourceService = new MockResourceService();
sut.topologyService = new MockTopologyService();
+ Intent.unbindIdGenerator(idGenerator);
Intent.bindIdGenerator(idGenerator);
intentExtensionService = createMock(IntentExtensionService.class);
diff --git a/apps/optical-model/src/test/java/org/onosproject/net/optical/intent/impl/compiler/OpticalPathIntentCompilerTest.java b/apps/optical-model/src/test/java/org/onosproject/net/optical/intent/impl/compiler/OpticalPathIntentCompilerTest.java
index 0c2d25e..66e5c07 100644
--- a/apps/optical-model/src/test/java/org/onosproject/net/optical/intent/impl/compiler/OpticalPathIntentCompilerTest.java
+++ b/apps/optical-model/src/test/java/org/onosproject/net/optical/intent/impl/compiler/OpticalPathIntentCompilerTest.java
@@ -81,6 +81,7 @@
.andReturn(appId);
sut.coreService = coreService;
+ Intent.unbindIdGenerator(idGenerator);
Intent.bindIdGenerator(idGenerator);
intent = OpticalPathIntent.builder()
diff --git a/apps/vpls/src/test/java/org/onosproject/vpls/VplsTest.java b/apps/vpls/src/test/java/org/onosproject/vpls/VplsTest.java
index 3ebc858..6dfcea5 100644
--- a/apps/vpls/src/test/java/org/onosproject/vpls/VplsTest.java
+++ b/apps/vpls/src/test/java/org/onosproject/vpls/VplsTest.java
@@ -245,6 +245,7 @@
@Before
public void setUp() throws Exception {
idGenerator = new TestIdGenerator();
+ Intent.unbindIdGenerator(idGenerator);
Intent.bindIdGenerator(idGenerator);
applicationService = createMock(ApplicationService.class);