Add some extra validation in integration tests

signalapp · Jun 18, 2024 · daa897d · daa897d
1 parent 7a907bb
commit daa897d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/integration-tests/src/main/java/org/signal/integration/Operations.java b/integration-tests/src/main/java/org/signal/integration/Operations.java
@@ -50,6 +50,7 @@
 import org.whispersystems.textsecuregcm.http.FaultTolerantHttpClient;
 import org.whispersystems.textsecuregcm.storage.Device;
 import org.whispersystems.textsecuregcm.util.HeaderUtils;
+import org.whispersystems.textsecuregcm.util.HttpUtils;
 import org.whispersystems.textsecuregcm.util.SystemMapper;
 import javax.validation.ConstraintViolation;
 
@@ -249,14 +250,18 @@ public Pair<Integer, Void> execute() {
     public Pair<Integer, Void> executeExpectSuccess() {
       final Pair<Integer, Void> execute = execute();
       Validate.isTrue(
-          execute.getLeft() >= 200 && execute.getLeft() < 300,
+          HttpUtils.isSuccessfulResponse(execute.getLeft()),
           "Unexpected response code: %d",
           execute.getLeft());
       return execute;
     }
 
     public <T> T executeExpectSuccess(final Class<T> expectedType) {
       final Pair<Integer, T> execute = execute(expectedType);
+      Validate.isTrue(
+          HttpUtils.isSuccessfulResponse(execute.getLeft()),
+          "Unexpected response code: %d : %s",
+          execute.getLeft(), execute.getRight());
       return requireNonNull(execute.getRight());
     }
 

diff --git a/integration-tests/src/test/java/org/signal/integration/RegistrationTest.java b/integration-tests/src/test/java/org/signal/integration/RegistrationTest.java
@@ -5,6 +5,7 @@
 
 package org.signal.integration;
 
+import io.micrometer.common.util.StringUtils;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.whispersystems.textsecuregcm.entities.CreateVerificationSessionRequest;
@@ -29,6 +30,8 @@ public void testRegistration() throws Exception {
         .executeExpectSuccess(VerificationSessionResponse.class);
 
     final String sessionId = verificationSessionResponse.id();
+    Assertions.assertTrue(StringUtils.isNotBlank(sessionId));
+
     final String pushChallenge = Operations.peekVerificationSessionPushChallenge(sessionId);
 
     // supply push challenge