From 830793bbd45757f73e609dd735696752ffa9d2fb Mon Sep 17 00:00:00 2001 From: MrCreosote Date: Wed, 19 Nov 2025 14:23:45 -0800 Subject: [PATCH] Improve test mode create token test --- .../test/auth2/service/api/TestModeTest.java | 67 +++++++++++-------- 1 file changed, 38 insertions(+), 29 deletions(-) diff --git a/src/test/java/us/kbase/test/auth2/service/api/TestModeTest.java b/src/test/java/us/kbase/test/auth2/service/api/TestModeTest.java index 428d6466..0e6d8a31 100644 --- a/src/test/java/us/kbase/test/auth2/service/api/TestModeTest.java +++ b/src/test/java/us/kbase/test/auth2/service/api/TestModeTest.java @@ -17,6 +17,7 @@ import java.util.Collections; import java.util.LinkedList; import java.util.Map; +import java.util.Map.Entry; import java.util.UUID; import javax.ws.rs.core.HttpHeaders; @@ -342,35 +343,43 @@ TokenType.DEV, uuid, new UserName("foo")) @Test public void createTokenWithName() throws Exception { - final Authentication auth = mock(Authentication.class); - final TestMode tm = new TestMode(auth); - - final UUID uuid = UUID.randomUUID(); - - when(auth.testModeCreateToken( - new UserName("foo"), new TokenName("whee"), TokenType.AGENT, MFAStatus.USED)) - .thenReturn(new NewToken(StoredToken.getBuilder( - TokenType.AGENT, uuid, new UserName("foo")) - .withLifeTime(Instant.ofEpochMilli(10000), Instant.ofEpochMilli(20000)) - .withTokenName(new TokenName("whee")) - .withMFA(MFAStatus.USED) - .build(), - "a token")); - - when(auth.getSuggestedTokenCacheTime()).thenReturn(30000L); - - final NewAPIToken token = tm.createTestToken( - new CreateTestToken("foo", "whee", "Agent", " Used \t ")); - - final NewAPIToken expected = new NewAPIToken(new NewToken(StoredToken.getBuilder( - TokenType.AGENT, uuid, new UserName("foo")) - .withLifeTime(Instant.ofEpochMilli(10000), Instant.ofEpochMilli(20000)) - .withTokenName(new TokenName("whee")) - .withMFA(MFAStatus.USED) - .build(), - "a token"), 30000L); - - assertThat("incorrect token", token, is(expected)); + final Map tests = ImmutableMap.of( + " Used \t ", MFAStatus.USED, + " \n NotUsed ", MFAStatus.NOT_USED, + "Unknown", MFAStatus.UNKNOWN + ); + for (final Entry e: tests.entrySet()) { + + final Authentication auth = mock(Authentication.class); + final TestMode tm = new TestMode(auth); + + final UUID uuid = UUID.randomUUID(); + + when(auth.testModeCreateToken( + new UserName("foo"), new TokenName("whee"), TokenType.AGENT, e.getValue())) + .thenReturn(new NewToken(StoredToken.getBuilder( + TokenType.AGENT, uuid, new UserName("foo")) + .withLifeTime(Instant.ofEpochMilli(10000), Instant.ofEpochMilli(20000)) + .withTokenName(new TokenName("whee")) + .withMFA(e.getValue()) + .build(), + "a token")); + + when(auth.getSuggestedTokenCacheTime()).thenReturn(30000L); + + final NewAPIToken token = tm.createTestToken( + new CreateTestToken("foo", "whee", "Agent", e.getKey())); + + final NewAPIToken expected = new NewAPIToken(new NewToken(StoredToken.getBuilder( + TokenType.AGENT, uuid, new UserName("foo")) + .withLifeTime(Instant.ofEpochMilli(10000), Instant.ofEpochMilli(20000)) + .withTokenName(new TokenName("whee")) + .withMFA(e.getValue()) + .build(), + "a token"), 30000L); + + assertThat("incorrect token", token, is(expected)); + } } @Test