Merge pull request #95 from gcheng/betteraction

update tests for linkinfo
Azure · Jan 9, 2013 · 6ef0e49 · 6ef0e49
2 parents 9f0b32f + f5c36ad
commit 6ef0e49
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/...ure-api/src/test/java/com/microsoft/windowsazure/services/media/AssetIntegrationTest.java b/...ure-api/src/test/java/com/microsoft/windowsazure/services/media/AssetIntegrationTest.java
@@ -349,7 +349,7 @@ public void canGetParentBackFromAsset() throws ServiceException, InterruptedExce
         assertEquals(1, outputAssets.size());
         AssetInfo childAsset = outputAssets.get(0);
 
-        LinkInfo parentAssetLink = childAsset.getParentAssetsLink();
+        LinkInfo<AssetInfo> parentAssetLink = childAsset.getParentAssetsLink();
         AssetInfo parentAsset = service.get(Asset.get(parentAssetLink));
 
         // Assert

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
@@ -96,7 +96,7 @@ public void uploadAesProtectedAssetAndDownloadSuccess() throws Exception {
         JobInfo jobInfo = decodeAsset("uploadAesProtectedAssetSuccess", assetInfo.getId());
 
         // assert
-        LinkInfo taskLinkInfo = jobInfo.getTasksLink();
+        LinkInfo<TaskInfo> taskLinkInfo = jobInfo.getTasksLink();
         List<TaskInfo> taskInfos = service.list(Task.list(taskLinkInfo));
         for (TaskInfo taskInfo : taskInfos) {
             assertEquals(TaskState.Completed, taskInfo.getState());
@@ -139,9 +139,8 @@ private JobInfo decodeAsset(String name, String inputAssetId) throws ServiceExce
     }
 
     private String makeContentKeyId(byte[] aesKey) throws ServiceException, Exception {
-        String protectionKeyId = (String) service.action(ProtectionKey
+        String protectionKeyId = service.action(ProtectionKey.getProtectionKeyId(ContentKeyType.StorageEncryption));
-                .getProtectionKeyId(ContentKeyType.StorageEncryption));
+        String protectionKey = service.action(ProtectionKey.getProtectionKey(protectionKeyId));
-        String protectionKey = (String) service.action(ProtectionKey.getProtectionKey(protectionKeyId));
 
         String contentKeyIdUuid = UUID.randomUUID().toString();
         String contentKeyId = String.format("nb:kid:UUID:%s", contentKeyIdUuid);

diff --git a/...azure-api/src/test/java/com/microsoft/windowsazure/services/media/JobIntegrationTest.java b/...azure-api/src/test/java/com/microsoft/windowsazure/services/media/JobIntegrationTest.java
@@ -67,7 +67,7 @@ private void verifyJobProperties(String message, String testName, Integer priori
         assertDateApproxEquals(message + " EndTime", endTime, actualJob.getEndTime());
 
         if (expectedTaskCount != null) {
-            LinkInfo tasksLink = actualJob.getTasksLink();
+            LinkInfo<TaskInfo> tasksLink = actualJob.getTasksLink();
             ListResult<TaskInfo> actualTasks = service.list(Task.list(tasksLink));
             assertEquals(message + " tasks size", expectedTaskCount.intValue(), actualTasks.size());
         }