Navigation Menu

Skip to content

Commit

Permalink
Removed setters that were only used in tests, added Testhelper mathod…
Browse files Browse the repository at this point in the history 
… to set fields via reflection and changed the tests to use the new method
  • Loading branch information
@fasseg @cbeer
fasseg authored and cbeer committed Jun 27, 2013
1 parent 1fef850 commit 8f432df
Show file tree
Hide file tree
Showing 36 changed files with 172 additions and 273 deletions.
4 changes: 0 additions & 4 deletions fcrepo-generator-dc/src/main/java/org/fcrepo/generator/DublinCoreGenerator.java
View file
Expand Up @@ -77,8 +77,4 @@ public Response getObjectAsDublinCore(

}

public void setSession(final Session session) {
this.session = session;
}

}
8 changes: 4 additions & 4 deletions fcrepo-generator-dc/src/test/java/org/fcrepo/generator/DublinCoreGeneratorTest.java
View file
Expand Up @@ -48,13 +48,13 @@ public class DublinCoreGeneratorTest {
Session mockSession;

@Before
public void setUp() throws RepositoryException {
public void setUp() throws RepositoryException, NoSuchFieldException {
mockNodeService = mock(NodeService.class);
testObj = new DublinCoreGenerator();
testObj.setNodeService(mockNodeService);
TestHelpers.setField(testObj, "nodeService", mockNodeService);

mockSession = TestHelpers.mockSession(testObj);
testObj.setSession(mockSession);
mockSession = TestHelpers.mockSession(testObj);
TestHelpers.setField(testObj, "session", mockSession);
mockGenerator = mock(DCGenerator.class);
testObj.dcgenerators = Arrays.asList(mockGenerator);
}
Expand Down
4 changes: 0 additions & 4 deletions fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraContent.java
View file
Expand Up @@ -228,8 +228,4 @@ public Response getContent(@PathParam("path")
}
}

public void setSession(final Session session) {
this.session = session;
}

}
4 changes: 0 additions & 4 deletions fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraDatastreams.java
View file
Expand Up @@ -266,8 +266,4 @@ public Response getDatastreamsContents(@PathParam("path")
session.logout();
}
}

public void setSession(final Session session) {
this.session = session;
}
}
12 changes: 2 additions & 10 deletions fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraExport.java
View file
Expand Up @@ -21,6 +21,7 @@
import java.io.IOException;
import java.io.OutputStream;
import java.util.List;

import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.ws.rs.DefaultValue;
Expand All @@ -36,9 +37,9 @@
import org.fcrepo.AbstractResource;
import org.fcrepo.serialization.FedoraObjectSerializer;
import org.fcrepo.serialization.SerializerUtil;
import org.fcrepo.session.InjectedSession;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.fcrepo.session.InjectedSession;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;

Expand Down Expand Up @@ -93,13 +94,4 @@ public void write(final OutputStream out)
}).build();

}

public void setSerializers(final SerializerUtil serializers) {
this.serializers = serializers;
}

public void setSession(final Session session) {
this.session = session;
}

}
5 changes: 0 additions & 5 deletions fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraFieldSearch.java
View file
Expand Up @@ -151,9 +151,4 @@ private Dataset getSearchDataset(final String terms, final long offset,
session.logout();
}
}

public void setSession(final Session session) {
this.session = session;
}

}
5 changes: 0 additions & 5 deletions fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraFixity.java
View file
Expand Up @@ -82,9 +82,4 @@ public Dataset getDatastreamFixity(@PathParam("path")
session.logout();
}
}

public void setSession(final Session session) {
this.session = session;
}

}
7 changes: 1 addition & 6 deletions fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraIdentifiers.java
View file
Expand Up @@ -61,7 +61,7 @@

/**
* JAX-RS Resource offering PID creation.
*
*
* @author ajs6f
* @author cbeer
*/
Expand Down Expand Up @@ -118,9 +118,4 @@ public Dataset getNextPid(@PathParam("path")
return create(model).toDataset();

}

public void setSession(final Session session) {
this.session = session;
}

}
9 changes: 1 addition & 8 deletions fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraImport.java
View file
Expand Up @@ -24,6 +24,7 @@
import java.net.URI;
import java.net.URISyntaxException;
import java.util.List;

import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.ws.rs.DefaultValue;
Expand Down Expand Up @@ -85,12 +86,4 @@ public Response importObject(@PathParam("path")
session.logout();
}
}

public void setSerializers(final SerializerUtil serializers) {
this.serializers = serializers;
}

