Merge pull request Azure#99 from gcheng/bettertests

update the unit tests so that the job integration tests have the right
gcheng · Jan 21, 2013 · 2cebbbd · 2cebbbd
2 parents 8e9fdcf + 8a143d8
commit 2cebbbd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...pi/src/test/java/com/microsoft/windowsazure/services/media/EncryptionIntegrationTest.java b/...pi/src/test/java/com/microsoft/windowsazure/services/media/EncryptionIntegrationTest.java
@@ -98,7 +98,7 @@ public void uploadAesProtectedAssetAndDownloadSuccess() throws Exception {
         uploadEncryptedAssetFile(assetInfo, blobWriter, "MPEG4-H264.mp4", encryptedContent, contentKeyId, iv);
 
         // submit and execute the decoding job.
-        JobInfo jobInfo = decodeAsset("uploadAesProtectedAssetSuccess", assetInfo.getId());
+        JobInfo jobInfo = decodeAsset(testJobPrefix + "uploadAesProtectedAssetSuccess", assetInfo.getId());
 
         // assert
         LinkInfo<TaskInfo> taskLinkInfo = jobInfo.getTasksLink();

diff --git a/...zure-api/src/test/java/com/microsoft/windowsazure/services/media/IntegrationTestBase.java b/...zure-api/src/test/java/com/microsoft/windowsazure/services/media/IntegrationTestBase.java
@@ -99,8 +99,8 @@ protected static void cleanupEnvironment() {
         removeAllTestLocators();
         removeAllTestAssets();
         removeAllTestAccessPolicies();
-        removeAllTestContentKeys();
         removeAllTestJobs();
+        removeAllTestContentKeys();
     }
 
     private static void removeAllTestContentKeys() {