Merge pull request #313 from WindowsAzure/dev

Dev
Azure · Mar 27, 2013 · 065cf4a · 065cf4a
2 parents a8589eb + b4b7fb5
commit 065cf4a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...rc/test/java/com/microsoft/windowsazure/services/media/MediaProcessorIntegrationTest.java b/...rc/test/java/com/microsoft/windowsazure/services/media/MediaProcessorIntegrationTest.java
@@ -73,6 +73,6 @@ public void listMediaProcessorWithOptionSuccess() throws ServiceException {
         assertEquals("listMediaProcessors size", 1, listMediaProcessorsResult.size());
         MediaProcessorInfo mediaProcessorInfo = listMediaProcessorsResult.get(0);
         verifyMediaProcessorInfo("mediaProcessorInfo", "nb:mpid:UUID:aec03716-7c5e-4f68-b592-f4850eba9f10",
-                "Storage Decryption", "Storage Decryption", "", "Microsoft", "1.5.3.0", mediaProcessorInfo);
+                "Storage Decryption", "Storage Decryption", "", "Microsoft", "1.6", mediaProcessorInfo);
     }
 }
diff --git a/...-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceWrapper.java b/...-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceWrapper.java
@@ -278,7 +278,7 @@ public Task.CreateBatchOperation createTaskOptions(String taskName, int inputAss
                 configuration = "VC1 Broadband SD 4x3";
                 break;
             case StorageDecryption:
-                processor = getMediaProcessorIdByName(MEDIA_PROCESSOR_STORAGE_DECRYPTION, "1.5.3.0");
+                processor = getMediaProcessorIdByName(MEDIA_PROCESSOR_STORAGE_DECRYPTION, "1.6");
                 configuration = null;
                 break;
             default: