You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/05/04 00:07:57 UTC
[43/54] geode git commit: Fix JMock tests to use ThreadingPolicy
Fix JMock tests to use ThreadingPolicy
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/df24abf6
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/df24abf6
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/df24abf6
Branch: refs/heads/feature/GEODE-2632-11
Commit: df24abf65c24319c7f70dce137739f8d0beeb855
Parents: d29cc7e
Author: Kirk Lund <kl...@apache.org>
Authored: Tue May 2 16:31:01 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Wed May 3 17:06:22 2017 -0700
----------------------------------------------------------------------
.../CompiledAggregateFunctionJUnitTest.java | 16 +++--
.../internal/cache/DiskInitFileJUnitTest.java | 2 +
.../geode/internal/cache/OplogRVVJUnitTest.java | 2 +
.../cache/execute/PRColocationDUnitTest.java | 73 ++++++++++----------
.../io/CompositeOutputStreamJUnitTest.java | 2 +
.../internal/lang/InitializerJUnitTest.java | 2 +
.../internal/net/SocketUtilsJUnitTest.java | 2 +
.../internal/process/PidFileJUnitTest.java | 2 +
...tractSignalNotificationHandlerJUnitTest.java | 2 +
.../statistics/ValueMonitorIntegrationTest.java | 2 +
.../geode/internal/util/IOUtilsJUnitTest.java | 2 +
.../AbstractCommandsSupportJUnitTest.java | 2 +
.../commands/DiskStoreCommandsJUnitTest.java | 2 +
.../cli/commands/IndexCommandsJUnitTest.java | 2 +
.../RegionPathConverterJUnitTest.java | 2 +
.../DescribeDiskStoreFunctionJUnitTest.java | 26 +++----
.../ListDiskStoresFunctionJUnitTest.java | 15 ++--
.../functions/ListIndexFunctionJUnitTest.java | 2 +
.../LoginHandlerInterceptorJUnitTest.java | 25 ++++---
.../web/http/ClientHttpRequestJUnitTest.java | 2 +
...ableObjectHttpMessageConverterJUnitTest.java | 2 +
21 files changed, 114 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/df24abf6/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledAggregateFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledAggregateFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledAggregateFunctionJUnitTest.java
index 38d3f6f..5242bbe 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledAggregateFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledAggregateFunctionJUnitTest.java
@@ -22,11 +22,12 @@ import java.util.List;
import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
+import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.query.Aggregator;
import org.apache.geode.cache.query.internal.aggregate.Avg;
import org.apache.geode.cache.query.internal.aggregate.AvgBucketNode;
@@ -54,10 +55,15 @@ public class CompiledAggregateFunctionJUnitTest {
@Before
public void setUp() throws Exception {
- context = new Mockery();
+ context = new Mockery() {
+ {
+ setImposteriser(ClassImposteriser.INSTANCE);
+ setThreadingPolicy(new Synchroniser());
+ }
+ };
cache = context.mock(InternalCache.class);
bucketList = new ArrayList();
- bucketList.add(Integer.valueOf(1));
+ bucketList.add(1);
}
@Test
@@ -173,13 +179,13 @@ public class CompiledAggregateFunctionJUnitTest {
Class maxMinClass = MaxMin.class;
Field findMax = maxMinClass.getDeclaredField("findMax");
findMax.setAccessible(true);
- assertTrue(((Boolean) findMax.get(maxMin)).booleanValue());
+ assertTrue((Boolean) findMax.get(maxMin));
CompiledAggregateFunction caf2 = new CompiledAggregateFunction(null, OQLLexerTokenTypes.MIN);
ExecutionContext context2 = new ExecutionContext(null, cache);
Aggregator agg1 = (Aggregator) caf2.evaluate(context1);
assertTrue(agg1 instanceof MaxMin);
MaxMin maxMin1 = (MaxMin) agg1;
- assertFalse(((Boolean) findMax.get(maxMin1)).booleanValue());
+ assertFalse((Boolean) findMax.get(maxMin1));
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/df24abf6/geode-core/src/test/java/org/apache/geode/internal/cache/DiskInitFileJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskInitFileJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskInitFileJUnitTest.java
index ec1b5cf..78527b5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskInitFileJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskInitFileJUnitTest.java
@@ -21,6 +21,7 @@ import java.util.Collections;
import org.jmock.Expectations;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.Before;
import org.junit.Rule;
@@ -39,6 +40,7 @@ public class DiskInitFileJUnitTest {
private Mockery context = new Mockery() {
{
setImposteriser(ClassImposteriser.INSTANCE);
+ setThreadingPolicy(new Synchroniser());
}
};
http://git-wip-us.apache.org/repos/asf/geode/blob/df24abf6/geode-core/src/test/java/org/apache/geode/internal/cache/OplogRVVJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogRVVJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogRVVJUnitTest.java
index 65833c4..5c80db3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogRVVJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogRVVJUnitTest.java
@@ -27,6 +27,7 @@ import org.apache.geode.internal.cache.versions.DiskRegionVersionVector;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.jmock.Expectations;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
@@ -50,6 +51,7 @@ public class OplogRVVJUnitTest {
private Mockery context = new Mockery() {
{
setImposteriser(ClassImposteriser.INSTANCE);
+ setThreadingPolicy(new Synchroniser());
}
};
http://git-wip-us.apache.org/repos/asf/geode/blob/df24abf6/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java
index b018bfd..6575b58 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java
@@ -2587,55 +2587,54 @@ public class PRColocationDUnitTest extends JUnit4CacheTestCase {
}
return buf.toString();
}
-}
-
-class DummyKeyBasedRoutingResolver implements PartitionResolver, DataSerializable {
- Integer dummyID;
+ static class DummyKeyBasedRoutingResolver implements PartitionResolver, DataSerializable {
+ Integer dummyID;
- public DummyKeyBasedRoutingResolver() {}
+ public DummyKeyBasedRoutingResolver() {}
- public DummyKeyBasedRoutingResolver(int id) {
- this.dummyID = new Integer(id);
- }
+ public DummyKeyBasedRoutingResolver(int id) {
+ this.dummyID = new Integer(id);
+ }
- public String getName() {
- // TODO Auto-generated method stub
- return null;
- }
+ public String getName() {
+ // TODO Auto-generated method stub
+ return null;
+ }
- public Serializable getRoutingObject(EntryOperation opDetails) {
- return (Serializable) opDetails.getKey();
- }
+ public Serializable getRoutingObject(EntryOperation opDetails) {
+ return (Serializable) opDetails.getKey();
+ }
- public void close() {
- // TODO Auto-generated method stub
- }
+ public void close() {
+ // TODO Auto-generated method stub
+ }
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- this.dummyID = DataSerializer.readInteger(in);
- }
+ public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ this.dummyID = DataSerializer.readInteger(in);
+ }
- public void toData(DataOutput out) throws IOException {
- DataSerializer.writeInteger(this.dummyID, out);
- }
+ public void toData(DataOutput out) throws IOException {
+ DataSerializer.writeInteger(this.dummyID, out);
+ }
- @Override
- public int hashCode() {
- int i = this.dummyID.intValue();
- return i;
- }
+ @Override
+ public int hashCode() {
+ int i = this.dummyID.intValue();
+ return i;
+ }
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
+ @Override
+ public boolean equals(Object o) {
+ if (this == o)
+ return true;
- if (!(o instanceof DummyKeyBasedRoutingResolver))
- return false;
+ if (!(o instanceof DummyKeyBasedRoutingResolver))
+ return false;
- DummyKeyBasedRoutingResolver otherDummyID = (DummyKeyBasedRoutingResolver) o;
- return (otherDummyID.dummyID.equals(dummyID));
+ DummyKeyBasedRoutingResolver otherDummyID = (DummyKeyBasedRoutingResolver) o;
+ return (otherDummyID.dummyID.equals(dummyID));
+ }
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/df24abf6/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java
index 506696b..f9c3045 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java
@@ -22,6 +22,7 @@ import java.io.OutputStream;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.Sequence;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
@@ -45,6 +46,7 @@ public class CompositeOutputStreamJUnitTest {
mockContext = new Mockery() {
{
setImposteriser(ClassImposteriser.INSTANCE);
+ setThreadingPolicy(new Synchroniser());
}
};
}
http://git-wip-us.apache.org/repos/asf/geode/blob/df24abf6/geode-core/src/test/java/org/apache/geode/internal/lang/InitializerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/InitializerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/InitializerJUnitTest.java
index d7a7488..66e8ff1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/InitializerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/InitializerJUnitTest.java
@@ -18,6 +18,7 @@ import static org.junit.Assert.*;
import org.jmock.Expectations;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
@@ -46,6 +47,7 @@ public class InitializerJUnitTest {
public void setUp() {
mockContext = new Mockery();
mockContext.setImposteriser(ClassImposteriser.INSTANCE);
+ mockContext.setThreadingPolicy(new Synchroniser());
}
@After
http://git-wip-us.apache.org/repos/asf/geode/blob/df24abf6/geode-core/src/test/java/org/apache/geode/internal/net/SocketUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SocketUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SocketUtilsJUnitTest.java
index ae24a62..cacb493 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SocketUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SocketUtilsJUnitTest.java
@@ -22,6 +22,7 @@ import java.net.Socket;
import org.jmock.Expectations;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
@@ -52,6 +53,7 @@ public class SocketUtilsJUnitTest {
mockContext = new Mockery() {
{
setImposteriser(ClassImposteriser.INSTANCE);
+ setThreadingPolicy(new Synchroniser());
}
};
}
http://git-wip-us.apache.org/repos/asf/geode/blob/df24abf6/geode-core/src/test/java/org/apache/geode/internal/process/PidFileJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/PidFileJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/PidFileJUnitTest.java
index b98ef0a..0ca73c4 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/process/PidFileJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/PidFileJUnitTest.java
@@ -29,6 +29,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
@@ -67,6 +68,7 @@ public class PidFileJUnitTest {
mockContext = new Mockery() {
{
setImposteriser(ClassImposteriser.INSTANCE);
+ setThreadingPolicy(new Synchroniser());
}
};
this.futures = Executors.newFixedThreadPool(2);
http://git-wip-us.apache.org/repos/asf/geode/blob/df24abf6/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerJUnitTest.java
index 6b434b8..3d0e321 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerJUnitTest.java
@@ -20,6 +20,7 @@ import java.util.Set;
import org.jmock.Expectations;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
@@ -54,6 +55,7 @@ public class AbstractSignalNotificationHandlerJUnitTest {
mockContext = new Mockery() {
{
setImposteriser(ClassImposteriser.INSTANCE);
+ setThreadingPolicy(new Synchroniser());
}
};
}
http://git-wip-us.apache.org/repos/asf/geode/blob/df24abf6/geode-core/src/test/java/org/apache/geode/internal/statistics/ValueMonitorIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/ValueMonitorIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/ValueMonitorIntegrationTest.java
index 81fa4b4..70b9b15 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/ValueMonitorIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/ValueMonitorIntegrationTest.java
@@ -29,6 +29,7 @@ import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.jmock.Expectations;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
@@ -62,6 +63,7 @@ public class ValueMonitorIntegrationTest {
this.mockContext = new Mockery() {
{
setImposteriser(ClassImposteriser.INSTANCE);
+ setThreadingPolicy(new Synchroniser());
}
};
}
http://git-wip-us.apache.org/repos/asf/geode/blob/df24abf6/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
index e31e9a8..a88157d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
@@ -27,6 +27,7 @@ import java.util.Calendar;
import org.jmock.Expectations;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
@@ -55,6 +56,7 @@ public class IOUtilsJUnitTest {
mockContext = new Mockery() {
{
setImposteriser(ClassImposteriser.INSTANCE);
+ setThreadingPolicy(new Synchroniser());
}
};
}
http://git-wip-us.apache.org/repos/asf/geode/blob/df24abf6/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java
index 714a6ad..6c52dad 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java
@@ -23,6 +23,7 @@ import java.util.Set;
import org.jmock.Expectations;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
@@ -64,6 +65,7 @@ public class AbstractCommandsSupportJUnitTest {
public void setup() {
mockContext = new Mockery();
mockContext.setImposteriser(ClassImposteriser.INSTANCE);
+ mockContext.setThreadingPolicy(new Synchroniser());
}
@After
http://git-wip-us.apache.org/repos/asf/geode/blob/df24abf6/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
index 2a1ed9f..e0dfc6c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
@@ -24,6 +24,7 @@ import java.util.Set;
import org.jmock.Expectations;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Assert;
@@ -74,6 +75,7 @@ public class DiskStoreCommandsJUnitTest {
mockContext = new Mockery() {
{
setImposteriser(ClassImposteriser.INSTANCE);
+ setThreadingPolicy(new Synchroniser());
}
};
}
http://git-wip-us.apache.org/repos/asf/geode/blob/df24abf6/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsJUnitTest.java
index 4205375..bdb84a9 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsJUnitTest.java
@@ -24,6 +24,7 @@ import java.util.Set;
import org.jmock.Expectations;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Assert;
@@ -67,6 +68,7 @@ public class IndexCommandsJUnitTest {
mockContext = new Mockery() {
{
setImposteriser(ClassImposteriser.INSTANCE);
+ setThreadingPolicy(new Synchroniser());
}
};
}
http://git-wip-us.apache.org/repos/asf/geode/blob/df24abf6/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/RegionPathConverterJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/RegionPathConverterJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/RegionPathConverterJUnitTest.java
index 955db75..ebe6f34 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/RegionPathConverterJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/RegionPathConverterJUnitTest.java
@@ -22,6 +22,7 @@ import java.util.TreeSet;
import org.jmock.Expectations;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
@@ -40,6 +41,7 @@ public class RegionPathConverterJUnitTest {
mockContext = new Mockery() {
{
setImposteriser(ClassImposteriser.INSTANCE);
+ setThreadingPolicy(new Synchroniser());
}
};
}
http://git-wip-us.apache.org/repos/asf/geode/blob/df24abf6/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
index e0038ef..a3321a3 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
@@ -28,6 +28,7 @@ import java.util.UUID;
import org.apache.logging.log4j.Logger;
import org.jmock.Expectations;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
@@ -48,6 +49,7 @@ import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.cache.server.ClientSubscriptionConfig;
import org.apache.geode.cache.wan.GatewaySender;
import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.lang.Filter;
import org.apache.geode.internal.lang.ObjectUtils;
@@ -55,6 +57,7 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.util.CollectionUtils;
import org.apache.geode.management.internal.cli.domain.DiskStoreDetails;
import org.apache.geode.management.internal.cli.util.DiskStoreNotFoundException;
+import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.junit.categories.UnitTest;
/**
@@ -82,6 +85,7 @@ public class DescribeDiskStoreFunctionJUnitTest {
public void setup() {
mockContext = new Mockery();
mockContext.setImposteriser(ClassImposteriser.INSTANCE);
+ mockContext.setThreadingPolicy(new Synchroniser());
}
@After
@@ -484,8 +488,8 @@ public class DescribeDiskStoreFunctionJUnitTest {
final InternalCache mockCache = mockContext.mock(InternalCache.class, "Cache");
- final DistributedMember mockMember =
- mockContext.mock(DistributedMember.class, "DistributedMember");
+ final InternalDistributedMember mockMember =
+ mockContext.mock(InternalDistributedMember.class, "DistributedMember");
final DiskStore mockDiskStore =
createMockDiskStore(diskStoreId, diskStoreName, true, false,
@@ -614,8 +618,8 @@ public class DescribeDiskStoreFunctionJUnitTest {
final InternalCache mockCache = mockContext.mock(InternalCache.class, "Cache");
- final DistributedMember mockMember =
- mockContext.mock(DistributedMember.class, "DistributedMember");
+ final InternalDistributedMember mockMember =
+ mockContext.mock(InternalDistributedMember.class, "DistributedMember");
final FunctionContext mockFunctionContext =
mockContext.mock(FunctionContext.class, "FunctionContext");
@@ -657,8 +661,8 @@ public class DescribeDiskStoreFunctionJUnitTest {
final InternalCache mockCache = mockContext.mock(InternalCache.class, "Cache");
- final DistributedMember mockMember =
- mockContext.mock(DistributedMember.class, "DistributedMember");
+ final InternalDistributedMember mockMember =
+ mockContext.mock(InternalDistributedMember.class, "DistributedMember");
final FunctionContext mockFunctionContext =
mockContext.mock(FunctionContext.class, "FunctionContext");
@@ -692,13 +696,11 @@ public class DescribeDiskStoreFunctionJUnitTest {
@Test
public void testExecuteWithDiskDirsAndDiskSizesMismatch() throws Exception {
- logger.info("<ExpectedException action=add>" + IllegalStateException.class.getName()
- + "</ExpectedException>");
+ IgnoredException ignoredException = IgnoredException.addIgnoredException(IllegalStateException.class.getName());
try {
doTestExecuteWithDiskDirsAndDiskSizesMismatch();
} finally {
- logger.info("<ExpectedException action=remove>" + IllegalStateException.class.getName()
- + "</ExpectedException>");
+ ignoredException.remove();
}
}
@@ -711,8 +713,8 @@ public class DescribeDiskStoreFunctionJUnitTest {
final InternalCache mockCache = mockContext.mock(InternalCache.class, "Cache");
- final DistributedMember mockMember =
- mockContext.mock(DistributedMember.class, "DistributedMember");
+ final InternalDistributedMember mockMember =
+ mockContext.mock(InternalDistributedMember.class, "DistributedMember");
final DiskStore mockDiskStore =
createMockDiskStore(diskStoreId, diskStoreName, false, true, 70, 8192000l, 1000, 300l, 8192,
http://git-wip-us.apache.org/repos/asf/geode/blob/df24abf6/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
index 2a88e8c..a8b9193 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
@@ -27,6 +27,7 @@ import java.util.UUID;
import org.jmock.Expectations;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
@@ -38,6 +39,7 @@ import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.domain.DiskStoreDetails;
@@ -67,6 +69,7 @@ public class ListDiskStoresFunctionJUnitTest {
mockContext = new Mockery() {
{
setImposteriser(ClassImposteriser.INSTANCE);
+ setThreadingPolicy(new Synchroniser());
}
};
}
@@ -98,8 +101,8 @@ public class ListDiskStoresFunctionJUnitTest {
final InternalCache mockCache = mockContext.mock(InternalCache.class, "Cache");
- final DistributedMember mockMember =
- mockContext.mock(DistributedMember.class, "DistributedMember");
+ final InternalDistributedMember mockMember =
+ mockContext.mock(InternalDistributedMember.class, "DistributedMember");
final DiskStoreImpl mockDiskStoreOne = mockContext.mock(DiskStoreImpl.class, "DiskStoreOne");
final DiskStoreImpl mockDiskStoreTwo = mockContext.mock(DiskStoreImpl.class, "DiskStoreTwo");
@@ -200,8 +203,8 @@ public class ListDiskStoresFunctionJUnitTest {
public void testExecuteOnMemberHavingNoDiskStores() throws Throwable {
final InternalCache mockCache = mockContext.mock(InternalCache.class, "Cache");
- final DistributedMember mockMember =
- mockContext.mock(DistributedMember.class, "DistributedMember");
+ final InternalDistributedMember mockMember =
+ mockContext.mock(InternalDistributedMember.class, "DistributedMember");
final FunctionContext mockFunctionContext =
mockContext.mock(FunctionContext.class, "FunctionContext");
@@ -270,8 +273,8 @@ public class ListDiskStoresFunctionJUnitTest {
public void testExecuteThrowsRuntimeException() throws Throwable {
final InternalCache mockCache = mockContext.mock(InternalCache.class, "Cache");
- final DistributedMember mockMember =
- mockContext.mock(DistributedMember.class, "DistributedMember");
+ final InternalDistributedMember mockMember =
+ mockContext.mock(InternalDistributedMember.class, "DistributedMember");
final FunctionContext mockFunctionContext =
mockContext.mock(FunctionContext.class, "FunctionContext");
http://git-wip-us.apache.org/repos/asf/geode/blob/df24abf6/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
index c000109..583aa56 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
@@ -26,6 +26,7 @@ import java.util.concurrent.atomic.AtomicLong;
import org.jmock.Expectations;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
@@ -74,6 +75,7 @@ public class ListIndexFunctionJUnitTest {
mockContext = new Mockery() {
{
setImposteriser(ClassImposteriser.INSTANCE);
+ setThreadingPolicy(new Synchroniser());
}
};
mockCounter = new AtomicLong(0l);
http://git-wip-us.apache.org/repos/asf/geode/blob/df24abf6/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
index 80e26fd..c61cd6b 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
@@ -14,13 +14,17 @@
*/
package org.apache.geode.management.internal.web.controllers.support;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
-import org.apache.geode.management.internal.security.ResourceConstants;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import edu.umd.cs.mtc.MultithreadedTestCase;
+import edu.umd.cs.mtc.TestFramework;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.lib.concurrent.Synchroniser;
@@ -30,13 +34,8 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import edu.umd.cs.mtc.MultithreadedTestCase;
-import edu.umd.cs.mtc.TestFramework;
+import org.apache.geode.management.internal.security.ResourceConstants;
+import org.apache.geode.test.junit.categories.UnitTest;
/**
* The LoginHandlerInterceptorJUnitTest class is a test suite of test cases to test the contract and
http://git-wip-us.apache.org/repos/asf/geode/blob/df24abf6/geode-web/src/test/java/org/apache/geode/management/internal/web/http/ClientHttpRequestJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/http/ClientHttpRequestJUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/http/ClientHttpRequestJUnitTest.java
index a407363..a95a58e 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/web/http/ClientHttpRequestJUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/http/ClientHttpRequestJUnitTest.java
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.Map;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
@@ -59,6 +60,7 @@ public class ClientHttpRequestJUnitTest extends AbstractWebTestCase {
public void setUp() {
mockContext = new Mockery();
mockContext.setImposteriser(ClassImposteriser.INSTANCE);
+ mockContext.setThreadingPolicy(new Synchroniser());
}
@After
http://git-wip-us.apache.org/repos/asf/geode/blob/df24abf6/geode-web/src/test/java/org/apache/geode/management/internal/web/http/converter/SerializableObjectHttpMessageConverterJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/http/converter/SerializableObjectHttpMessageConverterJUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/http/converter/SerializableObjectHttpMessageConverterJUnitTest.java
index f5495b3..329924e 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/web/http/converter/SerializableObjectHttpMessageConverterJUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/http/converter/SerializableObjectHttpMessageConverterJUnitTest.java
@@ -24,6 +24,7 @@ import java.util.Calendar;
import org.jmock.Expectations;
import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
@@ -57,6 +58,7 @@ public class SerializableObjectHttpMessageConverterJUnitTest {
public void setUp() {
mockContext = new Mockery();
mockContext.setImposteriser(ClassImposteriser.INSTANCE);
+ mockContext.setThreadingPolicy(new Synchroniser());
}
@After