From 432943d6ee384a9f8907443eb20d5639c3b15e89 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Sun, 29 Jan 2017 20:01:58 -0800 Subject: [PATCH] Fix test // FREEBIE --- .../textsecuregcm/tests/controllers/DeviceControllerTest.java | 4 ++-- .../whispersystems/textsecuregcm/tests/util/AuthHelper.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/DeviceControllerTest.java b/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/DeviceControllerTest.java index 227aada12..b8ffd44b0 100644 --- a/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/DeviceControllerTest.java +++ b/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/DeviceControllerTest.java @@ -94,7 +94,7 @@ public class DeviceControllerTest { when(rateLimiters.getVerifyDeviceLimiter()).thenReturn(rateLimiter); when(account.getNextDeviceId()).thenReturn(42L); -// when(maxedAccount.getActiveDeviceCount()).thenReturn(1); +// when(maxedAccount.getActiveDeviceCount()).thenReturn(6); when(pendingDevicesManager.getCodeForNumber(AuthHelper.VALID_NUMBER)).thenReturn(Optional.of("5678901")); when(pendingDevicesManager.getCodeForNumber(AuthHelper.VALID_NUMBER_TWO)).thenReturn(Optional.of("1112223")); @@ -133,7 +133,7 @@ public class DeviceControllerTest { .header("Authorization", AuthHelper.getAuthHeader(AuthHelper.VALID_NUMBER_TWO, AuthHelper.VALID_PASSWORD_TWO)) .get(); - assertEquals(response.getStatus(), 411); + assertEquals(411, response.getStatus()); } @Test diff --git a/src/test/java/org/whispersystems/textsecuregcm/tests/util/AuthHelper.java b/src/test/java/org/whispersystems/textsecuregcm/tests/util/AuthHelper.java index 04287bc07..2f70497ca 100644 --- a/src/test/java/org/whispersystems/textsecuregcm/tests/util/AuthHelper.java +++ b/src/test/java/org/whispersystems/textsecuregcm/tests/util/AuthHelper.java @@ -48,7 +48,7 @@ public class AuthHelper { when(VALID_DEVICE_TWO.getId()).thenReturn(1L); when(VALID_ACCOUNT.getDevice(anyLong())).thenReturn(Optional.of(VALID_DEVICE)); when(VALID_ACCOUNT_TWO.getDevice(eq(1L))).thenReturn(Optional.of(VALID_DEVICE_TWO)); - when(VALID_ACCOUNT_TWO.getActiveDeviceCount()).thenReturn(4); + when(VALID_ACCOUNT_TWO.getActiveDeviceCount()).thenReturn(6); when(VALID_ACCOUNT.getNumber()).thenReturn(VALID_NUMBER); when(VALID_ACCOUNT_TWO.getNumber()).thenReturn(VALID_NUMBER_TWO); when(VALID_ACCOUNT.getAuthenticatedDevice()).thenReturn(Optional.of(VALID_DEVICE));