Return Code/exception onWaitFor**Failure method of LeshanTestClient

eclipse-leshan · Oct 15, 2024 · c6972d8 · c6972d8
1 parent 7db3aec
commit c6972d8
Showing 1 changed file with 44 additions and 21 deletions.
diff --git a/...ation-tests/src/test/java/org/eclipse/leshan/integration/tests/util/LeshanTestClient.java b/...ation-tests/src/test/java/org/eclipse/leshan/integration/tests/util/LeshanTestClient.java
@@ -168,6 +168,10 @@ public Failure waitForRegistrationFailureTo(LeshanTestServer server, long timeou
         return new Failure(cExp.getValue(), cCode.getValue());
     }
 
+    public void waitForUpdateTo(LeshanTestServer server) {
+        waitForUpdateTo(server, 1, TimeUnit.SECONDS);
+    }
+
     public void waitForUpdateTo(LeshanTestServer server, long timeout, TimeUnit unit) {
         inOrder.verify(clientObserver, timeout(unit.toMillis(timeout)).times(1)).onUpdateStarted(assertArg( //
                 s -> assertTrue(isServerIdentifiedByUri(server, s.getUri()))), //
@@ -178,20 +182,6 @@ public void waitForUpdateTo(LeshanTestServer server, long timeout, TimeUnit unit
         inOrder.verifyNoMoreInteractions();
     }
 
-    public void waitForDeregistrationTo(LeshanTestServer server) {
-        waitForDeregistrationTo(server, 1, TimeUnit.SECONDS);
-    }
-
-    public void waitForDeregistrationTo(LeshanTestServer server, long timeout, TimeUnit unit) {
-        inOrder.verify(clientObserver, timeout(unit.toMillis(timeout)).times(1)).onDeregistrationStarted(assertArg( //
-                s -> assertTrue(isServerIdentifiedByUri(server, s.getUri()))), //
-                isNotNull());
-        inOrder.verify(clientObserver, timeout(unit.toMillis(timeout)).times(1)).onDeregistrationSuccess(assertArg( //
-                s -> assertTrue(isServerIdentifiedByUri(server, s.getUri()))), //
-                isNotNull());
-        inOrder.verifyNoMoreInteractions();
-    }
-
     public void waitForUpdateTimeoutTo(LeshanTestServer server) {
         waitForUpdateTimeoutTo(server, 1, TimeUnit.SECONDS);
     }
@@ -208,27 +198,60 @@ public void waitForUpdateTimeoutTo(LeshanTestServer server, long timeout, TimeUn
         // ...
     }
 
-    public void waitForUpdateFailureTo(LeshanTestServer server) {
-        waitForUpdateFailureTo(server, 1, TimeUnit.SECONDS);
+    public Failure waitForUpdateFailureTo(LeshanTestServer server) {
+        return waitForUpdateFailureTo(server, 1, TimeUnit.SECONDS);
     }
 
-    public void waitForUpdateFailureTo(LeshanTestServer server, long timeout, TimeUnit unit) {
+    public Failure waitForUpdateFailureTo(LeshanTestServer server, long timeout, TimeUnit unit) {
+        final ArgumentCaptor<Exception> cExp = ArgumentCaptor.forClass(Exception.class);
+        final ArgumentCaptor<ResponseCode> cCode = ArgumentCaptor.forClass(ResponseCode.class);
+
         inOrder.verify(clientObserver, timeout(unit.toMillis(timeout)).times(1)).onUpdateStarted(assertArg( //
                 s -> assertTrue(isServerIdentifiedByUri(server, s.getUri()))), //
                 notNull());
         inOrder.verify(clientObserver, timeout(unit.toMillis(timeout)).times(1)).onUpdateFailure(assertArg( //
                 s -> assertTrue(isServerIdentifiedByUri(server, s.getUri()))), //
                 notNull(), //
-                notNull(), // TODO we should be able to check response code
+                cCode.capture(), //
                 any(), //
-                any()); // TODO we should be able to check exception
+                cExp.capture());
         // if client update timeout, it will retry again then try a register so all events can not be consume by inOrder
         // ...
+        return new Failure(cExp.getValue(), cCode.getValue());
+    }
+
+    public void waitForDeregistrationTo(LeshanTestServer server) {
+        waitForDeregistrationTo(server, 1, TimeUnit.SECONDS);
     }
 
-    public void waitForBootstrapStarted() {
-        // TODO Auto-generated method stub
+    public void waitForDeregistrationTo(LeshanTestServer server, long timeout, TimeUnit unit) {
+        inOrder.verify(clientObserver, timeout(unit.toMillis(timeout)).times(1)).onDeregistrationStarted(assertArg( //
+                s -> assertTrue(isServerIdentifiedByUri(server, s.getUri()))), //
+                isNotNull());
+        inOrder.verify(clientObserver, timeout(unit.toMillis(timeout)).times(1)).onDeregistrationSuccess(assertArg( //
+                s -> assertTrue(isServerIdentifiedByUri(server, s.getUri()))), //
+                isNotNull());
+        inOrder.verifyNoMoreInteractions();
+    }
 
+    public Failure waitForDeregistrationFailureTo(LeshanTestServer server) {
+        return waitForDeregistrationFailureTo(server, 1, TimeUnit.SECONDS);
+    }
+
+    public Failure waitForDeregistrationFailureTo(LeshanTestServer server, long timeout, TimeUnit unit) {
+        final ArgumentCaptor<Exception> cExp = ArgumentCaptor.forClass(Exception.class);
+        final ArgumentCaptor<ResponseCode> cCode = ArgumentCaptor.forClass(ResponseCode.class);
+        inOrder.verify(clientObserver, timeout(unit.toMillis(timeout)).times(1)).onDeregistrationStarted(assertArg( //
+                s -> assertTrue(isServerIdentifiedByUri(server, s.getUri()))), //
+                isNotNull());
+        inOrder.verify(clientObserver, timeout(unit.toMillis(timeout)).times(1)).onDeregistrationFailure(assertArg( //
+                s -> assertTrue(isServerIdentifiedByUri(server, s.getUri()))), //
+                isNotNull(), //
+                cCode.capture(), //
+                any(), //
+                cExp.capture());
+        inOrder.verifyNoMoreInteractions();
+        return new Failure(cExp.getValue(), cCode.getValue());
     }
 
     public void waitForBootstrapSuccess(LeshanBootstrapServer server, long timeout, TimeUnit unit) {