You are viewing a plain text version of this content. The canonical link for it is here.
Posted to s4-commits@incubator.apache.org by mm...@apache.org on 2012/07/19 16:26:24 UTC
[3/32] git commit: Reorganized and renamed mock modules
Reorganized and renamed mock modules
Project: http://git-wip-us.apache.org/repos/asf/incubator-s4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s4/commit/58eb63cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/58eb63cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/58eb63cd
Branch: refs/heads/S4-57
Commit: 58eb63cdbd8f9cbb61ff328f72e0250e3f554a31
Parents: ecbfd42
Author: Matthieu Morel <mm...@apache.org>
Authored: Sun Jul 1 13:45:07 2012 +0200
Committer: Matthieu Morel <mm...@apache.org>
Committed: Thu Jul 19 11:59:07 2012 +0200
----------------------------------------------------------------------
.../java/org/apache/s4/comm/BareCommModule.java | 40 --------------
.../java/org/apache/s4/core/BareCoreModule.java | 34 ------------
.../apache/s4/core/timers/MultithreadingTest.java | 6 +-
.../org/apache/s4/fixtures/MockCommModule.java | 42 +++++++++++++++
.../org/apache/s4/fixtures/MockCoreModule.java | 33 +++++++++++
5 files changed, 78 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/58eb63cd/subprojects/s4-core/src/test/java/org/apache/s4/comm/BareCommModule.java
----------------------------------------------------------------------
diff --git a/subprojects/s4-core/src/test/java/org/apache/s4/comm/BareCommModule.java b/subprojects/s4-core/src/test/java/org/apache/s4/comm/BareCommModule.java
deleted file mode 100644
index 8639e9a..0000000
--- a/subprojects/s4-core/src/test/java/org/apache/s4/comm/BareCommModule.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.apache.s4.comm;
-
-import org.apache.s4.base.Hasher;
-import org.apache.s4.base.SerializerDeserializer;
-import org.apache.s4.comm.serialize.KryoSerDeser;
-import org.apache.s4.comm.tcp.RemoteEmitters;
-import org.apache.s4.comm.topology.Clusters;
-import org.apache.s4.comm.topology.RemoteStreams;
-import org.apache.s4.core.RemoteSenders;
-import org.mockito.Mockito;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.inject.AbstractModule;
-import com.google.inject.name.Names;
-
-/**
- * Default configuration module for the communication layer. Parameterizable through a configuration file.
- *
- */
-public class BareCommModule extends AbstractModule {
-
- public BareCommModule() {
- super();
- }
-
- @Override
- protected void configure() {
- /* The hashing function to map keys top partitions. */
- bind(Hasher.class).to(DefaultHasher.class);
- /* Use Kryo to serialize events. */
- bind(SerializerDeserializer.class).to(KryoSerDeser.class);
- bind(RemoteStreams.class).toInstance(Mockito.mock(RemoteStreams.class));
- bind(RemoteSenders.class).toInstance(Mockito.mock(RemoteSenders.class));
- bind(RemoteEmitters.class).toInstance(Mockito.mock(RemoteEmitters.class));
- bind(RemoteEmitterFactory.class).toInstance(Mockito.mock(RemoteEmitterFactory.class));
- bind(Clusters.class).toInstance(Mockito.mock(Clusters.class));
- Names.bindProperties(binder(), ImmutableMap.of("cluster.name", "testCluster"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/58eb63cd/subprojects/s4-core/src/test/java/org/apache/s4/core/BareCoreModule.java
----------------------------------------------------------------------
diff --git a/subprojects/s4-core/src/test/java/org/apache/s4/core/BareCoreModule.java b/subprojects/s4-core/src/test/java/org/apache/s4/core/BareCoreModule.java
deleted file mode 100644
index 70f88cd..0000000
--- a/subprojects/s4-core/src/test/java/org/apache/s4/core/BareCoreModule.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.apache.s4.core;
-
-import org.apache.s4.base.Emitter;
-import org.apache.s4.base.Listener;
-import org.apache.s4.core.Receiver;
-import org.apache.s4.deploy.DeploymentManager;
-import org.apache.s4.deploy.NoOpDeploymentManager;
-import org.mockito.Mockito;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.inject.AbstractModule;
-
-/**
- * Temporary module allowing assignment from ZK, communication through Netty, and distributed deployment management,
- * until we have a better way to customize node configuration
- *
- */
-public class BareCoreModule extends AbstractModule {
-
- @SuppressWarnings("unused")
- private static Logger logger = LoggerFactory.getLogger(BareCoreModule.class);
-
- public BareCoreModule() {
- }
-
- @Override
- protected void configure() {
- bind(DeploymentManager.class).to(NoOpDeploymentManager.class);
- bind(Emitter.class).toInstance(Mockito.mock(Emitter.class));
- bind(Listener.class).toInstance(Mockito.mock(Listener.class));
- bind(Receiver.class).toInstance(Mockito.mock(Receiver.class));
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/58eb63cd/subprojects/s4-core/src/test/java/org/apache/s4/core/timers/MultithreadingTest.java
----------------------------------------------------------------------
diff --git a/subprojects/s4-core/src/test/java/org/apache/s4/core/timers/MultithreadingTest.java b/subprojects/s4-core/src/test/java/org/apache/s4/core/timers/MultithreadingTest.java
index 3bbd38e..e1c0c11 100644
--- a/subprojects/s4-core/src/test/java/org/apache/s4/core/timers/MultithreadingTest.java
+++ b/subprojects/s4-core/src/test/java/org/apache/s4/core/timers/MultithreadingTest.java
@@ -10,11 +10,11 @@ import java.util.concurrent.TimeUnit;
import org.apache.s4.base.Event;
import org.apache.s4.base.EventMessage;
import org.apache.s4.base.KeyFinder;
-import org.apache.s4.comm.BareCommModule;
import org.apache.s4.core.App;
-import org.apache.s4.core.BareCoreModule;
import org.apache.s4.core.ProcessingElement;
import org.apache.s4.core.Stream;
+import org.apache.s4.fixtures.MockCommModule;
+import org.apache.s4.fixtures.MockCoreModule;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,7 +34,7 @@ public class MultithreadingTest {
*/
@Test
public void testSynchronization() throws IOException, InterruptedException {
- Injector injector = Guice.createInjector(new BareCommModule(), new BareCoreModule());
+ Injector injector = Guice.createInjector(new MockCommModule(), new MockCoreModule());
TestApp app = injector.getInstance(TestApp.class);
app.count = 2; // One for the event, another for the timer
app.init();
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/58eb63cd/subprojects/s4-core/src/test/java/org/apache/s4/fixtures/MockCommModule.java
----------------------------------------------------------------------
diff --git a/subprojects/s4-core/src/test/java/org/apache/s4/fixtures/MockCommModule.java b/subprojects/s4-core/src/test/java/org/apache/s4/fixtures/MockCommModule.java
new file mode 100644
index 0000000..13e8672
--- /dev/null
+++ b/subprojects/s4-core/src/test/java/org/apache/s4/fixtures/MockCommModule.java
@@ -0,0 +1,42 @@
+package org.apache.s4.fixtures;
+
+import org.apache.s4.base.Hasher;
+import org.apache.s4.base.SerializerDeserializer;
+import org.apache.s4.comm.DefaultHasher;
+import org.apache.s4.comm.RemoteEmitterFactory;
+import org.apache.s4.comm.serialize.KryoSerDeser;
+import org.apache.s4.comm.tcp.RemoteEmitters;
+import org.apache.s4.comm.topology.Clusters;
+import org.apache.s4.comm.topology.RemoteStreams;
+import org.apache.s4.core.RemoteSenders;
+import org.mockito.Mockito;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.inject.AbstractModule;
+import com.google.inject.name.Names;
+
+/**
+ * Mock module for the comm layer. Mocks comm layer basic functionalities, and uses some default when required.
+ *
+ */
+public class MockCommModule extends AbstractModule {
+
+ public MockCommModule() {
+ super();
+ }
+
+ @Override
+ protected void configure() {
+ /* The hashing function to map keys top partitions. */
+ bind(Hasher.class).to(DefaultHasher.class);
+ /* Use Kryo to serialize events. */
+ bind(SerializerDeserializer.class).to(KryoSerDeser.class);
+ bind(RemoteStreams.class).toInstance(Mockito.mock(RemoteStreams.class));
+ bind(RemoteSenders.class).toInstance(Mockito.mock(RemoteSenders.class));
+ bind(RemoteEmitters.class).toInstance(Mockito.mock(RemoteEmitters.class));
+ bind(RemoteEmitterFactory.class).toInstance(Mockito.mock(RemoteEmitterFactory.class));
+ bind(Clusters.class).toInstance(Mockito.mock(Clusters.class));
+ Names.bindProperties(binder(), ImmutableMap.of("cluster.name", "testCluster"));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/58eb63cd/subprojects/s4-core/src/test/java/org/apache/s4/fixtures/MockCoreModule.java
----------------------------------------------------------------------
diff --git a/subprojects/s4-core/src/test/java/org/apache/s4/fixtures/MockCoreModule.java b/subprojects/s4-core/src/test/java/org/apache/s4/fixtures/MockCoreModule.java
new file mode 100644
index 0000000..a7f8375
--- /dev/null
+++ b/subprojects/s4-core/src/test/java/org/apache/s4/fixtures/MockCoreModule.java
@@ -0,0 +1,33 @@
+package org.apache.s4.fixtures;
+
+import org.apache.s4.base.Emitter;
+import org.apache.s4.base.Listener;
+import org.apache.s4.core.Receiver;
+import org.apache.s4.deploy.DeploymentManager;
+import org.apache.s4.deploy.NoOpDeploymentManager;
+import org.mockito.Mockito;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.inject.AbstractModule;
+
+/**
+ * Core module mocking basic platform functionalities.
+ *
+ */
+public class MockCoreModule extends AbstractModule {
+
+ @SuppressWarnings("unused")
+ private static Logger logger = LoggerFactory.getLogger(MockCoreModule.class);
+
+ public MockCoreModule() {
+ }
+
+ @Override
+ protected void configure() {
+ bind(DeploymentManager.class).to(NoOpDeploymentManager.class);
+ bind(Emitter.class).toInstance(Mockito.mock(Emitter.class));
+ bind(Listener.class).toInstance(Mockito.mock(Listener.class));
+ bind(Receiver.class).toInstance(Mockito.mock(Receiver.class));
+ }
+}