X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ves-nf-oam-adopter%2Fves-nf-oam-adopter-snmp-manager%2Fsrc%2Ftest%2Fjava%2Forg%2Fo%2Fran%2Foam%2Fnf%2Foam%2Fadopter%2Fsnmp%2Fmanager%2FSnmpManagerTest.java;fp=ves-nf-oam-adopter%2Fves-nf-oam-adopter-snmp-manager%2Fsrc%2Ftest%2Fjava%2Forg%2Fo%2Fran%2Foam%2Fnf%2Foam%2Fadopter%2Fsnmp%2Fmanager%2FSnmpManagerTest.java;h=913c3b65a9cf78e23584d6eb52865c962bcbfae9;hb=0f9b22f340ee994a188627d17031196eef090fc2;hp=67cdfab61680e39f892480665d2c5d45463026cf;hpb=3b1e9c1e2ea636b0c90da826ecf37147a9b5f23d;p=oam%2Fnf-oam-adopter.git

diff --git a/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/test/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/SnmpManagerTest.java b/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/test/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/SnmpManagerTest.java
index 67cdfab..913c3b6 100644
--- a/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/test/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/SnmpManagerTest.java
+++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/test/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/SnmpManagerTest.java
@@ -40,7 +40,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = {VesEventNotifierMock.class, SnmpMappingConfigurationProvider.class,
     SnmpMapperImpl.class, SnmpManagerProperties.class, SnmpManagerConfig.class})
-public class SnmpManagerTest {
+class SnmpManagerTest {
     @Autowired
     @Qualifier("test")
     private VesEventNotifierMock listener;
@@ -56,12 +56,13 @@ public class SnmpManagerTest {
         when(timeZoneOffsetService.getTimeZone(anyString())).thenReturn(ZoneId.of("+02:00"));
     }
 
-    private static String getVesNotification(final VesEventNotifierMock notificationProvider)
-            throws InterruptedException {
-        for (int i = 0; i < 1000; i++) {
-            Thread.sleep(100);
-            if (notificationProvider.getEvent() != null) {
-                break;
+    private String getVesNotification(final VesEventNotifierMock notificationProvider) throws InterruptedException {
+        synchronized (notificationProvider) {
+            for (int i = 0; i < 1000; i++) {
+                notificationProvider.wait(200);
+                if (notificationProvider.getEvent() != null) {
+                    break;
+                }
             }
         }
         final String event = notificationProvider.getEvent();
@@ -71,7 +72,7 @@ public class SnmpManagerTest {
     }
 
     @Test
-    public void testDefaultTrap() throws Exception {
+    void testDefaultTrap() throws Exception {
         SnmpTestUtil
                 .sendDefaultTrapV2(snmpManagerProperties.getHost(), Integer.toString(snmpManagerProperties.getPort()));
         final String expected = JsonUtils.readJson("/json/VESMessageDefaultTrap.json");
@@ -80,7 +81,7 @@ public class SnmpManagerTest {
     }
 
     @Test
-    public void testBoxDown() throws Exception {
+    void testBoxDown() throws Exception {
         SnmpTestUtil.sendPortDownTrapV2(snmpManagerProperties.getHost(),
                 Integer.toString(snmpManagerProperties.getPort()));
         final String expected = JsonUtils.readJson("/json/PortDOWN.json");