From f5c36ad1abfa6d75b98bafbfc80643ba49424707 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Wed, 9 Jan 2013 15:43:59 -0800 Subject: [PATCH] update tests for linkinfo --- .../windowsazure/services/media/AssetIntegrationTest.java | 2 +- .../services/media/EncryptionIntegrationTest.java | 7 +++---- .../windowsazure/services/media/JobIntegrationTest.java | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/AssetIntegrationTest.java b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/AssetIntegrationTest.java index f4008661a5992..7d3ac22c8d09c 100644 --- a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/AssetIntegrationTest.java +++ b/microsoft-azure-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 parentAssetLink = childAsset.getParentAssetsLink(); AssetInfo parentAsset = service.get(Asset.get(parentAssetLink)); // Assert diff --git a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/EncryptionIntegrationTest.java b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/EncryptionIntegrationTest.java index 3b71c7d8e0210..7713b82f1cb9e 100644 --- a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/EncryptionIntegrationTest.java +++ b/microsoft-azure-api/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 taskLinkInfo = jobInfo.getTasksLink(); List 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 - .getProtectionKeyId(ContentKeyType.StorageEncryption)); - String protectionKey = (String) service.action(ProtectionKey.getProtectionKey(protectionKeyId)); + String protectionKeyId = service.action(ProtectionKey.getProtectionKeyId(ContentKeyType.StorageEncryption)); + String protectionKey = service.action(ProtectionKey.getProtectionKey(protectionKeyId)); String contentKeyIdUuid = UUID.randomUUID().toString(); String contentKeyId = String.format("nb:kid:UUID:%s", contentKeyIdUuid); diff --git a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/JobIntegrationTest.java b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/JobIntegrationTest.java index 59d16612acbf5..486647a56874d 100644 --- a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/JobIntegrationTest.java +++ b/microsoft-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 tasksLink = actualJob.getTasksLink(); ListResult actualTasks = service.list(Task.list(tasksLink)); assertEquals(message + " tasks size", expectedTaskCount.intValue(), actualTasks.size()); }