Merge pull request #1 from christav/storage_client_test_fix

Fixing client tests so they pull credentials from env vars
Azure · Sep 28, 2012 · 5585d93 · 5585d93
2 parents 89f971c + 815d89b
commit 5585d93
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/...azure-api/src/test/java/com/microsoft/windowsazure/services/blob/client/BlobTestBase.java b/...azure-api/src/test/java/com/microsoft/windowsazure/services/blob/client/BlobTestBase.java
@@ -51,7 +51,11 @@ public static void setup() throws URISyntaxException, StorageException, InvalidK
             httpAcc = CloudStorageAccount.getDevelopmentStorageAccount();
         }
         else {
-            httpAcc = CloudStorageAccount.parse(CLOUD_ACCOUNT_HTTP);
+            String cloudAccount = CLOUD_ACCOUNT_HTTP;
+            cloudAccount = cloudAccount.replace("[ACCOUNT NAME]", System.getenv("blob.accountName"));
+            cloudAccount = cloudAccount.replace("[ACCOUNT KEY]", System.getenv("blob.accountKey"));
+
+            httpAcc = CloudStorageAccount.parse(cloudAccount);
         }
 
         bClient = httpAcc.createCloudBlobClient();

diff --git a/...ure-api/src/test/java/com/microsoft/windowsazure/services/queue/client/QueueTestBase.java b/...ure-api/src/test/java/com/microsoft/windowsazure/services/queue/client/QueueTestBase.java
@@ -52,7 +52,11 @@ public static void setup() throws URISyntaxException, StorageException, InvalidK
             httpAcc = CloudStorageAccount.getDevelopmentStorageAccount();
         }
         else {
-            httpAcc = CloudStorageAccount.parse(CLOUD_ACCOUNT_HTTP);
+            String cloudAccount = CLOUD_ACCOUNT_HTTP;
+            cloudAccount = cloudAccount.replace("[ACCOUNT NAME]", System.getenv("queue.accountName"));
+            cloudAccount = cloudAccount.replace("[ACCOUNT KEY]", System.getenv("queue.accountKey"));
+
+            httpAcc = CloudStorageAccount.parse(cloudAccount);
         }
 
         qClient = httpAcc.createCloudQueueClient();

diff --git a/...ure-api/src/test/java/com/microsoft/windowsazure/services/table/client/TableTestBase.java b/...ure-api/src/test/java/com/microsoft/windowsazure/services/table/client/TableTestBase.java
@@ -577,7 +577,11 @@ public static void setup() throws URISyntaxException, StorageException, InvalidK
             httpAcc = CloudStorageAccount.getDevelopmentStorageAccount();
         }
         else {
-            httpAcc = CloudStorageAccount.parse(CLOUD_ACCOUNT_HTTP);
+            String cloudAccount = CLOUD_ACCOUNT_HTTP;
+            cloudAccount = cloudAccount.replace("[ACCOUNT NAME]", System.getenv("table.accountName"));
+            cloudAccount = cloudAccount.replace("[ACCOUNT KEY]", System.getenv("table.accountKey"));
+
+            httpAcc = CloudStorageAccount.parse(cloudAccount);
         }
 
         bClient = httpAcc.createCloudBlobClient();