GEODE-7380: remove dependencies on DistributionConfig (apache#4335)

rnsasg · Nov 16, 2019 · 50f95f0 · 50f95f0
1 parent dc5ebc2
commit 50f95f0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/...egrationTest/java/org/apache/geode/distributed/internal/tcpserver/TcpServerJUnitTest.java b/...egrationTest/java/org/apache/geode/distributed/internal/tcpserver/TcpServerJUnitTest.java
@@ -15,6 +15,7 @@
 package org.apache.geode.distributed.internal.tcpserver;
 
 import static org.apache.geode.distributed.internal.membership.adapter.SocketCreatorAdapter.asTcpSocketCreator;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -92,7 +93,7 @@ public void testClientGetInfo() throws Exception {
     InfoRequest testInfoRequest = new InfoRequest();
     InfoResponse testInfoResponse =
         (InfoResponse) tcpClient.requestToServer(localhost, port, testInfoRequest, 60 * 1000);
-    assertTrue(testInfoResponse.getInfo()[0].contains("geode-core"));
+    assertThat(testInfoResponse.getInfo()[0]).contains("geode-core");
 
     String[] requrestedInfo = tcpClient.getInfo(localhost, port);
     assertNotNull(requrestedInfo);

diff --git a/...ava/org/apache/geode/distributed/internal/membership/MembershipDependenciesJUnitTest.java b/...ava/org/apache/geode/distributed/internal/membership/MembershipDependenciesJUnitTest.java
@@ -20,7 +20,6 @@
 import static com.tngtech.archunit.core.domain.JavaClass.Predicates.type;
 import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes;
 
-import com.tngtech.archunit.core.importer.ImportOption;
 import com.tngtech.archunit.junit.AnalyzeClasses;
 import com.tngtech.archunit.junit.ArchIgnore;
 import com.tngtech.archunit.junit.ArchTest;
@@ -51,8 +50,7 @@
 import org.apache.geode.internal.util.JavaWorkarounds;
 
 @RunWith(ArchUnitRunner.class)
-@AnalyzeClasses(packages = "org.apache.geode.distributed.internal.membership.gms..",
-    importOptions = ImportOption.DoNotIncludeTests.class)
+@AnalyzeClasses(packages = "org.apache.geode.distributed.internal.membership.gms..")
 public class MembershipDependenciesJUnitTest {
 
   /*

diff --git a/.../test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerDependenciesTest.java b/.../test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerDependenciesTest.java
@@ -27,8 +27,6 @@
 
 import org.apache.geode.DataSerializable;
 import org.apache.geode.DataSerializer;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.distributed.internal.DistributionConfigImpl;
 
 
 @RunWith(ArchUnitRunner.class)
@@ -52,11 +50,5 @@ public class TcpServerDependenciesTest {
 
               // TODO - serialization related classes
               .or(type(DataSerializer.class))
-              .or(type(DataSerializable.class))
-
-              // TODO - config
-              .or(type(DistributionConfigImpl.class))
-              .or(type(DistributionConfig.class)));
-
-
+              .or(type(DataSerializable.class)));
 }