Merge pull request Azure#44 from tiffanyachen/dev

Added msak tests
lenala · Jun 5, 2018 · 0661add · 0661add
2 parents ec38edb + 516df2f
commit 0661add
Show file tree

Hide file tree

Showing 9 changed files with 1,434 additions and 3 deletions.
diff --git a/azure-keyvault/.gitignore b/azure-keyvault/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/azure-keyvault/pom.xml b/azure-keyvault/pom.xml
@@ -1,5 +1,5 @@
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
-	the MIT License. See License.txt in the project root for license information. -->
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under 
+the MIT License. See License.txt in the project root for license information. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
@@ -91,6 +91,12 @@
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.microsoft.azure</groupId>
+			<artifactId>azure-mgmt-keyvault</artifactId>
+			<version>1.11.1</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>
 			<artifactId>azure-mgmt-resources</artifactId>
@@ -107,7 +113,16 @@
 			<groupId>org.bouncycastle</groupId>
 			<artifactId>bcprov-jdk15on</artifactId>
 			<version>1.54</version>
+			<scope>test</scope>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.6</version>
+			<scope>test</scope>
+		</dependency>
+
 	</dependencies>
 
 	<build>
@@ -162,4 +177,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
+</project>
diff --git a/...eyvault/src/test/java/com/microsoft/azure/keyvault/test/ManagedStorageAccountKeyTest.java b/...eyvault/src/test/java/com/microsoft/azure/keyvault/test/ManagedStorageAccountKeyTest.java
diff --git a/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/crudNames.json b/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/crudNames.json
@@ -0,0 +1 @@
+{"roleDefUUID":"61927a2e-1dd1-4ae2-8ad1-e53fdf3ae32d","storageAccountName":"sa7333192560","vaultName":"vaultf9c58684e"}
diff --git a/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/sasNames.json b/azure-keyvault/src/test/java/com/microsoft/azure/keyvault/test/sasNames.json
@@ -0,0 +1 @@
+{"roleDefUUID":"0c337b82-553c-4aaf-aa62-eab5dc446bb3","storageAccountName":"sa2c77808410","vaultName":"vault669612016"}
diff --git a/azure-keyvault/src/test/java/resources/MockUserTokenCredentials.java b/azure-keyvault/src/test/java/resources/MockUserTokenCredentials.java
@@ -0,0 +1,58 @@
+package resources;
+
+import java.io.IOException;
+import java.util.Date;
+
+import com.microsoft.azure.AzureEnvironment;
+import com.microsoft.azure.credentials.UserTokenCredentials;
+import com.microsoft.aad.adal4j.AuthenticationResult;
+
+
+
+public class MockUserTokenCredentials extends UserTokenCredentials {
+
+    private AuthenticationResult authenticationResult;
+
+
+    public MockUserTokenCredentials(String clientId, String domain, String username, String password,
+            AzureEnvironment environment) {
+        super(clientId, domain, username, password, environment);
+    }
+
+    public MockUserTokenCredentials() {
+        this("","","","", AzureEnvironment.AZURE);
+    }
+    @Override
+    public String getToken(String resource) throws IOException {
+        if (authenticationResult != null
+            && authenticationResult.getExpiresOnDate().before(new Date())) {
+            acquireAccessTokenFromRefreshToken();
+        } else {
+            acquireAccessToken();
+        }
+        return authenticationResult.getAccessToken();
+    }
+
+    private void acquireAccessToken() throws IOException {
+        this.authenticationResult = new AuthenticationResult(
+                null,
+                "token1",
+                "refresh",
+                1,
+                null,
+                null,
+                false);
+    }
+
+    private void acquireAccessTokenFromRefreshToken() throws IOException {
+        this.authenticationResult = new AuthenticationResult(
+                null,
+                "token2",
+                "refresh",
+                1,
+                null,
+                null,
+                false);
+    }
+}
+
diff --git a/...lt/target/test-classes/session-records/testCrudOperationsForManagedStorageAccountKey.json b/...lt/target/test-classes/session-records/testCrudOperationsForManagedStorageAccountKey.json
diff --git a/...t/test-classes/session-records/testSetAndGetSasDefinitionForManagedStorageAccountKey.json b/...t/test-classes/session-records/testSetAndGetSasDefinitionForManagedStorageAccountKey.json
diff --git a/pom.xml b/pom.xml
@@ -81,6 +81,13 @@
 
   <dependencyManagement>
     <dependencies>
+	<!-- https://mvnrepository.com/artifact/com.microsoft.azure/azure-mgmt-keyvault -->
+	<dependency>
+    		<groupId>com.microsoft.azure</groupId>
+    		<artifactId>azure-mgmt-keyvault</artifactId>
+    		<version>1.11.1</version>
+	</dependency>
+
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-core</artifactId>