You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by on...@apache.org on 2020/09/25 17:44:48 UTC
[geode] 01/01: Revert "Bump junit from 4.12 to 4.13 (#5538)"
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch revert-5538-GEODE-8496-bump-junit
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 9afa80334725b86d6dc5559848fab024b0fd356b
Author: Owen Nichols <34...@users.noreply.github.com>
AuthorDate: Fri Sep 25 10:43:59 2020 -0700
Revert "Bump junit from 4.12 to 4.13 (#5538)"
This reverts commit 11488f521b48bd9cc3b8c5428a9e32cdf7d37e6c.
---
.../src/test/resources/expected-pom.xml | 2 +-
buildSrc/build.gradle | 2 +-
.../gradle/plugins/DependencyConstraints.groovy | 2 +-
.../rest/RestoreRedundancyManagementDUnitTest.java | 16 ++--
...aggerManagementVerificationIntegrationTest.java | 2 +-
.../DevRestSwaggerVerificationIntegrationTest.java | 2 +-
.../jdbc/internal/RegionMappingTest.java | 5 ++
.../connectors/jdbc/internal/SqlHandlerTest.java | 95 ++++++++++++----------
.../jdbc/internal/SqlToPdxInstanceCreatorTest.java | 5 ++
.../jdbc/internal/SqlToPdxInstanceTest.java | 31 ++++---
geode-experimental-driver/build.gradle | 1 -
.../apache/geode/experimental/driver/SSLTest.java | 38 +++++----
.../RestoreRedundancyCommandDUnitTest.java | 2 +-
.../cli/functions/UserFunctionExecutionTest.java | 5 ++
.../serializable/SerializableTemporaryFolder.java | 20 +----
.../SerializableTemporaryFolderTest.java | 26 +-----
...CategoryWithParameterizedRunnerFactoryTest.java | 4 +-
.../ClearRequestOperationHandlerJUnitTest.java | 5 ++
...ionOnGroupRequestOperationHandlerJUnitTest.java | 5 ++
.../GetAllRequestOperationHandlerJUnitTest.java | 14 +++-
.../GetSizeRequestOperationHandlerJUnitTest.java | 11 ++-
...utIfAbsentRequestOperationHandlerJUnitTest.java | 22 +++--
.../PutRequestOperationHandlerJUnitTest.java | 15 +++-
.../executor/set/SDiffIntegrationTest.java | 5 ++
.../executor/set/SInterIntegrationTest.java | 5 ++
.../executor/set/SMoveIntegrationTest.java | 5 ++
.../internal/executor/set/SPopIntegrationTest.java | 5 ++
.../internal/executor/set/SRemIntegrationTest.java | 5 ++
.../executor/set/SUnionIntegrationTest.java | 5 ++
.../internal/executor/set/SetsIntegrationTest.java | 5 ++
30 files changed, 218 insertions(+), 147 deletions(-)
diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml b/boms/geode-all-bom/src/test/resources/expected-pom.xml
index e518c28..f3a9e78 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -316,7 +316,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13</version>
+ <version>4.12</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 5ceea16..d1e32f6 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -38,7 +38,7 @@ dependencies {
implementation('com.github.docker-java:docker-java:3.0.14')
implementation('me.champeau.gradle:japicmp-gradle-plugin:0.2.9')
- implementation('junit:junit:4.13')
+ implementation('junit:junit:4.12')
testAnnotationProcessor(this.project)
}
diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index 9c916c3..e976f70 100644
--- a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++ b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -66,7 +66,7 @@ class DependencyConstraints implements Plugin<Project> {
deps.put("protobuf-java.version", "3.11.4")
// These versions are referenced in test.gradle, which is aggressively injected into all projects.
- deps.put("junit.version", "4.13")
+ deps.put("junit.version", "4.12")
deps.put("cglib.version", "3.3.0")
return deps
}
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RestoreRedundancyManagementDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RestoreRedundancyManagementDUnitTest.java
index 76b2a42..3464fe7 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RestoreRedundancyManagementDUnitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RestoreRedundancyManagementDUnitTest.java
@@ -19,6 +19,9 @@ package org.apache.geode.management.internal.rest;
import static org.apache.geode.cache.PartitionAttributesFactory.GLOBAL_MAX_BUCKETS_DEFAULT;
import static org.apache.geode.cache.Region.SEPARATOR;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
import java.util.ArrayList;
import java.util.List;
@@ -28,6 +31,7 @@ import java.util.concurrent.ExecutionException;
import java.util.stream.IntStream;
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -308,8 +312,8 @@ public class RestoreRedundancyManagementDUnitTest {
Cache cache = Objects.requireNonNull(ClusterStartupRule.getCache());
PartitionedRegion region = (PartitionedRegion) cache.getRegion(regionName);
- assertThat(region.getRedundancyProvider().isRedundancyImpaired())
- .isNotEqualTo(shouldBeSatisfied);
+ Assert.assertThat(region.getRedundancyProvider().isRedundancyImpaired(),
+ is(!shouldBeSatisfied));
}
private static void assertPrimariesBalanced(String regionName, int numberOfServers,
@@ -331,11 +335,11 @@ public class RestoreRedundancyManagementDUnitTest {
+ ", but expectedPrimaries:actualPrimaries = "
+ expectedPrimaries + ":" + primariesOnServer;
if (shouldBeBalanced) {
- assertThat(Math.abs(primariesOnServer - expectedPrimaries)).as(message)
- .isLessThanOrEqualTo(2);
+ Assert.assertThat(message, Math.abs(primariesOnServer - expectedPrimaries),
+ is(lessThanOrEqualTo(2)));
} else {
- assertThat(Math.abs(primariesOnServer - expectedPrimaries))
- .as("Primaries should not be balanced for region " + regionName).isGreaterThan(2);
+ Assert.assertThat("Primaries should not be balanced for region " + regionName,
+ Math.abs(primariesOnServer - expectedPrimaries), is(not(lessThanOrEqualTo(2))));
}
}
}
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/rest/SwaggerManagementVerificationIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/rest/SwaggerManagementVerificationIntegrationTest.java
index 627dc59..d562435 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/rest/SwaggerManagementVerificationIntegrationTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/rest/SwaggerManagementVerificationIntegrationTest.java
@@ -18,7 +18,7 @@ package org.apache.geode.management.internal.rest;
import static org.apache.geode.test.junit.rules.HttpResponseAssert.assertResponse;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertThat;
import com.fasterxml.jackson.databind.JsonNode;
import org.junit.ClassRule;
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/DevRestSwaggerVerificationIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/DevRestSwaggerVerificationIntegrationTest.java
index 3925c63..15eb4ec 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/DevRestSwaggerVerificationIntegrationTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/DevRestSwaggerVerificationIntegrationTest.java
@@ -17,7 +17,7 @@ package org.apache.geode.rest.internal.web;
import static org.apache.geode.test.junit.rules.HttpResponseAssert.assertResponse;
import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertThat;
import com.fasterxml.jackson.databind.JsonNode;
import org.junit.ClassRule;
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingTest.java
index c4f2900..4e7c8dc 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingTest.java
@@ -17,13 +17,18 @@ package org.apache.geode.connectors.jdbc.internal;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.ExpectedException;
import org.apache.geode.connectors.jdbc.internal.configuration.FieldMapping;
import org.apache.geode.connectors.jdbc.internal.configuration.RegionMapping;
public class RegionMappingTest {
+ @Rule
+ public ExpectedException expectedException = ExpectedException.none();
+
private String name;
private String fieldName1;
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java
index 3065b4b..8fc7874 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java
@@ -40,7 +40,9 @@ import javax.sql.DataSource;
import junitparams.JUnitParamsRunner;
import org.junit.After;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.apache.geode.InternalGemFireException;
@@ -64,6 +66,9 @@ public class SqlHandlerTest {
private static final String TABLE_NAME = "testTable";
private static final String KEY_COLUMN = "keyColumn";
+ @Rule
+ public ExpectedException thrown = ExpectedException.none();
+
private DataSource dataSource;
private JdbcConnectorService connectorService;
private DataSourceFactory dataSourceFactory;
@@ -158,27 +163,29 @@ public class SqlHandlerTest {
}
@Test
- public void readThrowsIfNoKeyProvided() {
- assertThatThrownBy(() -> handler.read(region, null))
- .isInstanceOf(IllegalArgumentException.class);
+ public void readThrowsIfNoKeyProvided() throws Exception {
+ thrown.expect(IllegalArgumentException.class);
+ handler.read(region, null);
}
@Test
public void constructorThrowsIfNoMapping() {
- assertThatThrownBy(
- () -> new SqlHandler(cache, "regionWithNoMapping", tableMetaDataManager, connectorService,
- dataSourceFactory)).isInstanceOf(JdbcConnectorException.class).hasMessageContaining(
- "JDBC mapping for region regionWithNoMapping not found. Create the mapping with the gfsh command 'create jdbc-mapping'.");
+ thrown.expect(JdbcConnectorException.class);
+ thrown.expectMessage(
+ "JDBC mapping for region regionWithNoMapping not found. Create the mapping with the gfsh command 'create jdbc-mapping'.");
+
+ new SqlHandler(cache, "regionWithNoMapping", tableMetaDataManager, connectorService,
+ dataSourceFactory);
}
@Test
public void constructorThrowsIfNoConnectionConfig() {
when(regionMapping.getDataSourceName()).thenReturn("bogus data source name");
+ thrown.expect(JdbcConnectorException.class);
+ thrown.expectMessage(
+ "JDBC data-source named \"bogus data source name\" not found. Create it with gfsh 'create data-source --pooled --name=bogus data source name'.");
- assertThatThrownBy(() -> new SqlHandler(cache, REGION_NAME, tableMetaDataManager,
- connectorService,
- dataSourceFactory)).isInstanceOf(JdbcConnectorException.class).hasMessageContaining(
- "JDBC data-source named \"bogus data source name\" not found. Create it with gfsh 'create data-source --pooled --name=bogus data source name'.");
+ new SqlHandler(cache, REGION_NAME, tableMetaDataManager, connectorService, dataSourceFactory);
}
@Test
@@ -195,13 +202,14 @@ public class SqlHandlerTest {
public void throwsExceptionIfQueryFails() throws Exception {
when(statement.executeQuery()).thenThrow(SQLException.class);
- assertThatThrownBy(() -> handler.read(region, new Object())).isInstanceOf(SQLException.class);
+ thrown.expect(SQLException.class);
+ handler.read(region, new Object());
}
@Test
- public void writeThrowsExceptionIfValueIsNullAndNotDoingDestroy() {
- assertThatThrownBy(() -> handler.write(region, Operation.UPDATE, new Object(), null))
- .isInstanceOf(IllegalArgumentException.class);
+ public void writeThrowsExceptionIfValueIsNullAndNotDoingDestroy() throws Exception {
+ thrown.expect(IllegalArgumentException.class);
+ handler.write(region, Operation.UPDATE, new Object(), null);
}
@Test
@@ -525,14 +533,14 @@ public class SqlHandlerTest {
public void destroyThrowExceptionWhenFail() throws Exception {
when(statement.executeUpdate()).thenThrow(SQLException.class);
- assertThatThrownBy(() -> handler.write(region, Operation.DESTROY, new Object(), value))
- .isInstanceOf(SQLException.class);
+ thrown.expect(SQLException.class);
+ handler.write(region, Operation.DESTROY, new Object(), value);
}
@Test
public void writesWithUnsupportedOperationThrows() throws Exception {
- assertThatThrownBy(() -> handler.write(region, Operation.INVALIDATE, new Object(), value))
- .isInstanceOf(InternalGemFireException.class);
+ thrown.expect(InternalGemFireException.class);
+ handler.write(region, Operation.INVALIDATE, new Object(), value);
}
@Test
@@ -621,9 +629,9 @@ public class SqlHandlerTest {
when(insertStatement.executeUpdate()).thenThrow(SQLException.class);
when(connection.prepareStatement(any())).thenReturn(statement).thenReturn(insertStatement);
when(value.getFieldNames()).thenReturn(Collections.emptyList());
+ thrown.expect(SQLException.class);
- assertThatThrownBy(() -> handler.write(region, Operation.UPDATE, new Object(), value))
- .isInstanceOf(SQLException.class);
+ handler.write(region, Operation.UPDATE, new Object(), value);
verify(statement).close();
verify(insertStatement).close();
@@ -636,9 +644,9 @@ public class SqlHandlerTest {
when(updateStatement.executeUpdate()).thenReturn(0);
when(connection.prepareStatement(any())).thenReturn(statement).thenReturn(updateStatement);
when(value.getFieldNames()).thenReturn(Collections.emptyList());
+ thrown.expect(SQLException.class);
- assertThatThrownBy(() -> handler.write(region, Operation.CREATE, new Object(), value))
- .isInstanceOf(SQLException.class);
+ handler.write(region, Operation.CREATE, new Object(), value);
verify(statement).close();
verify(updateStatement).close();
@@ -723,11 +731,11 @@ public class SqlHandlerTest {
when(tableMetaDataView.getColumnDataType("fieldTwo")).thenReturn(JDBCType.VARCHAR);
when(regionMapping.getIds()).thenReturn("fieldOne,fieldTwo");
createSqlHandler();
+ thrown.expect(JdbcConnectorException.class);
+ thrown.expectMessage(
+ "The key \"" + compositeKey + "\" should have 2 fields but has 1 fields.");
- assertThatThrownBy(
- () -> handler.getEntryColumnData(tableMetaDataView, compositeKey, value, Operation.GET))
- .isInstanceOf(JdbcConnectorException.class).hasMessageContaining(
- "The key \"" + compositeKey + "\" should have 2 fields but has 1 fields.");
+ handler.getEntryColumnData(tableMetaDataView, compositeKey, value, Operation.GET);
}
@Test
@@ -764,11 +772,11 @@ public class SqlHandlerTest {
when(tableMetaDataView.getColumnDataType("fieldTwoWrong")).thenReturn(JDBCType.VARCHAR);
when(regionMapping.getIds()).thenReturn("fieldOne,fieldTwo");
createSqlHandler();
+ thrown.expect(JdbcConnectorException.class);
+ thrown.expectMessage("The key \"" + compositeKey
+ + "\" has the field \"fieldTwoWrong\" which does not match any of the key columns: [fieldOne, fieldTwo]");
- assertThatThrownBy(() -> handler.getEntryColumnData(tableMetaDataView, compositeKey, value,
- Operation.GET)).isInstanceOf(JdbcConnectorException.class).hasMessageContaining("The key \""
- + compositeKey
- + "\" has the field \"fieldTwoWrong\" which does not match any of the key columns: [fieldOne, fieldTwo]");
+ handler.getEntryColumnData(tableMetaDataView, compositeKey, value, Operation.GET);
}
@Test
@@ -805,12 +813,11 @@ public class SqlHandlerTest {
when(tableMetaDataView.getColumnDataType("fieldTwoWrong")).thenReturn(JDBCType.VARCHAR);
when(regionMapping.getIds()).thenReturn("fieldOne,fieldTwo");
createSqlHandler();
+ thrown.expect(JdbcConnectorException.class);
+ thrown.expectMessage("The key \"" + compositeKey
+ + "\" has the field \"fieldTwoUnknown\" which does not match any of the key columns: [fieldOne, fieldTwo]");
- assertThatThrownBy(
- () -> handler.getEntryColumnData(tableMetaDataView, compositeKey, value, Operation.GET))
- .isInstanceOf(JdbcConnectorException.class)
- .hasMessageContaining("The key \"" + compositeKey
- + "\" has the field \"fieldTwoUnknown\" which does not match any of the key columns: [fieldOne, fieldTwo]");
+ handler.getEntryColumnData(tableMetaDataView, compositeKey, value, Operation.GET);
}
@Test
@@ -1013,10 +1020,11 @@ public class SqlHandlerTest {
public void getEntryColumnDataWhenMultipleIdColumnsGivenNonPdxInstanceFails() {
when(tableMetaDataView.getKeyColumnNames()).thenReturn(Arrays.asList("fieldOne", "fieldTwo"));
Object nonCompositeKey = Integer.valueOf(123);
+ thrown.expect(JdbcConnectorException.class);
+ thrown.expectMessage(
+ "The key \"123\" of class \"java.lang.Integer\" must be a PdxInstance because multiple columns are configured as ids.");
- assertThatThrownBy(() -> handler.getEntryColumnData(tableMetaDataView, nonCompositeKey, value,
- Operation.DESTROY)).isInstanceOf(JdbcConnectorException.class).hasMessageContaining(
- "The key \"123\" of class \"java.lang.Integer\" must be a PdxInstance because multiple columns are configured as ids.");
+ handler.getEntryColumnData(tableMetaDataView, nonCompositeKey, value, Operation.DESTROY);
}
@Test
@@ -1025,11 +1033,12 @@ public class SqlHandlerTest {
when(tableMetaDataView.getKeyColumnNames()).thenReturn(Arrays.asList("fieldOne", "fieldTwo"));
PdxInstance nonCompositeKey = mock(PdxInstance.class);
when(nonCompositeKey.isDeserializable()).thenReturn(true);
+ thrown.expect(JdbcConnectorException.class);
+ thrown.expectMessage(
+ "The key \"" + nonCompositeKey
+ + "\" must be a PdxInstance created with PdxInstanceFactory.neverDeserialize");
- assertThatThrownBy(() -> handler.getEntryColumnData(tableMetaDataView, nonCompositeKey, value,
- Operation.DESTROY)).isInstanceOf(JdbcConnectorException.class)
- .hasMessageContaining("The key \"" + nonCompositeKey
- + "\" must be a PdxInstance created with PdxInstanceFactory.neverDeserialize");
+ handler.getEntryColumnData(tableMetaDataView, nonCompositeKey, value, Operation.DESTROY);
}
@Test
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreatorTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreatorTest.java
index ee6b34c..b808379 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreatorTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreatorTest.java
@@ -25,7 +25,9 @@ import java.util.Arrays;
import junitparams.JUnitParamsRunner;
import junitparams.Parameters;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.apache.geode.connectors.jdbc.internal.configuration.FieldMapping;
@@ -52,6 +54,9 @@ public class SqlToPdxInstanceCreatorTest {
private FieldMapping columnMapping = mock(FieldMapping.class);
private PdxInstance pdxTemplate = mock(PdxInstance.class);
+ @Rule
+ public ExpectedException thrown = ExpectedException.none();
+
@Before
public void setup() throws Exception {
cache = mock(InternalCache.class);
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceTest.java
index 35abad7..9c97fc1 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceTest.java
@@ -15,7 +15,6 @@
package org.apache.geode.connectors.jdbc.internal;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -31,7 +30,9 @@ import java.util.Date;
import junitparams.JUnitParamsRunner;
import junitparams.Parameters;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.apache.geode.connectors.jdbc.JdbcConnectorException;
@@ -53,6 +54,9 @@ public class SqlToPdxInstanceTest {
private ResultSet resultSet;
private ResultSetMetaData metaData = mock(ResultSetMetaData.class);
+ @Rule
+ public ExpectedException thrown = ExpectedException.none();
+
@Before
public void setup() throws Exception {
resultSet = mock(ResultSet.class);
@@ -114,11 +118,12 @@ public class SqlToPdxInstanceTest {
when(resultSet.getString(1)).thenReturn("column1");
when(resultSet.getString(2)).thenReturn("column2");
sqlToPdxInstance.addMapping(COLUMN_NAME_2, PDX_FIELD_NAME_2, FieldType.STRING);
+ thrown.expect(JdbcConnectorException.class);
+ thrown.expectMessage("The jdbc-mapping does not contain the column name \""
+ + COLUMN_NAME_1
+ + "\". This is probably caused by a column being added to the table after the jdbc-mapping was created.");
- assertThatThrownBy(() -> createPdxInstance()).isInstanceOf(JdbcConnectorException.class)
- .hasMessageContaining("The jdbc-mapping does not contain the column name \""
- + COLUMN_NAME_1
- + "\". This is probably caused by a column being added to the table after the jdbc-mapping was created.");
+ createPdxInstance();
}
@Test
@@ -197,10 +202,10 @@ public class SqlToPdxInstanceTest {
when(blob.length()).thenReturn((long) Integer.MAX_VALUE + 1);
when(resultSet.getBlob(1)).thenReturn(blob);
sqlToPdxInstance.addMapping(COLUMN_NAME_1, PDX_FIELD_NAME_1, fieldType);
+ thrown.expect(JdbcConnectorException.class);
+ thrown.expectMessage("Blob of length 2147483648 is too big to be converted to a byte array.");
- assertThatThrownBy(() -> createPdxInstance()).isInstanceOf(JdbcConnectorException.class)
- .hasMessageContaining(
- "Blob of length 2147483648 is too big to be converted to a byte array.");
+ createPdxInstance();
}
@Test
@@ -305,9 +310,10 @@ public class SqlToPdxInstanceTest {
sqlToPdxInstance.addMapping(COLUMN_NAME_1, PDX_FIELD_NAME_1, fieldType);
String returnValue = "ReturnValue";
when(resultSet.getObject(1)).thenReturn(returnValue);
+ thrown.expect(JdbcConnectorException.class);
+ thrown.expectMessage("Could not convert ");
- assertThatThrownBy(() -> createPdxInstance()).isInstanceOf(JdbcConnectorException.class)
- .hasMessageContaining("Could not convert ");
+ createPdxInstance();
}
@Test
@@ -317,9 +323,10 @@ public class SqlToPdxInstanceTest {
sqlToPdxInstance.addMapping(COLUMN_NAME_1, PDX_FIELD_NAME_1, FieldType.STRING);
sqlToPdxInstance.addMapping(COLUMN_NAME_2, PDX_FIELD_NAME_2, FieldType.STRING);
when(resultSet.next()).thenReturn(true);
+ thrown.expect(JdbcConnectorException.class);
+ thrown.expectMessage("Multiple rows returned for query: ");
- assertThatThrownBy(() -> createPdxInstance()).isInstanceOf(JdbcConnectorException.class)
- .hasMessageContaining("Multiple rows returned for query: ");
+ createPdxInstance();
}
private PdxInstance createPdxInstance() throws SQLException {
diff --git a/geode-experimental-driver/build.gradle b/geode-experimental-driver/build.gradle
index 6de4b8f..c63823e 100644
--- a/geode-experimental-driver/build.gradle
+++ b/geode-experimental-driver/build.gradle
@@ -51,6 +51,5 @@ dependencies {
exclude module: 'junit-dep'
}
integrationTestImplementation('junit:junit')
- integrationTestImplementation('org.assertj:assertj-core')
integrationTestImplementation('org.hamcrest:hamcrest')
}
diff --git a/geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/SSLTest.java b/geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/SSLTest.java
index 6d09c48..4c8be43 100644
--- a/geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/SSLTest.java
+++ b/geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/SSLTest.java
@@ -26,7 +26,8 @@ import static org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTOR
import static org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE_PASSWORD;
import static org.apache.geode.internal.Assert.assertTrue;
import static org.apache.geode.test.util.ResourceUtils.createTempFileFromResource;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.hamcrest.Matchers.anyOf;
+import static org.hamcrest.Matchers.instanceOf;
import static org.junit.Assert.assertEquals;
import java.io.IOException;
@@ -43,6 +44,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
import org.junit.experimental.categories.Category;
+import org.junit.rules.ExpectedException;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -58,6 +60,9 @@ public class SSLTest {
@Rule
public RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
+ @Rule
+ public ExpectedException expectedException = ExpectedException.none();
+
private final String DEFAULT_KEY_STORE =
createTempFileFromResource(SSLTest.class, "default.keystore").getAbsolutePath();
private final String SERVER_KEY_STORE =
@@ -129,8 +134,8 @@ public class SSLTest {
// using TLSv1.2 specifically so that in jdk11 (by default using TLSv1.3) this won't take
// too long to finish.
startLocator(SERVER_KEY_STORE, SERVER_TRUST_STORE, true, "TLSv1.2", "any");
- assertThatThrownBy(() -> new DriverFactory().addLocator("localhost", locatorPort).create())
- .isInstanceOf(IOException.class);
+ expectedException.expect(IOException.class);
+ driver = new DriverFactory().addLocator("localhost", locatorPort).create();
}
@Test
@@ -148,10 +153,10 @@ public class SSLTest {
public void driverCannotConnectWithBogusClientKeystore() throws Exception {
startLocator(DEFAULT_KEY_STORE, DEFAULT_KEY_STORE, true, "any", "any");
startServer();
-
- assertThatThrownBy(() -> new DriverFactory().addLocator("localhost", locatorPort)
- .setTrustStorePath(CLIENT_TRUST_STORE).setKeyStorePath(BOGUSCLIENT_KEY_STORE).create())
- .isInstanceOfAny(SSLException.class, SocketException.class);
+ expectedException
+ .expect(anyOf(instanceOf(SSLException.class), instanceOf(SocketException.class)));
+ driver = new DriverFactory().addLocator("localhost", locatorPort)
+ .setTrustStorePath(CLIENT_TRUST_STORE).setKeyStorePath(BOGUSCLIENT_KEY_STORE).create();
}
@Test
@@ -160,10 +165,9 @@ public class SSLTest {
// too long to finish.
startLocator(BOGUSSERVER_KEY_STORE, SERVER_TRUST_STORE, true, "TLSv1.2", "any");
startServer();
-
- assertThatThrownBy(() -> new DriverFactory().addLocator("localhost", locatorPort)
- .setTrustStorePath(CLIENT_TRUST_STORE).setKeyStorePath(CLIENT_KEY_STORE).create())
- .isInstanceOf(SSLException.class);
+ expectedException.expect(SSLException.class);
+ driver = new DriverFactory().addLocator("localhost", locatorPort)
+ .setTrustStorePath(CLIENT_TRUST_STORE).setKeyStorePath(CLIENT_KEY_STORE).create();
}
@Test
@@ -181,10 +185,10 @@ public class SSLTest {
public void driverCannotConnectIfProtocolsMismatch() throws Exception {
startLocator(SERVER_KEY_STORE, SERVER_TRUST_STORE, true, "TLSv1.1", "any");
startServer();
-
- assertThatThrownBy(() -> new DriverFactory().addLocator("localhost", locatorPort)
+ expectedException.expect(SSLException.class);
+ driver = new DriverFactory().addLocator("localhost", locatorPort)
.setTrustStorePath(CLIENT_TRUST_STORE).setKeyStorePath(CLIENT_KEY_STORE)
- .setProtocols("TLSv1.2").create()).isInstanceOf(SSLException.class);
+ .setProtocols("TLSv1.2").create();
}
@Test
@@ -192,9 +196,9 @@ public class SSLTest {
startLocator(SERVER_KEY_STORE, SERVER_TRUST_STORE, true, "any",
"TLS_DHE_DSS_WITH_AES_128_CBC_SHA256");
startServer();
-
- assertThatThrownBy(() -> new DriverFactory().addLocator("localhost", locatorPort)
+ expectedException.expect(SSLException.class);
+ driver = new DriverFactory().addLocator("localhost", locatorPort)
.setTrustStorePath(CLIENT_TRUST_STORE).setKeyStorePath(CLIENT_KEY_STORE)
- .setCiphers("TLS_DHE_DSS_WITH_AES_128_CBC_SHA").create()).isInstanceOf(SSLException.class);
+ .setCiphers("TLS_DHE_DSS_WITH_AES_128_CBC_SHA").create();
}
}
diff --git a/geode-gfsh/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/RestoreRedundancyCommandDUnitTest.java b/geode-gfsh/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/RestoreRedundancyCommandDUnitTest.java
index 238646d..980d06e 100644
--- a/geode-gfsh/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/RestoreRedundancyCommandDUnitTest.java
+++ b/geode-gfsh/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/RestoreRedundancyCommandDUnitTest.java
@@ -38,9 +38,9 @@ import static org.apache.geode.management.internal.i18n.CliStrings.REDUNDANCY_IN
import static org.apache.geode.management.internal.i18n.CliStrings.REDUNDANCY_REASSIGN_PRIMARIES;
import static org.apache.geode.management.internal.i18n.CliStrings.RESTORE_REDUNDANCY;
import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.lessThanOrEqualTo;
import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertThat;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/geode-gfsh/src/test/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecutionTest.java b/geode-gfsh/src/test/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecutionTest.java
index 5762325..7e1a993 100644
--- a/geode-gfsh/src/test/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecutionTest.java
+++ b/geode-gfsh/src/test/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecutionTest.java
@@ -36,7 +36,9 @@ import java.util.Set;
import org.apache.shiro.subject.Subject;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.ExpectedException;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.Execution;
@@ -67,6 +69,9 @@ public class UserFunctionExecutionTest {
private InternalCacheForClientAccess filterCache;
private ArgumentCaptor<CliFunctionResult> resultCaptor;
+ @Rule
+ public ExpectedException expectedException = ExpectedException.none();
+
@Before
@SuppressWarnings("unchecked")
public void setUp() throws Exception {
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolder.java b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolder.java
index 4867fb1..ea4f806 100755
--- a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolder.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolder.java
@@ -16,7 +16,6 @@ package org.apache.geode.test.junit.rules.serializable;
import static org.apache.geode.test.junit.rules.serializable.FieldSerializationUtils.readField;
import static org.apache.geode.test.junit.rules.serializable.FieldSerializationUtils.writeField;
-import static org.apache.geode.test.junit.rules.serializable.FieldsOfTemporaryFolder.FIELD_ASSURE_DELETION;
import static org.apache.geode.test.junit.rules.serializable.FieldsOfTemporaryFolder.FIELD_FOLDER;
import static org.apache.geode.test.junit.rules.serializable.FieldsOfTemporaryFolder.FIELD_PARENT_FOLDER;
@@ -77,17 +76,13 @@ public class SerializableTemporaryFolder extends TemporaryFolder implements Seri
}
public SerializableTemporaryFolder() {
- this((File) null);
+ this(null);
}
public SerializableTemporaryFolder(File parentFolder) {
super(parentFolder);
}
- public SerializableTemporaryFolder(Builder builder) {
- super(builder);
- }
-
/**
* Specifying false will prevent deletion of the temporary folder and its contents. Default is
* true.
@@ -105,7 +100,6 @@ public class SerializableTemporaryFolder extends TemporaryFolder implements Seri
return this;
}
-
/**
* Specifies conditions under which {@code copyTo} is performed. Default is {@code FAIL}.
*/
@@ -189,25 +183,15 @@ public class SerializableTemporaryFolder extends TemporaryFolder implements Seri
private final File parentFolder;
private final File folder;
- private final boolean assureDeletion;
private SerializationProxy(SerializableTemporaryFolder instance) {
parentFolder = (File) readField(TemporaryFolder.class, instance, FIELD_PARENT_FOLDER);
folder = (File) readField(TemporaryFolder.class, instance, FIELD_FOLDER);
- assureDeletion = (boolean) readField(TemporaryFolder.class, instance, FIELD_ASSURE_DELETION);
}
protected Object readResolve() {
- Builder instanceBuilder = builder();
- instanceBuilder.parentFolder(parentFolder);
-
- if (assureDeletion) {
- instanceBuilder.assureDeletion();
- }
-
- SerializableTemporaryFolder instance = new SerializableTemporaryFolder(instanceBuilder);
+ SerializableTemporaryFolder instance = new SerializableTemporaryFolder(parentFolder);
writeField(TemporaryFolder.class, instance, FIELD_FOLDER, folder);
-
return instance;
}
}
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolderTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolderTest.java
index f273d11..b490bd5 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolderTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolderTest.java
@@ -15,20 +15,14 @@
package org.apache.geode.test.junit.rules.serializable;
import static org.apache.geode.test.junit.rules.serializable.FieldSerializationUtils.readField;
-import static org.apache.geode.test.junit.rules.serializable.FieldsOfTemporaryFolder.FIELD_ASSURE_DELETION;
import static org.apache.geode.test.junit.rules.serializable.FieldsOfTemporaryFolder.FIELD_FOLDER;
import static org.apache.geode.test.junit.rules.serializable.FieldsOfTemporaryFolder.FIELD_PARENT_FOLDER;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.rules.TemporaryFolder.Builder;
-import static org.junit.rules.TemporaryFolder.builder;
import java.io.File;
import java.io.Serializable;
import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
import org.apache.commons.lang3.SerializationUtils;
import org.junit.Rule;
@@ -44,12 +38,9 @@ public class SerializableTemporaryFolderTest {
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Test
- public void hasThreeFields() {
+ public void hasTwoFields() {
Field[] fields = TemporaryFolder.class.getDeclaredFields();
- List<Field> nonStaticFields =
- Arrays.stream(fields).filter(f -> !Modifier.isStatic(f.getModifiers())).collect(
- Collectors.toList());
- assertThat(nonStaticFields).hasSize(3);
+ assertThat(fields.length).as("Fields: " + Arrays.asList(fields)).isEqualTo(2);
}
@Test
@@ -65,12 +56,6 @@ public class SerializableTemporaryFolderTest {
}
@Test
- public void fieldAssureDeletionShouldExist() throws Exception {
- Field field = TemporaryFolder.class.getDeclaredField(FIELD_ASSURE_DELETION);
- assertThat(field.getType()).isEqualTo(boolean.class);
- }
-
- @Test
public void fieldsCanBeRead() throws Exception {
File parentFolder = temporaryFolder.getRoot();
@@ -81,7 +66,6 @@ public class SerializableTemporaryFolderTest {
.isEqualTo(parentFolder);
assertThat(readField(TemporaryFolder.class, instance, FIELD_FOLDER))
.isEqualTo(instance.getRoot());
- assertThat(readField(TemporaryFolder.class, instance, FIELD_ASSURE_DELETION)).isEqualTo(false);
}
@Test
@@ -91,12 +75,9 @@ public class SerializableTemporaryFolderTest {
@Test
public void canBeSerialized() throws Exception {
- Builder instanceBuilder = builder();
File parentFolder = temporaryFolder.getRoot();
- instanceBuilder.parentFolder(parentFolder);
- instanceBuilder.assureDeletion();
- SerializableTemporaryFolder instance = new SerializableTemporaryFolder(instanceBuilder);
+ SerializableTemporaryFolder instance = new SerializableTemporaryFolder(parentFolder);
instance.create();
SerializableTemporaryFolder cloned = SerializationUtils.clone(instance);
@@ -104,6 +85,5 @@ public class SerializableTemporaryFolderTest {
assertThat(readField(TemporaryFolder.class, cloned, FIELD_PARENT_FOLDER))
.isEqualTo(parentFolder);
assertThat(readField(TemporaryFolder.class, cloned, FIELD_FOLDER)).isEqualTo(cloned.getRoot());
- assertThat(readField(TemporaryFolder.class, cloned, FIELD_ASSURE_DELETION)).isEqualTo(true);
}
}
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/runners/CategoryWithParameterizedRunnerFactoryTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/runners/CategoryWithParameterizedRunnerFactoryTest.java
index cd46d2b..4582d4a 100644
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/runners/CategoryWithParameterizedRunnerFactoryTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/runners/CategoryWithParameterizedRunnerFactoryTest.java
@@ -117,7 +117,9 @@ public class CategoryWithParameterizedRunnerFactoryTest {
request = request.filterWith(new CategoryFilter(
(ExposedBlockJUnit4ClassRunnerWithParameters) runner.getChildren().get(0)));
Result result = new JUnitCore().run(request);
- assertEquals(2, result.getRunCount());
+ assertEquals(
+ "Yeah!! This might actually mean we've upgraded to JUnit 4.13. Hurry up already and delete this hack.",
+ 1, result.getRunCount());
}
@Test
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ClearRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ClearRequestOperationHandlerJUnitTest.java
index 854c633..c5d571e 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ClearRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ClearRequestOperationHandlerJUnitTest.java
@@ -20,8 +20,10 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.rules.ExpectedException;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionDestroyedException;
@@ -38,6 +40,9 @@ public class ClearRequestOperationHandlerJUnitTest
private final String TEST_REGION = "test region";
private final String MISSING_REGION = "missing region";
+ @Rule
+ public final ExpectedException expectedException = ExpectedException.none();
+
@Before
public void setUp() throws Exception {
@SuppressWarnings("unchecked")
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ExecuteFunctionOnGroupRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ExecuteFunctionOnGroupRequestOperationHandlerJUnitTest.java
index a32294a..f6e9c72 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ExecuteFunctionOnGroupRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ExecuteFunctionOnGroupRequestOperationHandlerJUnitTest.java
@@ -27,8 +27,10 @@ import java.util.concurrent.atomic.AtomicReference;
import org.junit.After;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.rules.ExpectedException;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
@@ -58,6 +60,9 @@ public class ExecuteFunctionOnGroupRequestOperationHandlerJUnitTest {
private ExecuteFunctionOnGroupRequestOperationHandler operationHandler;
private ProtobufSerializationService serializationService;
+ @Rule
+ public final ExpectedException expectedException = ExpectedException.none();
+
private static class TestFunction implements Function<Void> {
// non-null iff function has been executed.
private AtomicReference<FunctionContext<Void>> context = new AtomicReference<>();
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetAllRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetAllRequestOperationHandlerJUnitTest.java
index 29145a1..9e265c2 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetAllRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetAllRequestOperationHandlerJUnitTest.java
@@ -15,7 +15,6 @@
package org.apache.geode.internal.protocol.protobuf.v1.operations;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.Assertions.entry;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
@@ -30,8 +29,10 @@ import java.util.Map;
import java.util.Set;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.rules.ExpectedException;
import org.apache.geode.cache.CacheLoaderException;
import org.apache.geode.cache.Region;
@@ -61,6 +62,9 @@ public class GetAllRequestOperationHandlerJUnitTest
private static final String NO_VALUE_PRESENT_FOR_THIS_KEY = "no value present for this key";
private Region<String, String> regionStub;
+ @Rule
+ public ExpectedException expectedException = ExpectedException.none();
+
@SuppressWarnings("unchecked")
@Before
public void setUp() {
@@ -95,11 +99,13 @@ public class GetAllRequestOperationHandlerJUnitTest
RegionAPI.GetAllRequest getRequest =
ProtobufRequestUtilities.createGetAllRequest(TEST_REGION, keys);
- assertThatThrownBy(() -> operationHandler.process(serializationServiceStub, getRequest,
- TestExecutionContext.getNoAuthCacheExecutionContext(cacheStub)))
- .isInstanceOf(DecodingException.class);
+ expectedException.expect(DecodingException.class);
+ operationHandler.process(serializationServiceStub, getRequest,
+ TestExecutionContext.getNoAuthCacheExecutionContext(cacheStub));
}
+
+
@Test
public void processReturnsExpectedValuesForValidKeys() throws Exception {
Result<GetAllResponse> result =
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetSizeRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetSizeRequestOperationHandlerJUnitTest.java
index 2b6d996..fc33f81 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetSizeRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetSizeRequestOperationHandlerJUnitTest.java
@@ -16,7 +16,6 @@ package org.apache.geode.internal.protocol.protobuf.v1.operations;
import static org.apache.geode.internal.protocol.TestExecutionContext.getNoAuthCacheExecutionContext;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -25,8 +24,10 @@ import java.util.Collections;
import java.util.HashSet;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.rules.ExpectedException;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
@@ -46,6 +47,9 @@ public class GetSizeRequestOperationHandlerJUnitTest
private final String TEST_REGION1 = "test region 1";
private Region<String, Integer> region1Stub;
+ @Rule
+ public ExpectedException expectedException = ExpectedException.none();
+
@SuppressWarnings("unchecked")
@Before
public void setUp() {
@@ -83,8 +87,9 @@ public class GetSizeRequestOperationHandlerJUnitTest
when(emptyCache.rootRegions())
.thenReturn(Collections.unmodifiableSet(new HashSet<Region<String, String>>()));
String unknownRegionName = "UNKNOWN_REGION";
- assertThatThrownBy(() -> operationHandler.process(serializationService,
+ expectedException.expect(RegionDestroyedException.class);
+ operationHandler.process(serializationService,
MessageUtil.makeGetSizeRequest(unknownRegionName),
- getNoAuthCacheExecutionContext(emptyCache))).isInstanceOf(RegionDestroyedException.class);
+ getNoAuthCacheExecutionContext(emptyCache));
}
}
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutIfAbsentRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutIfAbsentRequestOperationHandlerJUnitTest.java
index 25eaa3d..4476a7e 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutIfAbsentRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutIfAbsentRequestOperationHandlerJUnitTest.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.internal.protocol.protobuf.v1.operations;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -25,8 +24,10 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.rules.ExpectedException;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionDestroyedException;
@@ -48,6 +49,9 @@ public class PutIfAbsentRequestOperationHandlerJUnitTest extends OperationHandle
private Region regionMock;
private PutIfAbsentRequestOperationHandler operationHandler;
+ @Rule
+ public final ExpectedException expectedException = ExpectedException.none();
+
@Before
public void setUp() throws Exception {
regionMock = mock(Region.class);
@@ -120,20 +124,20 @@ public class PutIfAbsentRequestOperationHandlerJUnitTest extends OperationHandle
}
@Test
- public void unsetRegionGetsServerError() {
- assertThatThrownBy(
- () -> operationHandler.process(serializationService, generateTestRequest(false, true),
- TestExecutionContext.getNoAuthCacheExecutionContext(cacheStub)))
- .isInstanceOf(RegionDestroyedException.class);
+ public void unsetRegionGetsServerError() throws Exception {
+ expectedException.expect(RegionDestroyedException.class);
+ Result<RegionAPI.PutIfAbsentResponse> result1 =
+ operationHandler.process(serializationService, generateTestRequest(false, true),
+ TestExecutionContext.getNoAuthCacheExecutionContext(cacheStub));
}
@Test
public void nonexistingRegionReturnsServerError() throws Exception {
when(cacheStub.getRegion(TEST_REGION)).thenReturn(null);
- assertThatThrownBy(() -> operationHandler.process(serializationService,
- generateTestRequest(), TestExecutionContext.getNoAuthCacheExecutionContext(cacheStub)))
- .isInstanceOf(RegionDestroyedException.class);
+ expectedException.expect(RegionDestroyedException.class);
+ Result<RegionAPI.PutIfAbsentResponse> result1 = operationHandler.process(serializationService,
+ generateTestRequest(), TestExecutionContext.getNoAuthCacheExecutionContext(cacheStub));
}
/**
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutRequestOperationHandlerJUnitTest.java
index b1ed4ee..49f340a 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutRequestOperationHandlerJUnitTest.java
@@ -24,13 +24,16 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.rules.ExpectedException;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionDestroyedException;
import org.apache.geode.internal.protocol.TestExecutionContext;
import org.apache.geode.internal.protocol.protobuf.v1.BasicTypes;
+import org.apache.geode.internal.protocol.protobuf.v1.Failure;
import org.apache.geode.internal.protocol.protobuf.v1.ProtobufRequestUtilities;
import org.apache.geode.internal.protocol.protobuf.v1.ProtobufSerializationService;
import org.apache.geode.internal.protocol.protobuf.v1.RegionAPI;
@@ -49,6 +52,9 @@ public class PutRequestOperationHandlerJUnitTest
private final String TEST_REGION = "test region";
private Region<Object, Object> regionMock;
+ @Rule
+ public ExpectedException expectedException = ExpectedException.none();
+
@SuppressWarnings("unchecked")
@Before
public void setUp() {
@@ -93,13 +99,14 @@ public class PutRequestOperationHandlerJUnitTest
}
@Test
- public void test_RegionNotFound() {
+ public void test_RegionNotFound() throws Exception {
when(cacheStub.getRegion(TEST_REGION)).thenReturn(null);
PutRequestOperationHandler operationHandler = new PutRequestOperationHandler();
+ expectedException.expect(RegionDestroyedException.class);
+ Result<?> result = operationHandler.process(serializationService, generateTestRequest(),
+ TestExecutionContext.getNoAuthCacheExecutionContext(cacheStub));
+ assertThat(result).isInstanceOf(Failure.class);
- assertThatThrownBy(() -> operationHandler.process(serializationService, generateTestRequest(),
- TestExecutionContext.getNoAuthCacheExecutionContext(cacheStub)))
- .isInstanceOf(RegionDestroyedException.class);
}
private RegionAPI.PutRequest generateTestRequest() throws EncodingException {
diff --git a/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SDiffIntegrationTest.java b/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SDiffIntegrationTest.java
index ef74193..44a187a 100755
--- a/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SDiffIntegrationTest.java
+++ b/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SDiffIntegrationTest.java
@@ -26,8 +26,10 @@ import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.ClassRule;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.rules.ExpectedException;
import redis.clients.jedis.Jedis;
import org.apache.geode.redis.GeodeRedisServerRule;
@@ -58,6 +60,9 @@ public class SDiffIntegrationTest {
jedis.flushAll();
}
+ @Rule
+ public ExpectedException exceptionRule = ExpectedException.none();
+
@Test
public void testSDiff() {
String[] firstSet = new String[] {"pear", "apple", "plum", "orange", "peach"};
diff --git a/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SInterIntegrationTest.java b/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SInterIntegrationTest.java
index b6d7abc..1de6ad9 100755
--- a/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SInterIntegrationTest.java
+++ b/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SInterIntegrationTest.java
@@ -26,8 +26,10 @@ import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.ClassRule;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.rules.ExpectedException;
import redis.clients.jedis.Jedis;
import org.apache.geode.redis.GeodeRedisServerRule;
@@ -58,6 +60,9 @@ public class SInterIntegrationTest {
jedis.flushAll();
}
+ @Rule
+ public ExpectedException exceptionRule = ExpectedException.none();
+
@Test
public void testSInter() {
String[] firstSet = new String[] {"pear", "apple", "plum", "orange", "peach"};
diff --git a/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SMoveIntegrationTest.java b/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SMoveIntegrationTest.java
index 5738ef7..6cbcadf 100755
--- a/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SMoveIntegrationTest.java
+++ b/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SMoveIntegrationTest.java
@@ -28,8 +28,10 @@ import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.ClassRule;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.rules.ExpectedException;
import redis.clients.jedis.Jedis;
import org.apache.geode.management.internal.cli.util.ThreePhraseGenerator;
@@ -62,6 +64,9 @@ public class SMoveIntegrationTest {
jedis.flushAll();
}
+ @Rule
+ public ExpectedException exceptionRule = ExpectedException.none();
+
@Test
public void testSMove() {
String source = generator.generate('x');
diff --git a/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SPopIntegrationTest.java b/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SPopIntegrationTest.java
index d5dfc17..ea23195 100755
--- a/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SPopIntegrationTest.java
+++ b/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SPopIntegrationTest.java
@@ -24,8 +24,10 @@ import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.ClassRule;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.rules.ExpectedException;
import redis.clients.jedis.Jedis;
import org.apache.geode.redis.GeodeRedisServerRule;
@@ -56,6 +58,9 @@ public class SPopIntegrationTest {
jedis.flushAll();
}
+ @Rule
+ public ExpectedException exceptionRule = ExpectedException.none();
+
@Test
public void testSPop() {
int ENTRIES = 10;
diff --git a/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SRemIntegrationTest.java b/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SRemIntegrationTest.java
index 6aa7598..cb567bd 100755
--- a/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SRemIntegrationTest.java
+++ b/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SRemIntegrationTest.java
@@ -26,8 +26,10 @@ import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.ClassRule;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.rules.ExpectedException;
import redis.clients.jedis.Jedis;
import org.apache.geode.redis.GeodeRedisServerRule;
@@ -58,6 +60,9 @@ public class SRemIntegrationTest {
jedis.flushAll();
}
+ @Rule
+ public ExpectedException exceptionRule = ExpectedException.none();
+
@Test
public void testSRem_should_ReturnTheNumberOfElementsRemoved() {
String key = "key";
diff --git a/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SUnionIntegrationTest.java b/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SUnionIntegrationTest.java
index af8f6e1..e6d1f75 100755
--- a/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SUnionIntegrationTest.java
+++ b/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SUnionIntegrationTest.java
@@ -26,8 +26,10 @@ import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.ClassRule;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.rules.ExpectedException;
import redis.clients.jedis.Jedis;
import org.apache.geode.redis.GeodeRedisServerRule;
@@ -58,6 +60,9 @@ public class SUnionIntegrationTest {
jedis.flushAll();
}
+ @Rule
+ public ExpectedException exceptionRule = ExpectedException.none();
+
@Test
public void testSUnion() {
String[] firstSet = new String[] {"pear", "apple", "plum", "orange", "peach"};
diff --git a/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SetsIntegrationTest.java b/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SetsIntegrationTest.java
index f50caed..6c5b101 100755
--- a/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SetsIntegrationTest.java
+++ b/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SetsIntegrationTest.java
@@ -30,8 +30,10 @@ import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.ClassRule;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.rules.ExpectedException;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.exceptions.JedisDataException;
@@ -65,6 +67,9 @@ public class SetsIntegrationTest {
jedis.flushAll();
}
+ @Rule
+ public ExpectedException exceptionRule = ExpectedException.none();
+
@Test
public void testSAddSCard() {
int elements = 10;