MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use a configured number in integration test

This commit is contained in:
Ravi Khadiwala 2023-11-17 13:21:51 -06:00 committed by ravi-signal
parent cb1fc734c2
commit 15a6c46d47
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
integration-tests/src/main/java/org/signal/integration/Operations.java
View File

@ -133,6 +133,13 @@ public final class Operations {
return user; return user;
} }
public record PrescribedVerificationNumber(String number, String verificationCode) {}
public static PrescribedVerificationNumber prescribedVerificationNumber() {
return new PrescribedVerificationNumber(
CONFIG.prescribedRegistrationNumber(),
CONFIG.prescribedRegistrationCode());
}
public static void deleteUser(final TestUser user) { public static void deleteUser(final TestUser user) {
apiDelete("/v1/accounts/me").authorized(user).executeExpectSuccess(); apiDelete("/v1/accounts/me").authorized(user).executeExpectSuccess();
} }

4
integration-tests/src/main/java/org/signal/integration/config/Config.java
View File

@ -10,5 +10,7 @@ import org.whispersystems.textsecuregcm.configuration.DynamoDbClientConfiguratio
public record Config(String domain, public record Config(String domain,
String rootCert, String rootCert,
DynamoDbClientConfiguration dynamoDbClientConfiguration, DynamoDbClientConfiguration dynamoDbClientConfiguration,
DynamoDbTables dynamoDbTables) { DynamoDbTables dynamoDbTables,
String prescribedRegistrationNumber,
String prescribedRegistrationCode) {
} }

8
integration-tests/src/test/java/org/signal/integration/RegistrationTest.java
View File

@ -19,7 +19,10 @@ public class RegistrationTest {
public void testRegistration() throws Exception { public void testRegistration() throws Exception {
final UpdateVerificationSessionRequest originalRequest = new UpdateVerificationSessionRequest( final UpdateVerificationSessionRequest originalRequest = new UpdateVerificationSessionRequest(
"test", UpdateVerificationSessionRequest.PushTokenType.FCM, null, null, null, null); "test", UpdateVerificationSessionRequest.PushTokenType.FCM, null, null, null, null);
final CreateVerificationSessionRequest input = new CreateVerificationSessionRequest("+19995550102", originalRequest);
final Operations.PrescribedVerificationNumber params = Operations.prescribedVerificationNumber();
final CreateVerificationSessionRequest input = new CreateVerificationSessionRequest(params.number(),
originalRequest);
final VerificationSessionResponse verificationSessionResponse = Operations final VerificationSessionResponse verificationSessionResponse = Operations
.apiPost("/v1/verification/session", input) .apiPost("/v1/verification/session", input)
@ -46,7 +49,8 @@ public class RegistrationTest {
.executeExpectSuccess(VerificationSessionResponse.class); .executeExpectSuccess(VerificationSessionResponse.class);
// verify code // verify code
final SubmitVerificationCodeRequest submitVerificationCodeRequest = new SubmitVerificationCodeRequest("265402"); final SubmitVerificationCodeRequest submitVerificationCodeRequest = new SubmitVerificationCodeRequest(
params.verificationCode());
final VerificationSessionResponse codeVerified = Operations final VerificationSessionResponse codeVerified = Operations
.apiPut("/v1/verification/session/%s/code".formatted(sessionId), submitVerificationCodeRequest) .apiPut("/v1/verification/session/%s/code".formatted(sessionId), submitVerificationCodeRequest)
.executeExpectSuccess(VerificationSessionResponse.class); .executeExpectSuccess(VerificationSessionResponse.class);