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 2018/08/24 17:37:10 UTC
[geode] branch develop updated: GEODE-5632: import Assertions
instead of AssertionsForClassTypes
This is an automated email from the ASF dual-hosted git repository.
klund pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 9de289d GEODE-5632: import Assertions instead of AssertionsForClassTypes
9de289d is described below
commit 9de289d0315f0866ead4a199f68d5afc05f5f69f
Author: Kirk Lund <kl...@apache.org>
AuthorDate: Thu Aug 23 16:14:28 2018 -0700
GEODE-5632: import Assertions instead of AssertionsForClassTypes
---
.../geode/connectors/jdbc/JdbcAsyncWriterTest.java | 4 ++--
.../apache/geode/connectors/jdbc/JdbcWriterTest.java | 2 +-
.../client/internal/QueueConnectionImplJUnitTest.java | 6 +++---
.../datasource/GemFireBasicDataSourceJUnitTest.java | 17 +++++------------
4 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterTest.java
index 69c17df..51dcfd1 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterTest.java
@@ -15,7 +15,7 @@
package org.apache.geode.connectors.jdbc;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
@@ -46,7 +46,7 @@ public class JdbcAsyncWriterTest {
private InternalCache cache;
@Before
- public void setup() {
+ public void setUp() {
sqlHandler = mock(SqlHandler.class);
region = mock(InternalRegion.class);
cache = Fakes.cache();
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterTest.java
index 5963015..048c0b7 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterTest.java
@@ -15,7 +15,7 @@
package org.apache.geode.connectors.jdbc;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueConnectionImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueConnectionImplJUnitTest.java
index b72663b..17bd215 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueConnectionImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueConnectionImplJUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.cache.client.internal;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.Mockito.mock;
import org.junit.Test;
@@ -23,11 +23,11 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.client.internal.pooling.ConnectionDestroyedException;
import org.apache.geode.test.junit.categories.ClientServerTest;
-@Category({ClientServerTest.class})
+@Category(ClientServerTest.class)
public class QueueConnectionImplJUnitTest {
@Test
- public void testInternalDestroyFollowedByInternalClose() throws Exception {
+ public void testInternalDestroyFollowedByInternalClose() {
// Mock ClientUpdater and Connection
ClientUpdater updater = mock(ClientUpdater.class);
Connection connection = mock(Connection.class);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/datasource/GemFireBasicDataSourceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/datasource/GemFireBasicDataSourceJUnitTest.java
index d7d7d5d..3225858 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/datasource/GemFireBasicDataSourceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/datasource/GemFireBasicDataSourceJUnitTest.java
@@ -12,35 +12,30 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package org.apache.geode.internal.datasource;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.util.HashMap;
import java.util.Map;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-
public class GemFireBasicDataSourceJUnitTest {
+
private GemFireBasicDataSource dataSource;
- private Map params = new HashMap();
+ private Map<String, String> params;
@Before
public void setUp() {
+ params = new HashMap<>();
+
params.put("connection-url", "jdbc:postgresql://myurl:5432");
params.put("jdbc-driver-class", "org.apache.geode.internal.datasource.TestDriver");
params.put("jndi-name", "datasource");
}
- @After
- public void cleanUp() {
- params.clear();
- }
-
@Test
public void connectWithoutUsernameOrPassword() throws DataSourceCreateException {
dataSource = (GemFireBasicDataSource) DataSourceFactory.getSimpleDataSource(params);
@@ -59,7 +54,6 @@ public class GemFireBasicDataSourceJUnitTest {
.hasMessage("Test Driver Connection attempted!");
}
-
@Test
public void connectWithPasswordButNoUsername() throws DataSourceCreateException {
params.put("password", "myPassword");
@@ -68,6 +62,5 @@ public class GemFireBasicDataSourceJUnitTest {
assertThatThrownBy(() -> dataSource.getConnection())
.hasMessage("Test Driver Connection attempted!");
-
}
}