Merge pull request Azure#606 from jcookems/dev

Dev
joostdenijs · Jan 10, 2013 · c33b704 · c33b704
2 parents 6bd41af + c7028bd
commit c33b704
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/...src/test/java/com/microsoft/windowsazure/services/media/ProtectionKeyIntegrationTest.java b/...src/test/java/com/microsoft/windowsazure/services/media/ProtectionKeyIntegrationTest.java
@@ -30,8 +30,7 @@ public void canGetProtectionKeyId() throws ServiceException {
         // Arrange 
 
         // Act 
-        String protectionKeyId = (String) service.action(ProtectionKey
-                .getProtectionKeyId(ContentKeyType.CommonEncryption));
+        String protectionKeyId = service.action(ProtectionKey.getProtectionKeyId(ContentKeyType.CommonEncryption));
 
         // Assert
         assertNotNull(protectionKeyId);
@@ -40,11 +39,10 @@ public void canGetProtectionKeyId() throws ServiceException {
     @Test
     public void canGetProtectionKey() throws ServiceException {
         // Arrange
-        String protectionKeyId = (String) service.action(ProtectionKey
-                .getProtectionKeyId(ContentKeyType.CommonEncryption));
+        String protectionKeyId = service.action(ProtectionKey.getProtectionKeyId(ContentKeyType.CommonEncryption));
 
         // Act 
-        String protectionKey = (String) service.action(ProtectionKey.getProtectionKey(protectionKeyId));
+        String protectionKey = service.action(ProtectionKey.getProtectionKey(protectionKeyId));
 
         // Assert
         assertNotNull(protectionKey);

diff --git a/...test/java/com/microsoft/windowsazure/services/media/implementation/LinkRetrievalTest.java b/...test/java/com/microsoft/windowsazure/services/media/implementation/LinkRetrievalTest.java
@@ -84,7 +84,7 @@ public void getFalseWhenLinkIsntThere() {
 
     @Test
     public void canRetrieveEntireLinkByRel() {
-        LinkInfo link = info.getLink(link2.getRel());
+        LinkInfo<?> link = info.getLink(link2.getRel());
 
         assertLinksEqual(link2, link);
     }
@@ -94,7 +94,7 @@ public void getNullWhenLinkIsntThere() {
         assertNull(info.getLink("noSuchLink"));
     }
 
-    private static void assertLinksEqual(LinkType expected, LinkInfo actual) {
+    private static void assertLinksEqual(LinkType expected, LinkInfo<?> actual) {
         assertEquals(expected.getHref(), actual.getHref());
     }
 }