First batch of test cleanup

fcrepo · Jul 5, 2013 · ce81393 · ce81393
1 parent c7fa3bf
commit ce81393
Show file tree

Hide file tree

Showing 30 changed files with 1,178 additions and 1,091 deletions.
diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/utils/FedoraTypesUtils.java b/fcrepo-kernel/src/main/java/org/fcrepo/utils/FedoraTypesUtils.java
diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/DatastreamTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/DatastreamTest.java
@@ -16,6 +16,7 @@
 
 package org.fcrepo;
 
+import static org.fcrepo.Datastream.hasMixin;
 import static org.fcrepo.utils.FedoraTypesUtils.getBinary;
 import static org.fcrepo.utils.TestHelpers.checksumString;
 import static org.fcrepo.utils.TestHelpers.getContentNodeMock;
@@ -28,9 +29,11 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.mockito.MockitoAnnotations.initMocks;
 import static org.modeshape.jcr.api.JcrConstants.JCR_CONTENT;
 import static org.modeshape.jcr.api.JcrConstants.JCR_DATA;
 import static org.modeshape.jcr.api.JcrConstants.JCR_MIME_TYPE;
+import static org.powermock.api.mockito.PowerMockito.mockStatic;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -55,9 +58,9 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
-import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
@@ -67,24 +70,25 @@
 @PrepareForTest({FedoraTypesUtils.class})
 public class DatastreamTest implements FedoraJcrTypes {
 
-    String testPid = "testObj";
-
-    String testDsId = "testDs";
+    private static final String testDsId = "testDs";
 
     Datastream testObj;
 
+    @Mock
     Session mockSession;
 
+    @Mock
     Node mockRootNode;
 
+    @Mock
     Node mockDsNode;
 
+    @Mock
+    ValueFactory mockVF;
+
     @Before
     public void setUp() {
-
-        mockSession = mock(Session.class);
-        mockRootNode = mock(Node.class);
-        mockDsNode = mock(Node.class);
+        initMocks(this);
         final NodeType[] nodeTypes = new NodeType[0];
         try {
             when(mockDsNode.getMixinNodeTypes()).thenReturn(nodeTypes);
@@ -125,13 +129,12 @@ public void testSetContent() throws RepositoryException,
         final org.modeshape.jcr.api.Binary mockBin =
                 mock(org.modeshape.jcr.api.Binary.class);
         final InputStream mockStream = mock(InputStream.class);
-        PowerMockito.mockStatic(FedoraTypesUtils.class);
+        mockStatic(FedoraTypesUtils.class);
         when(
                 getBinary(any(Node.class), any(InputStream.class),
                         any(String.class))).thenReturn(mockBin);
         final Node mockContent = getContentNodeMock(8);
         when(mockDsNode.getNode(JCR_CONTENT)).thenReturn(mockContent);
-        final ValueFactory mockVF = mock(ValueFactory.class);
         when(mockSession.getValueFactory()).thenReturn(mockVF);
         when(mockVF.createBinary(any(InputStream.class))).thenReturn(mockBin);
         final Property mockData = mock(Property.class);
@@ -149,14 +152,12 @@ public void testSetContentWithChecksumMismatch()
         final org.modeshape.jcr.api.Binary mockBin =
                 mock(org.modeshape.jcr.api.Binary.class);
         final InputStream mockStream = mock(InputStream.class);
-        PowerMockito.mockStatic(FedoraTypesUtils.class);
+        mockStatic(FedoraTypesUtils.class);
         when(
-                FedoraTypesUtils.getBinary(any(Node.class),
-                        any(InputStream.class), any(String.class))).thenReturn(
-                mockBin);
+                getBinary(any(Node.class), any(InputStream.class),
+                        any(String.class))).thenReturn(mockBin);
         final Node mockContent = getContentNodeMock(8);
         when(mockDsNode.getNode(JCR_CONTENT)).thenReturn(mockContent);
-        final ValueFactory mockVF = mock(ValueFactory.class);
         when(mockSession.getValueFactory()).thenReturn(mockVF);
         when(mockVF.createBinary(any(InputStream.class))).thenReturn(mockBin);
         final Property mockData = mock(Property.class);
@@ -291,8 +292,8 @@ public void testHasMixin() throws RepositoryException {
         final NodeType[] types = new NodeType[] {mockYes};
         final Node test = mock(Node.class);
         when(test.getMixinNodeTypes()).thenReturn(types);
-        assertEquals(true, Datastream.hasMixin(test));
+        assertEquals(true, hasMixin(test));
         types[0] = mockNo;
-        assertEquals(false, Datastream.hasMixin(test));
+        assertEquals(false, hasMixin(test));
     }
 }
diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/FedoraObjectTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/FedoraObjectTest.java
@@ -13,14 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.fcrepo;
 
+import static org.fcrepo.services.ServiceHelpers.getObjectSize;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.mockito.MockitoAnnotations.initMocks;
+import static org.powermock.api.mockito.PowerMockito.mockStatic;
 
 import java.util.Calendar;
 import java.util.Collection;
@@ -38,7 +42,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
+import org.mockito.Mock;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
@@ -50,33 +54,35 @@
 @PrepareForTest({ServiceHelpers.class})
 public class FedoraObjectTest implements FedoraJcrTypes {
 
-    String testPid = "testObj";
+    private static final String testPid = "testObj";
+
+    private static final String mockUser = "mockUser";
+
+    @Mock
+    private Session mockSession;
 
-    String mockUser = "mockUser";
+    @Mock
+    private Node mockRootNode;
 
-    Session mockSession;
+    @Mock
+    private Node mockObjNode;
 
-    Node mockRootNode;
+    @Mock
+    private Property mockProp;
 
-    Node mockObjNode;
+    @Mock
+    private Predicate<Node> mockPredicate;
 
-    FedoraObject testFedoraObject;
+    private FedoraObject testFedoraObject;
 
-    NodeType[] mockNodetypes;
+    private NodeType[] mockNodetypes;
 
     @Before
     public void setUp() throws LoginException, RepositoryException {
+        initMocks(this);
         final String relPath = "/" + testPid;
-
-        mockSession = mock(Session.class);
-        mockRootNode = mock(Node.class);
-        mockObjNode = mock(Node.class);
-        NodeType[] types = new NodeType[0];
-        @SuppressWarnings("unchecked")
-        final Predicate<Node> mockPredicate = mock(Predicate.class);
-
+        final NodeType[] types = new NodeType[0];
         try {
-
             when(mockObjNode.getName()).thenReturn(testPid);
             when(mockObjNode.getSession()).thenReturn(mockSession);
             when(mockObjNode.getMixinNodeTypes()).thenReturn(types);
@@ -119,7 +125,6 @@ public void testGetNode() {
 
     @Test
     public void testGetCreated() throws RepositoryException {
-        final Property mockProp = mock(Property.class);
         when(mockProp.getDate()).thenReturn(Calendar.getInstance());
         when(mockObjNode.hasProperty(JCR_CREATED)).thenReturn(true);
         when(mockObjNode.getProperty(JCR_CREATED)).thenReturn(mockProp);
@@ -129,7 +134,6 @@ public void testGetCreated() throws RepositoryException {
 
     @Test
     public void testGetLastModified() throws RepositoryException {
-        final Property mockProp = mock(Property.class);
         when(mockObjNode.hasProperty(JCR_LASTMODIFIED)).thenReturn(true);
         when(mockObjNode.getProperty(JCR_LASTMODIFIED)).thenReturn(mockProp);
         when(mockProp.getDate()).thenReturn(Calendar.getInstance());
@@ -139,9 +143,9 @@ public void testGetLastModified() throws RepositoryException {
 
     @Test
     public void testGetSize() throws RepositoryException {
-        PowerMockito.mockStatic(ServiceHelpers.class);
+        mockStatic(ServiceHelpers.class);
         // obviously not a real value
-        when(ServiceHelpers.getObjectSize(mockObjNode)).thenReturn(-8L);
+        when(getObjectSize(mockObjNode)).thenReturn(-8L);
         final long actual = testFedoraObject.getSize();
         assertEquals(-8, actual);
     }

diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/FedoraResourceTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/FedoraResourceTest.java
@@ -35,6 +35,7 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.mockito.MockitoAnnotations.initMocks;
 import static org.modeshape.jcr.api.JcrConstants.JCR_CONTENT;
 import static org.powermock.api.mockito.PowerMockito.mockStatic;
 
@@ -58,6 +59,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.modeshape.common.collection.Problems;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -76,26 +78,29 @@
         FedoraTypesUtils.class})
 public class FedoraResourceTest {
 
-    FedoraResource testObj;
+    private FedoraResource testObj;
 
-    Node mockNode;
+    @Mock
+    private Node mockNode;
 
-    Node mockRoot;
+    @Mock
+    private Node mockRoot;
 
-    Session mockSession;
+    @Mock
+    private Session mockSession;
+
+    @Mock
+    private Property mockProp;
 
     @Before
     public void setUp() {
-        mockSession = mock(Session.class);
-        mockNode = mock(Node.class);
+        initMocks(this);
         testObj = new FedoraResource(mockNode);
         assertEquals(mockNode, testObj.getNode());
     }
 
     @Test
     public void testPathConstructor() throws RepositoryException {
-        final Node mockNode = mock(Node.class);
-        final Node mockRoot = mock(Node.class);
         when(mockSession.getRootNode()).thenReturn(mockRoot);
         when(mockRoot.getNode("foo/bar")).thenReturn(mockNode);
         when(mockNode.isNew()).thenReturn(true);
@@ -131,7 +136,6 @@ public void testHasContent() throws RepositoryException {
 
     @Test
     public void testGetCreatedDate() throws RepositoryException {
-        final Property mockProp = mock(Property.class);
         final Calendar someDate = Calendar.getInstance();
         when(mockProp.getDate()).thenReturn(someDate);
         when(mockNode.hasProperty(JCR_CREATED)).thenReturn(true);
@@ -147,7 +151,6 @@ public void testGetLastModifiedDateDefault() throws RepositoryException {
         someDate.add(Calendar.DATE, -1);
         try {
             when(mockNode.hasProperty(JCR_LASTMODIFIED)).thenReturn(false);
-            final Property mockProp = mock(Property.class);
             when(mockProp.getDate()).thenReturn(someDate);
             when(mockNode.hasProperty(JCR_CREATED)).thenReturn(true);
             when(mockNode.getProperty(JCR_CREATED)).thenReturn(mockProp);
@@ -167,7 +170,6 @@ public void testGetLastModifiedDate() throws RepositoryException {
         final Calendar someDate = Calendar.getInstance();
         someDate.add(Calendar.DATE, -1);
         try {
-            final Property mockProp = mock(Property.class);
             when(mockProp.getDate()).thenReturn(someDate);
             when(mockNode.hasProperty(JCR_CREATED)).thenReturn(true);
             when(mockNode.getProperty(JCR_CREATED)).thenReturn(mockProp);

diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/TransactionTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/TransactionTest.java
@@ -19,10 +19,10 @@
 import static java.lang.System.currentTimeMillis;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.mockito.MockitoAnnotations.initMocks;
 
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
@@ -33,16 +33,18 @@
 import static org.fcrepo.Transaction.State.COMMITED;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mock;
 
 public class TransactionTest {
 
     private Transaction testObj;
 
+    @Mock
     private Session mockSession;
 
     @Before
     public void setUp() {
-        mockSession = mock(Session.class);
+        initMocks(this);
         testObj = new Transaction(mockSession);
     }
 

diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/TxAwareSessionTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/TxAwareSessionTest.java
@@ -23,23 +23,26 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.mockito.MockitoAnnotations.initMocks;
 
 import javax.jcr.Credentials;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mock;
 
 public class TxAwareSessionTest {
 
+    @Mock
     private Session mockSession;
 
     private Session testObj;
 
     @Before
     public void setUp() {
-        mockSession = mock(Session.class);
+        initMocks(this);
         testObj = newInstance(mockSession, "txid");
 
     }

diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/identifiers/UUIDPathMinterTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/identifiers/UUIDPathMinterTest.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.fcrepo.identifiers;
 
 import static java.util.regex.Pattern.compile;
@@ -22,16 +23,16 @@
 
 public class UUIDPathMinterTest {
 
+    private static final String PID_PATTERN =
+            "[a-f0-9]{3}/[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}";
+
     @Test
     public void testMintPid() throws Exception {
 
-        final PidMinter pidMinter = new UUIDPathMinter(3, 1);
-
-        final String pid = pidMinter.mintPid();
+        final String pid = new UUIDPathMinter(3, 1).mintPid();
 
-        assertTrue("PID wasn't a UUID path", compile(
-                "[a-f0-9]{3}/[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}")
-                .matcher(pid).find());
+        assertTrue("PID wasn't a UUID path", compile(PID_PATTERN).matcher(pid)
+                .find());
 
     }
 }