svn commit: r1206527 - in /incubator/wave/trunk/test/org/waveprotocol/box/server/robots: active/ActiveApiServletTest.java dataapi/DataApiServletTest.java

[yurize]

Author: yurize
Date: Sat Nov 26 18:19:18 2011
New Revision: 1206527

URL: http://svn.apache.org/viewvc?rev=1206527&view=rev
Log:
Fixes issue WAVE-298: ActiveApiServletTest and DataApiServletTest don't 
compile. by jede...@gmail.com (Antonio Bello)

Modified:
    
incubator/wave/trunk/test/org/waveprotocol/box/server/robots/active/ActiveApiServletTest.java
    
incubator/wave/trunk/test/org/waveprotocol/box/server/robots/dataapi/DataApiServletTest.java

Modified: 
incubator/wave/trunk/test/org/waveprotocol/box/server/robots/active/ActiveApiServletTest.java
URL: 
http://svn.apache.org/viewvc/incubator/wave/trunk/test/org/waveprotocol/box/server/robots/active/ActiveApiServletTest.java?rev=1206527&r1=1206526&r2=1206527&view=diff
==============================================================================
--- 
incubator/wave/trunk/test/org/waveprotocol/box/server/robots/active/ActiveApiServletTest.java
 (original)
+++ 
incubator/wave/trunk/test/org/waveprotocol/box/server/robots/active/ActiveApiServletTest.java
 Sat Nov 26 18:19:18 2011
@@ -55,6 +55,7 @@ import java.io.StringReader;
 import java.io.StringWriter;
 import java.lang.reflect.Type;
 import java.util.Collections;
+import java.util.Enumeration;
 import java.util.List;
 import java.util.StringTokenizer;
 
@@ -96,7 +97,8 @@ public class ActiveApiServletTest extend
 
     req = mock(HttpServletRequest.class);
     when(req.getRequestURL()).thenReturn(new 
StringBuffer("www.example.com/robot"));
-    when(req.getHeaderNames()).thenReturn(new 
StringTokenizer("Authorization"));
+    when(req.getHeaderNames()).thenReturn(
+        convertRawEnumerationToGeneric(new StringTokenizer("Authorization")));
     when(req.getReader()).thenReturn(new BufferedReader(new StringReader("")));
 
     resp = mock(HttpServletResponse.class);
@@ -109,7 +111,8 @@ public class ActiveApiServletTest extend
   }
 
   public void testDoPostExecutesAndWritesResponse() throws Exception {
-    
when(req.getHeaders("Authorization")).thenReturn(generateOAuthHeader(ROBOT.getAddress()));
+    
when(req.getHeaders("Authorization")).thenReturn(convertRawEnumerationToGeneric(
+        generateOAuthHeader(ROBOT.getAddress())));
 
     String operationId = "op1";
     OperationRequest operation = new OperationRequest("wavelet.create", 
operationId);
@@ -133,7 +136,7 @@ public class ActiveApiServletTest extend
 
   public void testDoPostUnauthorizedWhenParticipantInvalid() throws Exception {
     when(req.getHeaders("Authorization")).thenReturn(
-        generateOAuthHeader("invalid#$example.com"));
+        
convertRawEnumerationToGeneric(generateOAuthHeader("invalid#$example.com")));
 
     servlet.doPost(req, resp);
 
@@ -142,7 +145,8 @@ public class ActiveApiServletTest extend
 
 
   public void testDoPostUnauthorizedWhenParticipantUnknown() throws Exception {
-    
when(req.getHeaders("Authorization")).thenReturn(generateOAuthHeader(UNKNOWN.getAddress()));
+    when(req.getHeaders("Authorization")).thenReturn(
+        
convertRawEnumerationToGeneric(generateOAuthHeader(UNKNOWN.getAddress())));
 
     servlet.doPost(req, resp);
 
@@ -150,7 +154,8 @@ public class ActiveApiServletTest extend
   }
 
   public void testDoPostUnauthorizedWhenValidationFails() throws Exception {
-    
when(req.getHeaders("Authorization")).thenReturn(generateOAuthHeader(ROBOT.getAddress()));
+    when(req.getHeaders("Authorization")).thenReturn(
+        
convertRawEnumerationToGeneric(generateOAuthHeader(ROBOT.getAddress())));
     doThrow(new OAuthException("")).when(validator).validateMessage(
         any(OAuthMessage.class), any(OAuthAccessor.class));
 
@@ -162,4 +167,24 @@ public class ActiveApiServletTest extend
   private StringTokenizer generateOAuthHeader(String address) {
     return new StringTokenizer("OAuth " + OAuth.OAUTH_CONSUMER_KEY + "=\"" + 
address + "\"", "");
   }
+  
+  /**
+   * Converts a {@link StringTokenizer} into an @{link {@link Enumeration
+   * <String>}.
+   * 
+   * @author jede...@gmail.com (Antonio Bello)
+   */
+  private Enumeration<String> convertRawEnumerationToGeneric(final 
StringTokenizer tokens) {
+    return new Enumeration<String>() {
+      @Override
+      public String nextElement() {
+        return (String) tokens.nextElement();
+      }
+
+      @Override
+      public boolean hasMoreElements() {
+        return tokens.hasMoreElements();
+      }
+    };
+  }
 }

Modified: 
incubator/wave/trunk/test/org/waveprotocol/box/server/robots/dataapi/DataApiServletTest.java
URL: 
http://svn.apache.org/viewvc/incubator/wave/trunk/test/org/waveprotocol/box/server/robots/dataapi/DataApiServletTest.java?rev=1206527&r1=1206526&r2=1206527&view=diff
==============================================================================
--- 
incubator/wave/trunk/test/org/waveprotocol/box/server/robots/dataapi/DataApiServletTest.java
 (original)
+++ 
incubator/wave/trunk/test/org/waveprotocol/box/server/robots/dataapi/DataApiServletTest.java
 Sat Nov 26 18:19:18 2011
@@ -26,7 +26,6 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import com.google.wave.api.OperationRequest;
 import com.google.wave.api.OperationType;
@@ -143,7 +142,8 @@ public class DataApiServletTest extends 
 
   public void testDoPostUnauthorizedWhenMissingToken() throws Exception {
     servlet.doPost(req, resp);
-    when(req.getParameterMap()).thenReturn(ImmutableMap.of());
+    Map<String, String[]> emptyMap = Collections.emptyMap();
+    when(req.getParameterMap()).thenReturn(emptyMap);
 
     verify(resp).sendError(eq(HttpServletResponse.SC_UNAUTHORIZED), 
anyString());
   }