Decoupling authenticator. #59

Author: enridaga

it/src/main/java/uk/ac/open/kmi/basil/it/Authenticator.java

@@ -0,0 +1,24 @@
+package uk.ac.open.kmi.basil.it;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.entity.BasicHttpEntity;
+import org.apache.http.impl.client.HttpClients;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class Authenticator {
+	private static final Logger log = LoggerFactory.getLogger(Authenticator.class);
+	public CloseableHttpResponse authenticate(String serverBaseUrl, String username, String password, HttpClientContext httpClientContext) throws Exception {
+		log.trace("Authenticating {}", username);
+		HttpPost post = new HttpPost(serverBaseUrl + "/basil/auth/login");
+		post.addHeader("Content-type", "application/json");
+		BasicHttpEntity e = new BasicHttpEntity();
+		e.setContent(IOUtils.toInputStream("{username: \"" + username + "\", password: \""
+				+ password + "\"}"));
+		post.setEntity(e);
+		return HttpClients.createDefault().execute(post, httpClientContext);
+	}
+}

it/src/main/java/uk/ac/open/kmi/basil/it/BasilTestBase.java

@@ -47,7 +47,7 @@ public class BasilTestBase {
 	protected RequestBuilder builder;
 	protected CloseableHttpClient httpClient = null;
 	protected RequestExecutor executor;
-
+	protected static final Authenticator authenticator = new Authenticator();
 	/**
 	 * Override to add features
 	 * 

it/src/main/java/uk/ac/open/kmi/basil/it/BasilTestServer.java

@@ -13,13 +13,7 @@
 import java.sql.Statement;
 import java.util.Properties;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.RandomStringUtils;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.entity.BasicHttpEntity;
-import org.apache.http.impl.client.HttpClients;
 import org.apache.shiro.authc.credential.DefaultPasswordService;
 import org.apache.shiro.config.Ini;
 import org.apache.stanbol.commons.testing.jarexec.JarExecutor;
@@ -105,16 +99,16 @@ public static String getServerBaseUrl() {
 		return serverBaseUrl;
 	}
 
-	public static CloseableHttpResponse authenticate(String username, String password, HttpClientContext httpClientContext) throws Exception {
-		log.trace("Authenticating {}", username);
-		HttpPost post = new HttpPost(BasilTestServer.getServerBaseUrl() + "/basil/auth/login");
-		post.addHeader("Content-type", "application/json");
-		BasicHttpEntity e = new BasicHttpEntity();
-		e.setContent(IOUtils.toInputStream("{username: \"" + username + "\", password: \""
-				+ password + "\"}"));
-		post.setEntity(e);
-		return HttpClients.createDefault().execute(post, httpClientContext);
-	}
+//	public static CloseableHttpResponse authenticate(String username, String password, HttpClientContext httpClientContext) throws Exception {
+//		log.trace("Authenticating {}", username);
+//		HttpPost post = new HttpPost(BasilTestServer.getServerBaseUrl() + "/basil/auth/login");
+//		post.addHeader("Content-type", "application/json");
+//		BasicHttpEntity e = new BasicHttpEntity();
+//		e.setContent(IOUtils.toInputStream("{username: \"" + username + "\", password: \""
+//				+ password + "\"}"));
+//		post.setEntity(e);
+//		return HttpClients.createDefault().execute(post, httpClientContext);
+//	}
 
 	private static String createTestDb() throws Exception {
 		log.info("Creating test db (once only)");

it/src/test/java/uk/ac/open/kmi/basil/it/AuthenticatedTestBase.java

@@ -18,7 +18,7 @@ public static void beforeClass() throws Exception {
 		// Authenticate and remembered session cookie (in context)
 		context = HttpClientContext.create();
 		config = RequestConfig.custom().setCookieSpec(CookieSpecs.STANDARD).build();
-		BasilTestServer.authenticate(BasilTestServer.getBasilUser(), BasilTestServer.getBasilPassword(), context);
+		authenticator.authenticate(BasilTestServer.getServerBaseUrl(), BasilTestServer.getBasilUser(), BasilTestServer.getBasilPassword(), context);
 	}
 
 	@Override

it/src/test/java/uk/ac/open/kmi/basil/it/LoginLogoutTest.java

@@ -33,22 +33,22 @@ public void L2_Logout() throws Exception {
 	@Test
 	public void L3_LoginFailed() throws Exception {
 		log.info("#{}", name.getMethodName());
-		HttpResponse response = BasilTestServer.authenticate("xxxxxxxxx", BasilTestServer.getBasilPassword(), getClientContext());
+		HttpResponse response = authenticator.authenticate(BasilTestServer.getServerBaseUrl(), "xxxxxxxxx", BasilTestServer.getBasilPassword(), getClientContext());
 		Assert.assertTrue(response.getStatusLine().getStatusCode() == 403);
 	}
 
 	@Test
 	public void L4_LoginFailed() throws Exception {
 		log.info("#{}", name.getMethodName());
-		HttpResponse response = BasilTestServer.authenticate(BasilTestServer.getBasilUser(), "yyyyyyyy", getClientContext());
+		HttpResponse response = authenticator.authenticate(BasilTestServer.getServerBaseUrl(), BasilTestServer.getBasilUser(), "yyyyyyyy", getClientContext());
 		log.info("authenticated: {}", response.getStatusLine());
 		Assert.assertTrue(response.getStatusLine().getStatusCode() == 403);
 	}
 
 	@Test
 	public void L5_LoginFailed() throws Exception {
 		log.info("#{}", name.getMethodName());
-		HttpResponse response = BasilTestServer.authenticate("xxxxxxxxxxxx", "yyyyyyyy", getClientContext());
+		HttpResponse response = authenticator.authenticate(BasilTestServer.getServerBaseUrl(), "xxxxxxxxxxxx", "yyyyyyyy", getClientContext());
 		Assert.assertTrue(response.getStatusLine().getStatusCode() == 403);
 	}
 }