Permalink
Browse files

Merge pull request #25 from jcookems/fix577

Fix577
  • Loading branch information...
2 parents 6bd41af + 11e5830 commit c7028bdc887ffcf6b508709e82fa5a221180877b @jcookems jcookems committed Jan 10, 2013
@@ -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);
@@ -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());
}
}

0 comments on commit c7028bd

Please sign in to comment.