Merge branch 'MODE-1212' of https://github.com/bcarothers/modeshape i…

…nto bcarothers-MODE-1212
ModeShape · Jul 9, 2011 · a53b8d6 · a53b8d6
2 parents cd6369f + 93ee324
commit a53b8d6
Show file tree

Hide file tree

Showing 26 changed files with 289 additions and 517 deletions.
diff --git a/...-disk/src/test/java/org/modeshape/connector/disk/DiskConnectorDiscoverWorkspacesTest.java b/...-disk/src/test/java/org/modeshape/connector/disk/DiskConnectorDiscoverWorkspacesTest.java
@@ -10,10 +10,7 @@
 import org.modeshape.common.util.FileUtil;
 import org.modeshape.graph.ExecutionContext;
 import org.modeshape.graph.Graph;
-import org.modeshape.graph.Subgraph;
-import org.modeshape.graph.connector.RepositoryConnectionFactory;
-import org.modeshape.graph.connector.RepositoryContext;
-import org.modeshape.graph.observe.Observer;
+import org.modeshape.graph.connector.MockRepositoryContext;
 
 public class DiskConnectorDiscoverWorkspacesTest {
 
@@ -39,29 +36,7 @@ private Graph graphForNewSource() throws Exception {
         source.setName("Disk Source");
         source.setLargeValueSizeInBytes(LARGE_VALUE_THRESHOLD);
         source.setRepositoryRootPath(REPO_ROOT_PATH);
-        source.initialize(new RepositoryContext() {
-
-            @Override
-            public Subgraph getConfiguration( int depth ) {
-                return null;
-            }
-
-            @Override
-            public ExecutionContext getExecutionContext() {
-                return context;
-            }
-
-            @Override
-            public Observer getObserver() {
-                return null;
-            }
-
-            @Override
-            public RepositoryConnectionFactory getRepositoryConnectionFactory() {
-                return null;
-            }
-
-        });
+        source.initialize(new MockRepositoryContext(context));
 
         return Graph.create(source, context);
 

diff --git a/...onnector-disk/src/test/java/org/modeshape/connector/disk/DiskConnectorLargeValueTest.java b/...onnector-disk/src/test/java/org/modeshape/connector/disk/DiskConnectorLargeValueTest.java
@@ -18,10 +18,7 @@
 import org.modeshape.graph.ExecutionContext;
 import org.modeshape.graph.Graph;
 import org.modeshape.graph.Node;
-import org.modeshape.graph.Subgraph;
-import org.modeshape.graph.connector.RepositoryConnectionFactory;
-import org.modeshape.graph.connector.RepositoryContext;
-import org.modeshape.graph.observe.Observer;
+import org.modeshape.graph.connector.MockRepositoryContext;
 import org.modeshape.graph.property.Binary;
 import org.modeshape.graph.property.BinaryFactory;
 import org.modeshape.graph.property.basic.FileSystemBinary;
@@ -55,29 +52,7 @@ public void beforeEach() {
         source.setName("Disk Source");
         source.setLargeValueSizeInBytes(LARGE_VALUE_THRESHOLD);
         source.setRepositoryRootPath(REPO_ROOT_PATH);
-        source.initialize(new RepositoryContext() {
-
-            @Override
-            public Subgraph getConfiguration( int depth ) {
-                return null;
-            }
-
-            @Override
-            public ExecutionContext getExecutionContext() {
-                return context;
-            }
-
-            @Override
-            public Observer getObserver() {
-                return null;
-            }
-
-            @Override
-            public RepositoryConnectionFactory getRepositoryConnectionFactory() {
-                return null;
-            }
-
-        });
+        source.initialize(new MockRepositoryContext(context));
 
         largeValuePath = new File(repoRootPath, source.getLargeValuePath());
 
@@ -401,30 +376,7 @@ public void shouldAllowNestedLargeValuesPath() {
         source.setLargeValueSizeInBytes(LARGE_VALUE_THRESHOLD);
         source.setRepositoryRootPath(REPO_ROOT_PATH);
         source.setLargeValuePath("large/values");
-
-        source.initialize(new RepositoryContext() {
-
-            @Override
-            public Subgraph getConfiguration( int depth ) {
-                return null;
-            }
-
-            @Override
-            public ExecutionContext getExecutionContext() {
-                return context;
-            }
-
-            @Override
-            public Observer getObserver() {
-                return null;
-            }
-
-            @Override
-            public RepositoryConnectionFactory getRepositoryConnectionFactory() {
-                return null;
-            }
-
-        });
+        source.initialize(new MockRepositoryContext(context));
 
         graph = Graph.create(source, context);
 

diff --git a/...tor-filesystem/src/test/java/org/modeshape/connector/filesystem/FileSystemSourceTest.java b/...tor-filesystem/src/test/java/org/modeshape/connector/filesystem/FileSystemSourceTest.java
@@ -33,12 +33,9 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.modeshape.graph.ExecutionContext;
-import org.modeshape.graph.Subgraph;
+import org.modeshape.graph.connector.MockRepositoryContext;
 import org.modeshape.graph.connector.RepositoryConnection;
-import org.modeshape.graph.connector.RepositoryConnectionFactory;
-import org.modeshape.graph.connector.RepositoryContext;
 import org.modeshape.graph.connector.RepositorySourceException;
-import org.modeshape.graph.observe.Observer;
 
 /**
  * @author Randall Hauch
@@ -55,37 +52,7 @@ public void beforeEach() throws Exception {
         // Set the mandatory properties ...
         this.source.setName("Test Repository");
         this.source.setWorkspaceRootPath("target");
-        this.source.initialize(new RepositoryContext() {
-
-            @Override
-            public Subgraph getConfiguration( int depth ) {
-                return null;
-            }
-
-            @Override
-            public ExecutionContext getExecutionContext() {
-                return context;
-            }
-
-            @Override
-            public Observer getObserver() {
-                return null;
-            }
-
-            @Override
-            public RepositoryConnectionFactory getRepositoryConnectionFactory() {
-                return new RepositoryConnectionFactory() {
-
-                    @Override
-                    @SuppressWarnings( "synthetic-access" )
-                    public RepositoryConnection createConnection( String sourceName ) throws RepositorySourceException {
-                        return source.getConnection();
-                    }
-
-                };
-            }
-
-        });
+        this.source.initialize(new MockRepositoryContext(context, source));
     }
 
     @After

diff --git a/...or-infinispan/src/test/java/org/modeshape/connector/infinispan/InfinispanClusterTest.java b/...or-infinispan/src/test/java/org/modeshape/connector/infinispan/InfinispanClusterTest.java
@@ -14,14 +14,10 @@
 import org.modeshape.graph.ExecutionContext;
 import org.modeshape.graph.Graph;
 import org.modeshape.graph.Node;
-import org.modeshape.graph.Subgraph;
 import org.modeshape.graph.Workspace;
-import org.modeshape.graph.connector.RepositoryConnection;
-import org.modeshape.graph.connector.RepositoryConnectionFactory;
+import org.modeshape.graph.connector.MockRepositoryContext;
 import org.modeshape.graph.connector.RepositoryContext;
 import org.modeshape.graph.connector.RepositorySource;
-import org.modeshape.graph.connector.RepositorySourceException;
-import org.modeshape.graph.observe.Observer;
 import org.modeshape.graph.property.PathNotFoundException;
 
 /*
@@ -214,36 +210,6 @@ public void shouldDistributeGraphNodesUsingDynamicallyCreatedWorkspaces() {
     }
 
     private final RepositoryContext repositoryContextFor( final RepositorySource source ) {
-        return new RepositoryContext() {
-
-            @Override
-            public Subgraph getConfiguration( int depth ) {
-                return null;
-            }
-
-            @SuppressWarnings( "synthetic-access" )
-            @Override
-            public ExecutionContext getExecutionContext() {
-                return context;
-            }
-
-            @Override
-            public Observer getObserver() {
-                return null;
-            }
-
-            @Override
-            public RepositoryConnectionFactory getRepositoryConnectionFactory() {
-                return new RepositoryConnectionFactory() {
-
-                    @Override
-                    public RepositoryConnection createConnection( String sourceName ) throws RepositorySourceException {
-                        return source.getConnection();
-                    }
-
-                };
-            }
-
-        };
+        return new MockRepositoryContext(context, source);
     }
 }
diff --git a/...hape-connector-jcr/src/test/java/org/modeshape/connector/jcr/JcrRepositorySourceTest.java b/...hape-connector-jcr/src/test/java/org/modeshape/connector/jcr/JcrRepositorySourceTest.java
@@ -38,12 +38,9 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.modeshape.graph.ExecutionContext;
-import org.modeshape.graph.Subgraph;
+import org.modeshape.graph.connector.MockRepositoryContext;
 import org.modeshape.graph.connector.RepositoryConnection;
-import org.modeshape.graph.connector.RepositoryConnectionFactory;
-import org.modeshape.graph.connector.RepositoryContext;
 import org.modeshape.graph.connector.RepositorySourceException;
-import org.modeshape.graph.observe.Observer;
 
 public class JcrRepositorySourceTest {
 
@@ -71,37 +68,7 @@ public void beforeEach() throws Exception {
         this.source.setRepositoryJndiName(validRepositoryJndiName);
 
         // Initialize ...
-        this.source.initialize(new RepositoryContext() {
-
-            @Override
-            public Subgraph getConfiguration( int depth ) {
-                return null;
-            }
-
-            @Override
-            public ExecutionContext getExecutionContext() {
-                return context;
-            }
-
-            @Override
-            public Observer getObserver() {
-                return null;
-            }
-
-            @Override
-            public RepositoryConnectionFactory getRepositoryConnectionFactory() {
-                return new RepositoryConnectionFactory() {
-
-                    @Override
-                    @SuppressWarnings( "synthetic-access" )
-                    public RepositoryConnection createConnection( String sourceName ) throws RepositorySourceException {
-                        return source.getConnection();
-                    }
-
-                };
-            }
-
-        });
+        this.source.initialize(new MockRepositoryContext(context, source));
     }
 
     @After

diff --git a/...jpa/src/test/java/org/modeshape/connector/store/jpa/model/simple/SimpleJpaSourceTest.java b/...jpa/src/test/java/org/modeshape/connector/store/jpa/model/simple/SimpleJpaSourceTest.java
@@ -27,12 +27,8 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.modeshape.connector.store.jpa.JpaSource;
-import org.modeshape.graph.ExecutionContext;
-import org.modeshape.graph.Subgraph;
+import org.modeshape.graph.connector.MockRepositoryContext;
 import org.modeshape.graph.connector.RepositoryConnection;
-import org.modeshape.graph.connector.RepositoryConnectionFactory;
-import org.modeshape.graph.connector.RepositoryContext;
-import org.modeshape.graph.observe.Observer;
 
 public class SimpleJpaSourceTest {
 
@@ -53,31 +49,7 @@ public void beforeEach() {
         source.setShowSql(false);
         source.setAutoGenerateSchema("create");
 
-        source.initialize(new RepositoryContext() {
-
-            private final ExecutionContext context = new ExecutionContext();
-
-            @Override
-            public Subgraph getConfiguration( int depth ) {
-                return null;
-            }
-
-            @Override
-            public ExecutionContext getExecutionContext() {
-                return context;
-            }
-
-            @Override
-            public Observer getObserver() {
-                return null;
-            }
-
-            @Override
-            public RepositoryConnectionFactory getRepositoryConnectionFactory() {
-                return null;
-            }
-
-        });
+        source.initialize(new MockRepositoryContext());
     }
 
     @Test

diff --git a/...modeshape-connector-svn/src/test/java/org/modeshape/connector/svn/SvnIntegrationTest.java b/...modeshape-connector-svn/src/test/java/org/modeshape/connector/svn/SvnIntegrationTest.java
@@ -33,12 +33,7 @@
 import org.modeshape.graph.Graph;
 import org.modeshape.graph.Location;
 import org.modeshape.graph.Node;
-import org.modeshape.graph.Subgraph;
-import org.modeshape.graph.connector.RepositoryConnection;
-import org.modeshape.graph.connector.RepositoryConnectionFactory;
-import org.modeshape.graph.connector.RepositoryContext;
-import org.modeshape.graph.connector.RepositorySourceException;
-import org.modeshape.graph.observe.Observer;
+import org.modeshape.graph.connector.MockRepositoryContext;
 import org.modeshape.graph.property.Name;
 import org.modeshape.graph.property.Property;
 
@@ -79,37 +74,7 @@ public void beforeEach() {
             source.setPassword("");
         }
 
-        source.initialize(new RepositoryContext() {
-
-            @Override
-            public Subgraph getConfiguration( int depth ) {
-                return null;
-            }
-
-            @Override
-            @SuppressWarnings( "synthetic-access" )
-            public ExecutionContext getExecutionContext() {
-                return context;
-            }
-
-            @Override
-            public Observer getObserver() {
-                return null;
-            }
-
-            @Override
-            public RepositoryConnectionFactory getRepositoryConnectionFactory() {
-                return new RepositoryConnectionFactory() {
-
-                    @Override
-                    public RepositoryConnection createConnection( String sourceName ) throws RepositorySourceException {
-                        return null;
-                    }
-
-                };
-            }
-
-        });
+        source.initialize(new MockRepositoryContext(context));
     }
 
     @Test