Swap the assertEquals parameters so the expected value is first.

Author: nbayati

cab-token-generator/javatests/com/google/auth/credentialaccessboundary/ClientSideCredentialAccessBoundaryFactoryTest.java

@@ -491,13 +491,13 @@ public void builder_invalidRefreshMarginAndMinimumTokenLifetime_throws() throws
     IllegalArgumentException exception =
         assertThrows(
             IllegalArgumentException.class,
-            () -> {
-              ClientSideCredentialAccessBoundaryFactory.newBuilder()
-                  .setSourceCredential(sourceCredentials)
-                  .setRefreshMargin(Duration.ofMinutes(50))
-                  .setMinimumTokenLifetime(Duration.ofMinutes(50))
-                  .build();
-            });
+            () ->
+                ClientSideCredentialAccessBoundaryFactory.newBuilder()
+                    .setSourceCredential(sourceCredentials)
+                    .setRefreshMargin(Duration.ofMinutes(50))
+                    .setMinimumTokenLifetime(Duration.ofMinutes(50))
+                    .build());
+
     assertEquals(
         "Refresh margin must be at least one minute longer than the minimum token lifetime.",
         exception.getMessage());
@@ -649,9 +649,9 @@ private static class CabToken {
     }
   }
 
-  private static CabToken parseCabToken(AccessToken token) throws Exception {
+  private static CabToken parseCabToken(AccessToken token) {
     String[] parts = token.getTokenValue().split("\\.");
-    assertEquals(parts.length, 2);
+    assertEquals(2, parts.length);
 
     return new CabToken(parts[0], parts[1]);
   }
@@ -703,28 +703,28 @@ public void generateToken_withAvailablityCondition_success() throws Exception {
     AccessToken token = factory.generateToken(accessBoundary);
 
     CabToken cabToken = parseCabToken(token);
-    assertEquals(cabToken.intermediateToken, "accessToken");
+    assertEquals("accessToken", cabToken.intermediateToken);
 
     // Checks the encrypted restriction is the correct proto format of the
     // CredentialAccessBoundary
     ClientSideAccessBoundary clientSideAccessBoundary =
         decryptRestriction(
             cabToken.encryptedRestriction,
             transportFactory.transport.getAccessBoundarySessionKey());
-    assertEquals(clientSideAccessBoundary.getAccessBoundaryRulesCount(), 1);
+    assertEquals(1, clientSideAccessBoundary.getAccessBoundaryRulesCount());
 
     ClientSideAccessBoundaryRule rule = clientSideAccessBoundary.getAccessBoundaryRules(0);
 
     // Available resource and available permission should be the exact same as
     // in original format
-    assertEquals(rule.getAvailableResource(), "resource");
-    assertEquals(rule.getAvailablePermissionsList(), ImmutableList.of("role1", "role2"));
+    assertEquals("resource", rule.getAvailableResource());
+    assertEquals(ImmutableList.of("role1", "role2"), rule.getAvailablePermissionsList());
 
     // Availablity condition should be in the correct compiled proto format
     Expr expr = rule.getCompiledAvailabilityCondition();
-    assertEquals(expr.getCallExpr().getFunction(), "_==_");
-    assertEquals(expr.getCallExpr().getArgs(0).getIdentExpr().getName(), "a");
-    assertEquals(expr.getCallExpr().getArgs(1).getIdentExpr().getName(), "b");
+    assertEquals("_==_", expr.getCallExpr().getFunction());
+    assertEquals("a", expr.getCallExpr().getArgs(0).getIdentExpr().getName());
+    assertEquals("b", expr.getCallExpr().getArgs(1).getIdentExpr().getName());
   }
 
   @Test
@@ -755,22 +755,22 @@ public void generateToken_withoutAvailabilityCondition_success() throws Exceptio
     AccessToken token = factory.generateToken(accessBoundary);
 
     CabToken cabToken = parseCabToken(token);
-    assertEquals(cabToken.intermediateToken, "accessToken");
+    assertEquals("accessToken", cabToken.intermediateToken);
 
     // Checks the encrypted restriction is the correct proto format of the
     // CredentialAccessBoundary
     ClientSideAccessBoundary clientSideAccessBoundary =
         decryptRestriction(
             cabToken.encryptedRestriction,
             transportFactory.transport.getAccessBoundarySessionKey());
-    assertEquals(clientSideAccessBoundary.getAccessBoundaryRulesCount(), 1);
+    assertEquals(1, clientSideAccessBoundary.getAccessBoundaryRulesCount());
 
     ClientSideAccessBoundaryRule rule = clientSideAccessBoundary.getAccessBoundaryRules(0);
 
     // Available resource and available permission should be the exact same as
     // in original format
-    assertEquals(rule.getAvailableResource(), "resource");
-    assertEquals(rule.getAvailablePermissionsList(), ImmutableList.of("role"));
+    assertEquals("resource", rule.getAvailableResource());
+    assertEquals(ImmutableList.of("role"), rule.getAvailablePermissionsList());
 
     // Availablity condition should be empty since it's not provided
     assertFalse(rule.hasCompiledAvailabilityCondition());
@@ -814,30 +814,30 @@ public void generateToken_withMultipleRules_success() throws Exception {
     AccessToken token = factory.generateToken(accessBoundary);
 
     CabToken cabToken = parseCabToken(token);
-    assertEquals(cabToken.intermediateToken, "accessToken");
+    assertEquals("accessToken", cabToken.intermediateToken);
 
     // Checks the encrypted restriction is the correct proto format of the
     // CredentialAccessBoundary
     ClientSideAccessBoundary clientSideAccessBoundary =
         decryptRestriction(
             cabToken.encryptedRestriction,
             transportFactory.transport.getAccessBoundarySessionKey());
-    assertEquals(clientSideAccessBoundary.getAccessBoundaryRulesCount(), 2);
+    assertEquals(2, clientSideAccessBoundary.getAccessBoundaryRulesCount());
 
     // Checks the first rule
     ClientSideAccessBoundaryRule rule1 = clientSideAccessBoundary.getAccessBoundaryRules(0);
-    assertEquals(rule1.getAvailableResource(), "resource1");
-    assertEquals(rule1.getAvailablePermissionsList(), ImmutableList.of("role1-1", "role1-2"));
+    assertEquals("resource1", rule1.getAvailableResource());
+    assertEquals(ImmutableList.of("role1-1", "role1-2"), rule1.getAvailablePermissionsList());
 
     Expr expr = rule1.getCompiledAvailabilityCondition();
-    assertEquals(expr.getCallExpr().getFunction(), "_==_");
-    assertEquals(expr.getCallExpr().getArgs(0).getIdentExpr().getName(), "a");
-    assertEquals(expr.getCallExpr().getArgs(1).getIdentExpr().getName(), "b");
+    assertEquals("_==_", expr.getCallExpr().getFunction());
+    assertEquals("a", expr.getCallExpr().getArgs(0).getIdentExpr().getName());
+    assertEquals("b", expr.getCallExpr().getArgs(1).getIdentExpr().getName());
 
     // Checks the second rule
     ClientSideAccessBoundaryRule rule2 = clientSideAccessBoundary.getAccessBoundaryRules(1);
-    assertEquals(rule2.getAvailableResource(), "resource");
-    assertEquals(rule2.getAvailablePermissionsList(), ImmutableList.of("role2"));
+    assertEquals("resource", rule2.getAvailableResource());
+    assertEquals(ImmutableList.of("role2"), rule2.getAvailablePermissionsList());
     assertFalse(rule2.hasCompiledAvailabilityCondition());
   }
 
@@ -875,11 +875,7 @@ public void generateToken_withInvalidAvailabilityCondition_failure() throws Exce
                     .build())
             .build();
 
-    assertThrows(
-        CelValidationException.class,
-        () -> {
-          factory.generateToken(accessBoundary);
-        });
+    assertThrows(CelValidationException.class, () -> factory.generateToken(accessBoundary));
   }
 
   @Test
@@ -916,11 +912,7 @@ public void generateToken_withSessionKeyNotBase64Encoded_failure() throws Except
                     .build())
             .build();
 
-    assertThrows(
-        IllegalStateException.class,
-        () -> {
-          factory.generateToken(accessBoundary);
-        });
+    assertThrows(IllegalStateException.class, () -> factory.generateToken(accessBoundary));
   }
 
   @Test
@@ -957,10 +949,6 @@ public void generateToken_withMalformSessionKey_failure() throws Exception {
                     .build())
             .build();
 
-    assertThrows(
-        GeneralSecurityException.class,
-        () -> {
-          factory.generateToken(accessBoundary);
-        });
+    assertThrows(GeneralSecurityException.class, () -> factory.generateToken(accessBoundary));
   }
 }