[dna-commits] DNA SVN: r255 - trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation.

[dna-commits at lists.jboss.org]

Author: rhauch
Date: 2008-06-10 17:15:46 -0400 (Tue, 10 Jun 2008)
New Revision: 255

Modified:
   trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedRepositoryConnectionTest.java
   trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedRepositorySourceTest.java
   trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedSourceTest.java
Log:
Cleaned up usage of Mockito.

Modified: trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedRepositoryConnectionTest.java
===================================================================
--- trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedRepositoryConnectionTest.java	2008-06-10 21:08:58 UTC (rev 254)
+++ trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedRepositoryConnectionTest.java	2008-06-10 21:15:46 UTC (rev 255)
@@ -38,6 +38,8 @@
 import org.jboss.dna.spi.graph.connection.RepositorySourceListener;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.MockitoAnnotations;
+import org.mockito.MockitoAnnotations.Mock;
 
 /**
  * @author Randall Hauch
@@ -45,21 +47,22 @@
 public class FederatedRepositoryConnectionTest {
 
     private FederatedRepositoryConnection connection;
+    private String sourceName;
+    @Mock
     private FederatedRepositorySource source;
+    @Mock
     private FederatedRepository repository;
-    private String sourceName;
+    @Mock
     private CachePolicy defaultCachePolicy;
+    @Mock
     private ServiceAdministrator repositoryAdmin;
 
     @Before
     public void beforeEach() throws Exception {
+        MockitoAnnotations.initMocks(this);
         sourceName = "Source X";
-        source = mock(FederatedRepositorySource.class);
         stub(source.getName()).toReturn(sourceName);
-        repository = mock(FederatedRepository.class);
-        defaultCachePolicy = mock(CachePolicy.class);
         stub(repository.getDefaultCachePolicy()).toReturn(defaultCachePolicy);
-        repositoryAdmin = mock(ServiceAdministrator.class);
         stub(repository.getAdministrator()).toReturn(repositoryAdmin);
         connection = new FederatedRepositoryConnection(repository, source);
     }

Modified: trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedRepositorySourceTest.java
===================================================================
--- trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedRepositorySourceTest.java	2008-06-10 21:08:58 UTC (rev 254)
+++ trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedRepositorySourceTest.java	2008-06-10 21:15:46 UTC (rev 255)
@@ -41,6 +41,8 @@
 import org.jboss.dna.spi.graph.connection.RepositorySourceException;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.MockitoAnnotations;
+import org.mockito.MockitoAnnotations.Mock;
 
 /**
  * @author Randall Hauch
@@ -49,7 +51,9 @@
 
     private FederatedRepositorySource source;
     private FederatedRepositoryConnection connection;
+    @Mock
     private FederatedRepository repository;
+    @Mock
     private FederationService service;
     private String repositoryName;
     private String username;
@@ -60,10 +64,9 @@
      */
     @Before
     public void beforeEach() throws Exception {
+        MockitoAnnotations.initMocks(this);
         this.repositoryName = "Test Repository";
-        this.service = mock(FederationService.class);
         this.source = new FederatedRepositorySource(service, repositoryName);
-        this.repository = mock(FederatedRepository.class);
         this.username = "valid username";
         this.credentials = "valid password";
         this.source.setUsername(username);

Modified: trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedSourceTest.java
===================================================================
--- trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedSourceTest.java	2008-06-10 21:08:58 UTC (rev 254)
+++ trunk/dna-repository/src/test/java/org/jboss/dna/repository/federation/FederatedSourceTest.java	2008-06-10 21:15:46 UTC (rev 255)
@@ -21,7 +21,6 @@
  */
 package org.jboss.dna.repository.federation;
 
-import java.util.concurrent.TimeUnit;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsNull.notNullValue;
 import static org.junit.Assert.assertThat;
@@ -29,6 +28,7 @@
 import static org.mockito.Mockito.stub;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import java.util.concurrent.TimeUnit;
 import org.jboss.dna.spi.graph.connection.RepositoryConnection;
 import org.jboss.dna.spi.graph.connection.RepositoryConnectionPool;
 import org.jboss.dna.spi.graph.connection.RepositorySource;
@@ -36,14 +36,18 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.MockitoAnnotations;
+import org.mockito.MockitoAnnotations.Mock;
 
 /**
  * @author Randall Hauch
  */
 public class FederatedSourceTest {
 
+    private FederatedSource source;
+    @Mock
     private RepositoryConnection connection;
-    private FederatedSource source;
+    @Mock
     private RepositorySource repositorySource;
 
     /**
@@ -51,6 +55,7 @@
      */
     @Before
     public void beforeEach() throws Exception {
+        MockitoAnnotations.initMocks(this);
         this.repositorySource = mock(RepositorySource.class);
         this.source = new FederatedSource(this.repositorySource);
         this.connection = mock(RepositoryConnection.class);