Merge pull request #210 from /issues/86-formatting

Review Tests

Author: chenkins

hub/src/test/java/cloud/katta/client/model/ObjectMapperTest.java

@@ -17,10 +17,10 @@
 /**
  * Check the generated client code can deserialize `useOneOfDiscriminatorLookup` data.
  */
-public class ObjectMapperTest {
+class ObjectMapperTest {
 
     @Test
-    public void testAWSStatic() throws IOException {
+    void testAWSStatic() throws IOException {
         final ObjectMapper mapper = new ObjectMapper();
         mapper.registerModule(new JsonNullableModule());
 
@@ -36,7 +36,7 @@ public void testAWSStatic() throws IOException {
     }
 
     @Test
-    public void testAWSSTS() throws IOException {
+    void testAWSSTS() throws IOException {
         final ObjectMapper mapper = new ObjectMapper();
         mapper.registerModule(new JsonNullableModule());
 
@@ -60,7 +60,7 @@ public void testAWSSTS() throws IOException {
     }
 
     @Test
-    public void testMinioStatic() throws IOException {
+    void testMinioStatic() throws IOException {
         final ObjectMapper mapper = new ObjectMapper();
         mapper.registerModule(new JsonNullableModule());
 
@@ -76,7 +76,7 @@ public void testMinioStatic() throws IOException {
     }
 
     @Test
-    public void testMinioSTS() throws IOException {
+    void testMinioSTS() throws IOException {
         final ObjectMapper mapper = new ObjectMapper();
         mapper.registerModule(new JsonNullableModule());
         final StorageProfileS3STSDto minioSTSProfile = mapper.readValue(this.getClass().getResourceAsStream("/setup/local/minio_sts/minio_sts_profile.json"), StorageProfileS3STSDto.class);

hub/src/test/java/cloud/katta/core/KeyRotationTest.java

@@ -4,8 +4,6 @@
 
 package cloud.katta.core;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -41,22 +39,20 @@
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @ExtendWith({HubTestSetupDockerExtension.Local.class})
-public class KeyRotationTest extends AbstractHubTest {
-    private static final Logger log = LogManager.getLogger(KeyRotationTest.class.getName());
+class KeyRotationTest extends AbstractHubTest {
 
     private Stream<Arguments> arguments() {
         return Stream.of(LOCAL_MINIO_STS);
     }
 
     @ParameterizedTest
     @MethodSource("arguments")
-    public void keyrotationTest(final HubTestConfig hubTestConfig) throws Exception {
+    void testKeyRotation(final HubTestConfig hubTestConfig) throws Exception {
         final HubSession hubSession = setupConnection(hubTestConfig.setup);
         try {
             final UsersResourceApi usersResourceApi = new UsersResourceApi(hubSession.getClient());
             final VaultResourceApi vaultResourceApi = new VaultResourceApi(hubSession.getClient());
             final UserDto me = usersResourceApi.apiUsersMeGet(false, false);
-            log.info(me);
 
             final List<VaultDto> vaults = vaultResourceApi.apiVaultsAccessibleGet(Role.OWNER);
 
@@ -71,8 +67,8 @@ public void keyrotationTest(final HubTestConfig hubTestConfig) throws Exception
                 final HashMap<String, String> tokens = new HashMap<>();
                 final UserKeysService service = new UserKeysServiceImpl(hubSession);
                 final UserKeys userKeys = service.getUserKeys(hubSession.getHost(), me, new DeviceKeysServiceImpl().getDeviceKeys(hubSession.getHost()));
-            final VaultServiceImpl vaultService = new VaultServiceImpl(hubSession);
-            final UvfMetadataPayload metadataJWE = vaultService.getVaultMetadataJWE(UUID.fromString(vaultDto.getId().toString()), userKeys);
+                final VaultServiceImpl vaultService = new VaultServiceImpl(hubSession);
+                final UvfMetadataPayload metadataJWE = vaultService.getVaultMetadataJWE(UUID.fromString(vaultDto.getId().toString()), userKeys);
                 final UvfAccessTokenPayload masterkeyJWE = vaultService.getVaultAccessTokenJWE(UUID.fromString(vaultDto.getId().toString()), userKeys);
 
                 // TODO https://github.com/shift7-ch/cipherduck-hub/issues/37 change nickname for now - could be used to rotate of shared access key/secret key.

hub/src/test/java/cloud/katta/core/M04_HubSynchronizeOAuthSharingTest.java

@@ -28,15 +28,15 @@
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @ExtendWith({HubTestSetupDockerExtension.Local.class})
-public class UserKeysRecoveryTest extends AbstractHubTest {
+class UserKeysRecoveryTest extends AbstractHubTest {
 
     private Stream<Arguments> arguments() {
         return Stream.of(LOCAL_MINIO_STS);
     }
 
     @ParameterizedTest
     @MethodSource("arguments")
-    public void firstLoginAndUserKeyRecovery(final HubTestConfig hubTestConfig) throws Exception {
+    void testFirstLoginAndUserKeyRecovery(final HubTestConfig hubTestConfig) throws Exception {
         final HubSession hubSession = setupConnection(hubTestConfig.setup);
         final UsersResourceApi usersApi = new UsersResourceApi(hubSession.getClient());
         final UserDto me = usersApi.apiUsersMeGet(true, false);

hub/src/test/java/cloud/katta/core/UserKeysRecoveryTest.java

@@ -25,8 +25,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class JWETest {
+
     @Test
-    public void testEcdhEsEncryptDecrypt() throws ParseException, JOSEException, NoSuchAlgorithmException, InvalidKeySpecException, NotECKeyException, JsonProcessingException {
+    void testEcdhEsEncryptDecrypt() throws ParseException, JOSEException, NoSuchAlgorithmException, InvalidKeySpecException, NotECKeyException, JsonProcessingException {
         final P384KeyPair keyPair = P384KeyPair.generate();
         final Map<String, Object> orig = Collections.singletonMap("hello", "world");
         final String jwe = JWE.ecdhEsEncrypt(new JWEPayload() {
@@ -40,7 +41,7 @@ public Map<String, Object> toJSONObject() {
     }
 
     @Test
-    public void testPbes2EncryptDecrypt() throws JOSEException, ParseException, JsonProcessingException {
+    void testPbes2EncryptDecrypt() throws JOSEException, ParseException, JsonProcessingException {
         final String setupCode = "topsecret";
         final JWEPayload payload = new JWEPayload() {
             @Override
@@ -55,7 +56,7 @@ public Map<String, Object> toJSONObject() {
     }
 
     @Test
-    public void testA256EncryptDecrypt() throws JOSEException, JsonProcessingException, ParseException {
+    void testA256EncryptDecrypt() throws JOSEException, JsonProcessingException, ParseException {
         final byte[] kek = new byte[32];
         FastSecureRandomProvider.get().provide().nextBytes(kek);
         final String jwe = JWE.a256kwEncrypt(new JWEPayload() {
@@ -68,13 +69,13 @@ public Map<String, Object> toJSONObject() {
     }
 
     @Test
-    public void testDecryptPbes2() throws ParseException, JOSEException {
+    void testDecryptPbes2() throws ParseException, JOSEException {
         final Payload payload = JWE.decryptPbes2("eyJhbGciOiJQQkVTMi1IUzUxMitBMjU2S1ciLCJlbmMiOiJBMjU2R0NNIiwicDJzIjoiQmp4NXBKU0lrSU5EZHJOS0pjTmdiUSIsInAyYyI6MTAwMDAwMCwiYXB1IjoiIiwiYXB2IjoiIn0.-sXeL9JD6MMhGEkdtP9LmIXGCHnVI5d7ifjO5WnWoz7d8Qsl7RmiQA.lmo9F4fSsukqfvuc.3o1l8RVc62czjv-fdi-jQJnijapO.n2ou6Oi04QOeGtiqrQhFRw", "topsecret");
         assertEquals(payload.toJSONObject().get("key"), "hello world");
     }
 
     @Test
-    public void testDecryptA256kw() throws ParseException, JOSEException {
+    void testDecryptA256kw() throws ParseException, JOSEException {
         // JWE generated by https://dinochiesa.github.io/jwt/
         final String jwe = "eyJhbGciOiJBMjU2S1ciLCJlbmMiOiJBMjU2R0NNIn0.JTSrGbw4XEKXYFTC7siTT7DIZUX2SogThcLKXgxe0FPK3Fi8ckjr9A.zQx0t4qoTVIc-h5f.cmqzZ-md3cvdTNH9FWbKOsw.DCdGhmdwjoYKIuNC5zgQJQ";
         final byte[] rawKek = Base64.getUrlDecoder().decode("y_uxz8iAtcOXlqMYpm2jASvDWokpCYMtwkthFSK6IF0");