Fixed HTTP unit test

The HTTP client was not being created before the tests. Thus several tests were throwing NullPointerExceptions. It broke as part of the move to httpclient 4.x.
voldemort · Jan 5, 2012 · f7d05f9 · f7d05f9
1 parent ce113ee
commit f7d05f9
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/test/unit/voldemort/store/http/HttpStoreTest.java b/test/unit/voldemort/store/http/HttpStoreTest.java
@@ -66,6 +66,11 @@ public void setUp() throws Exception {
                                                  RequestFormatType.VOLDEMORT_V1,
                                                  node.getHttpPort());
         server = context.getServer();
+
+        ThreadSafeClientConnManager connectionManager = new ThreadSafeClientConnManager(SchemeRegistryFactory.createDefault(),
+                                                                                        5000,
+                                                                                        TimeUnit.MILLISECONDS);
+        httpClient = new DefaultHttpClient(connectionManager);
         httpStore = ServerTestUtils.getHttpStore("users",
                                                  RequestFormatType.VOLDEMORT_V1,
                                                  node.getHttpPort(),
@@ -76,15 +81,15 @@ public <T extends Exception> void testBadUrlOrPort(String url, int port, Class<T
         ByteArray key = new ByteArray("test".getBytes());
         RequestFormat requestFormat = new RequestFormatFactory().getRequestFormat(RequestFormatType.VOLDEMORT_V1);
 
-        ThreadSafeClientConnManager connectionManager = new ThreadSafeClientConnManager(SchemeRegistryFactory.createDefault(),
-                                                                                        5000,
-                                                                                        TimeUnit.MILLISECONDS);
-
-        DefaultHttpClient client = new DefaultHttpClient(connectionManager);
-        HttpParams clientParams = client.getParams();
+        HttpParams clientParams = httpClient.getParams();
         HttpConnectionParams.setConnectionTimeout(clientParams, 5000);
 
-        HttpStore badUrlHttpStore = new HttpStore("test", url, port, client, requestFormat, false);
+        HttpStore badUrlHttpStore = new HttpStore("test",
+                                                  url,
+                                                  port,
+                                                  httpClient,
+                                                  requestFormat,
+                                                  false);
         try {
             badUrlHttpStore.put(key,
                                 new Versioned<byte[]>("value".getBytes(), new VectorClock()),
@@ -102,8 +107,6 @@ public <T extends Exception> void testBadUrlOrPort(String url, int port, Class<T
         } catch(Exception e) {
             assertTrue(e.getClass().equals(expected));
         }
-
-        client.getConnectionManager().shutdown();
     }
 
     public void testBadUrl() {