Merge pull request #38 from gcheng/codehausbugfix

fix for issue 314, remove codehaus exception
Azure · May 10, 2013 · 112fde7 · 112fde7
2 parents d292204 + 40d1b00
commit 112fde7
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/.../java/com/microsoft/windowsazure/services/media/implementation/OAuthTokenManagerTest.java b/.../java/com/microsoft/windowsazure/services/media/implementation/OAuthTokenManagerTest.java
@@ -24,8 +24,6 @@
 import java.util.Date;
 import java.util.TimeZone;
 
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.invocation.InvocationOnMock;
@@ -64,8 +62,7 @@ public Date answer(InvocationOnMock invocation) throws Throwable {
         });
     }
 
-    private void doIncrementingTokens() throws ServiceException, URISyntaxException, JsonParseException,
-            JsonMappingException, IOException {
+    private void doIncrementingTokens() throws ServiceException, URISyntaxException, IOException {
         doAnswer(new Answer<OAuthTokenResponse>() {
             int count = 0;
 
@@ -82,8 +79,7 @@ public OAuthTokenResponse answer(InvocationOnMock invocation) throws Throwable {
     }
 
     @Test
-    public void clientUsesContractToGetToken() throws ServiceException, URISyntaxException, JsonParseException,
-            JsonMappingException, IOException {
+    public void clientUsesContractToGetToken() throws ServiceException, URISyntaxException, IOException {
         // Arrange
         doIncrementingTokens();
 
@@ -97,7 +93,7 @@ public void clientUsesContractToGetToken() throws ServiceException, URISyntaxExc
 
     @Test
     public void clientWillNotCallMultipleTimesWhileAccessTokenIsValid() throws ServiceException, URISyntaxException,
-            JsonParseException, JsonMappingException, IOException {
+            IOException {
         // Arrange
         doIncrementingTokens();
 
@@ -117,7 +113,7 @@ public void clientWillNotCallMultipleTimesWhileAccessTokenIsValid() throws Servi
 
     @Test
     public void clientWillBeCalledWhenTokenIsHalfwayToExpiring() throws ServiceException, URISyntaxException,
-            JsonParseException, JsonMappingException, IOException {
+            IOException {
         // Arrange
         doIncrementingTokens();