public void setSession(final Session session) {
this.session = session;
}
}
9 changes: 2 additions & 7 deletions fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraNodes.java
View file
Expand Up @@ -251,7 +251,7 @@ public Response updateSparql(@PathParam("path")

/**
* Creates a new object.
*
*
* @param pathList
* @return 201
* @throws RepositoryException
Expand Down Expand Up @@ -295,7 +295,7 @@ public Response createObject(@PathParam("path")

/**
* Deletes an object.
*
*
* @param path
* @return
* @throws RepositoryException
Expand All @@ -313,9 +313,4 @@ public Response deleteObject(@PathParam("path")
session.logout();
}
}

public void setSession(final Session session) {
this.session = session;
}

}
5 changes: 0 additions & 5 deletions fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraSitemap.java
View file
Expand Up @@ -154,9 +154,4 @@ private SitemapEntry getSitemapEntry(final Row r)
return new SitemapEntry(uriInfo.getBaseUriBuilder().path(
FedoraNodes.class).build(path.substring(1)), lastKnownDate);
}

public void setSession(final Session session) {
this.session = session;
}

}
7 changes: 0 additions & 7 deletions fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraTransactions.java
View file
Expand Up @@ -116,11 +116,4 @@ public Response rollback(@PathParam("path")
}
}

public void setSession(final Session session) {
this.session = session;
}

public void setTxService(final TransactionService txService) {
this.txService = txService;
}
}
5 changes: 0 additions & 5 deletions fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraUnnamedObjects.java
View file
Expand Up @@ -113,9 +113,4 @@ public Response ingestAndMint(@PathParam("path")
session.logout();
}
}

public void setSession(final Session session) {
this.session = session;
}

}
4 changes: 0 additions & 4 deletions fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraVersions.java
View file
Expand Up @@ -142,8 +142,4 @@ public Dataset getVersion(@PathParam("path")
}

}

public void setSession(final Session session) {
this.session = session;
}
}
1 change: 1 addition & 0 deletions fcrepo-http-api/src/main/java/org/fcrepo/api/repository/FedoraRepositoryImport.java
View file
Expand Up @@ -18,6 +18,7 @@

import javax.jcr.Session;
import javax.ws.rs.Path;

import org.fcrepo.api.FedoraImport;
import org.fcrepo.session.InjectedSession;
import org.springframework.context.annotation.Scope;
Expand Down
15 changes: 7 additions & 8 deletions fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraContentTest.java
View file
Expand Up @@ -31,7 +31,6 @@
import java.net.URISyntaxException;
import java.util.Date;

import javax.jcr.LoginException;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
Expand Down Expand Up @@ -64,16 +63,16 @@ public class FedoraContentTest {
Session mockSession;

@Before
public void setUp() throws LoginException, RepositoryException {
public void setUp() throws Exception {
mockDatastreams = mock(DatastreamService.class);
mockNodeService = mock(NodeService.class);

testObj = new FedoraContent();
testObj.setDatastreamService(mockDatastreams);
testObj.setNodeService(mockNodeService);
TestHelpers.setField(testObj, "datastreamService", mockDatastreams);
TestHelpers.setField(testObj, "nodeService", mockNodeService);
TestHelpers.setField(testObj, "uriInfo", TestHelpers.getUriInfoImpl());
mockSession = TestHelpers.mockSession(testObj);
testObj.setSession(mockSession);
testObj.setUriInfo(TestHelpers.getUriInfoImpl());
TestHelpers.setField(testObj, "session", mockSession);
}

@After
Expand Down Expand Up @@ -143,7 +142,7 @@ public void testCreateContent() throws RepositoryException, IOException,

@Test
public void testCreateContentAtMintedPath() throws RepositoryException,
IOException, InvalidChecksumException, URISyntaxException {
IOException, InvalidChecksumException, URISyntaxException, NoSuchFieldException {
final String pid = "FedoraDatastreamsTest1";
final String dsId = "fcr:new";
final String dsContent = "asdf";
Expand All @@ -153,7 +152,7 @@ public void testCreateContentAtMintedPath() throws RepositoryException,

PidMinter mockMinter = mock(PidMinter.class);
when(mockMinter.mintPid()).thenReturn("xyz");
testObj.setPidMinter(mockMinter);
TestHelpers.setField(testObj, "pidMinter", mockMinter);
when(mockNode.isNew()).thenReturn(true);
Node mockContentNode = mock(Node.class);
when(mockNode.getNode(JcrConstants.JCR_CONTENT)).thenReturn(
Expand Down
16 changes: 7 additions & 9 deletions fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraDatastreamsTest.java
View file
Expand Up @@ -37,7 +37,6 @@
import java.util.List;
import java.util.Map;

import javax.jcr.LoginException;
import javax.jcr.Node;
import javax.jcr.NodeIterator;
import javax.jcr.RepositoryException;
Expand All @@ -47,8 +46,6 @@
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;

import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.file.StreamDataBodyPart;
import org.apache.commons.io.IOUtils;
import org.fcrepo.Datastream;
import org.fcrepo.FedoraResource;
Expand All @@ -60,7 +57,9 @@
import org.junit.Before;
import org.junit.Test;

import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.MultiPart;
import com.sun.jersey.multipart.file.StreamDataBodyPart;

public class FedoraDatastreamsTest {

Expand All @@ -73,17 +72,16 @@ public class FedoraDatastreamsTest {
Session mockSession;

@Before
public void setUp() throws LoginException, RepositoryException {
public void setUp() throws Exception {
mockDatastreams = mock(DatastreamService.class);
mockNodes = mock(NodeService.class);

testObj = new FedoraDatastreams();
testObj.setNodeService(mockNodes);
testObj.setDatastreamService(mockDatastreams);

TestHelpers.setField(testObj, "datastreamService", mockDatastreams);
TestHelpers.setField(testObj, "nodeService", mockNodes);
TestHelpers.setField(testObj, "uriInfo", TestHelpers.getUriInfoImpl());
mockSession = TestHelpers.mockSession(testObj);
testObj.setSession(mockSession);
testObj.setUriInfo(TestHelpers.getUriInfoImpl());
TestHelpers.setField(testObj, "session", mockSession);
}

@After
Expand Down
11 changes: 6 additions & 5 deletions fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraExportTest.java
View file
Expand Up @@ -52,7 +52,7 @@ public class FedoraExportTest {
ObjectService mockObjects;

@Before
public void setUp() throws RepositoryException {
public void setUp() throws Exception {

testObj = new FedoraExport();

Expand All @@ -62,10 +62,11 @@ public void setUp() throws RepositoryException {
when(mockSerializers.getSerializer("fake-format")).thenReturn(
mockSerializer);
mockObjects = mock(ObjectService.class);
testObj.setSerializers(mockSerializers);
testObj.setObjectService(mockObjects);
testObj.setSession(mockSession);
testObj.setUriInfo(TestHelpers.getUriInfoImpl());
TestHelpers.setField(testObj, "objectService", mockObjects);
TestHelpers.setField(testObj, "serializers", mockSerializers);
TestHelpers.setField(testObj, "uriInfo", TestHelpers.getUriInfoImpl());
mockSession = TestHelpers.mockSession(testObj);
TestHelpers.setField(testObj, "session", mockSession);
}

@Test
Expand Down
11 changes: 5 additions & 6 deletions fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraFieldSearchTest.java
View file
Expand Up @@ -27,7 +27,6 @@
import java.util.List;
import java.util.Map;

import javax.jcr.LoginException;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.ws.rs.core.MediaType;
Expand Down Expand Up @@ -57,14 +56,14 @@ public class FedoraFieldSearchTest {
private UriInfo uriInfo;

@Before
public void setUp() throws LoginException, RepositoryException {
public void setUp() throws Exception {
testObj = new FedoraFieldSearch();
mockSession = TestHelpers.mockSession(testObj);
uriInfo = TestHelpers.getUriInfoImpl();
testObj.setUriInfo(uriInfo);
mockNodeService = mock(NodeService.class);
testObj.setNodeService(mockNodeService);
testObj.setSession(mockSession);
this.uriInfo = TestHelpers.getUriInfoImpl();
TestHelpers.setField(testObj, "uriInfo", uriInfo);
TestHelpers.setField(testObj, "nodeService", mockNodeService);
TestHelpers.setField(testObj, "session", mockSession);
}

@After
Expand Down
13 changes: 5 additions & 8 deletions fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraFixityTest.java
View file
Expand Up @@ -25,7 +25,6 @@

import java.io.IOException;

import javax.jcr.LoginException;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
Expand Down Expand Up @@ -53,19 +52,17 @@ public class FedoraFixityTest {
private Request mockRequest;

@Before
public void setUp() throws LoginException, RepositoryException {
public void setUp() throws Exception {

mockRequest = mock(Request.class);
mockDatastreams = mock(DatastreamService.class);

testObj = new FedoraFixity();
testObj.setDatastreamService(mockDatastreams);

uriInfo = TestHelpers.getUriInfoImpl();
testObj.setUriInfo(uriInfo);

TestHelpers.setField(testObj, "datastreamService", mockDatastreams);
this.uriInfo = TestHelpers.getUriInfoImpl();
TestHelpers.setField(testObj, "uriInfo", uriInfo);
mockSession = TestHelpers.mockSession(testObj);
testObj.setSession(mockSession);
TestHelpers.setField(testObj, "session", mockSession);
}

@After
Expand Down

0 comments on commit 8f432df

Please sign in to comment.