Factoring HTTP client for tests from variable into field for efficiency

fcrepo4-archive · Feb 6, 2013 · 39130f5 · 39130f5
1 parent 460a650
commit 39130f5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 29 deletions.
diff --git a/src/test/java/org/fcrepo/modeshape/FedoraDatastreamsTest.java b/src/test/java/org/fcrepo/modeshape/FedoraDatastreamsTest.java
@@ -26,11 +26,10 @@ public class FedoraDatastreamsTest {
 
 	final private Logger logger = LoggerFactory
 			.getLogger(FedoraDatastreamsTest.class);
+	final private HttpClient client = new HttpClient();
 
 	@Test
 	public void testGetDatastreams() throws Exception {
-		HttpClient client = new HttpClient();
-
 		PostMethod pmethod = new PostMethod("http://localhost:" + SERVER_PORT
 				+ "/objects/asdf");
 		client.executeMethod(pmethod);
@@ -43,9 +42,6 @@ public void testGetDatastreams() throws Exception {
 
 	@Test
 	public void testAddDatastream() throws Exception {
-
-		HttpClient client = new HttpClient();
-
 		PostMethod pmethod = new PostMethod("http://localhost:" + SERVER_PORT
 				+ "/objects/asdf");
 		client.executeMethod(pmethod);
@@ -58,9 +54,6 @@ public void testAddDatastream() throws Exception {
 
 	@Test
 	public void testMutateDatastream() throws Exception {
-
-		HttpClient client = new HttpClient();
-
 		PostMethod createObjectMethod = new PostMethod("http://localhost:"
 				+ SERVER_PORT + "/objects/asdf2");
 		Integer status = client.executeMethod(createObjectMethod);
@@ -91,9 +84,6 @@ public void testMutateDatastream() throws Exception {
 
 	@Test
 	public void testGetDatastream() throws Exception {
-
-		HttpClient client = new HttpClient();
-
 		PostMethod pmethod = new PostMethod("http://localhost:" + SERVER_PORT
 				+ "/objects/asdf");
 		client.executeMethod(pmethod);
@@ -116,9 +106,6 @@ public void testGetDatastream() throws Exception {
 
 	@Test
 	public void testDeleteDatastream() throws Exception {
-
-		HttpClient client = new HttpClient();
-
 		PostMethod pmethod = new PostMethod("http://localhost:" + SERVER_PORT
 				+ "/objects/asdf");
 		client.executeMethod(pmethod);
@@ -146,8 +133,6 @@ public void testDeleteDatastream() throws Exception {
 
 	@Test
 	public void testGetDatastreamContent() throws Exception {
-		final HttpClient client = new HttpClient();
-
 		final PostMethod pmethod = new PostMethod("http://localhost:"
 				+ SERVER_PORT + "/objects/testfoo");
 		client.executeMethod(pmethod);

diff --git a/src/test/java/org/fcrepo/modeshape/FedoraIdentifiersTest.java b/src/test/java/org/fcrepo/modeshape/FedoraIdentifiersTest.java
@@ -28,9 +28,10 @@ public class FedoraIdentifiersTest {
 
 	int SERVER_PORT = 9999;
 
+	final private HttpClient client = new HttpClient();
+
 	@Test
 	public void testGetNextPidResponds() throws Exception {
-		HttpClient client = new HttpClient();
 		PostMethod method = new PostMethod("http://localhost:" + SERVER_PORT
 				+ "/nextPID");
 		method.addRequestHeader("Accepts", "text/xml");
@@ -41,7 +42,6 @@ public void testGetNextPidResponds() throws Exception {
 
 	@Test
 	public void testGetNextHasAPid() throws HttpException, IOException {
-		HttpClient client = new HttpClient();
 		PostMethod method = new PostMethod("http://localhost:" + SERVER_PORT
 				+ "/nextPID?numPids=1");
 		method.addRequestHeader("Accepts", "text/xml");
@@ -55,7 +55,6 @@ public void testGetNextHasAPid() throws HttpException, IOException {
 
 	@Test
 	public void testGetNextHasTwoPids() throws HttpException, IOException {
-		HttpClient client = new HttpClient();
 		PostMethod method = new PostMethod("http://localhost:" + SERVER_PORT
 				+ "/nextPID?numPids=2");
 		method.addRequestHeader("Accepts", "text/xml");

diff --git a/src/test/java/org/fcrepo/modeshape/FedoraObjectsTest.java b/src/test/java/org/fcrepo/modeshape/FedoraObjectsTest.java
@@ -16,10 +16,11 @@
 public class FedoraObjectsTest {
 
 	int SERVER_PORT = 9999;
-
+
+	final private HttpClient client = new HttpClient();
+
 	@Test
 	public void testIngest() throws Exception {
-		HttpClient client = new HttpClient();
 		PostMethod method = new PostMethod("http://localhost:" + SERVER_PORT
 				+ "/objects/asdf");
 		int status = client.executeMethod(method);
@@ -28,7 +29,6 @@ public void testIngest() throws Exception {
 
 	@Test
 	public void testGetObjectInXML() throws Exception {
-		HttpClient client = new HttpClient();
 		PostMethod pmethod = new PostMethod("http://localhost:" + SERVER_PORT
 				+ "/objects/fdsa");
 		client.executeMethod(pmethod);
@@ -41,7 +41,6 @@ public void testGetObjectInXML() throws Exception {
 
 	@Test
 	public void testDeleteObject() throws Exception {
-		HttpClient client = new HttpClient();
 		PostMethod pmethod = new PostMethod("http://localhost:" + SERVER_PORT
 				+ "/objects/asdf");
 		client.executeMethod(pmethod);

diff --git a/src/test/java/org/fcrepo/modeshape/FedoraRepositoryTest.java b/src/test/java/org/fcrepo/modeshape/FedoraRepositoryTest.java
@@ -23,9 +23,10 @@ public class FedoraRepositoryTest {
 	final private Logger logger = LoggerFactory
 			.getLogger(FedoraRepositoryTest.class);
 
+	final private HttpClient client = new HttpClient();
+
 	@Test
 	public void testDescribeModeshape() throws Exception {
-		HttpClient client = new HttpClient();
 		GetMethod method = new GetMethod("http://localhost:" + SERVER_PORT
 				+ "/describe/modeshape");
 		int status = client.executeMethod(method);
@@ -34,7 +35,6 @@ public void testDescribeModeshape() throws Exception {
 
 	@Test
 	public void testGetObjects() throws Exception {
-		HttpClient client = new HttpClient();
 		GetMethod method = new GetMethod("http://localhost:" + SERVER_PORT
 				+ "/objects");
 		int status = client.executeMethod(method);
@@ -43,16 +43,16 @@ public void testGetObjects() throws Exception {
 
 	@Test
 	public void testDescribe() throws Exception {
-		HttpClient client = new HttpClient();
 		GetMethod method = new GetMethod("http://localhost:" + SERVER_PORT
 				+ "/describe");
 		method.addRequestHeader("Accept", TEXT_XML);
 		int status = client.executeMethod(method);
 		assertEquals(200, status);
 		final String description = method.getResponseBodyAsString();
 		logger.debug("Found a repository description:\n" + description);
-		assertTrue("Failed to find a proper repo versiom",
-				compile("<repositoryVersion>.*?</repositoryVersion>")
-						.matcher(description).find());
+		assertTrue(
+				"Failed to find a proper repo versiom",
+				compile("<repositoryVersion>.*?</repositoryVersion>").matcher(
+						description).find());
 	}
 }