adapt some tests

apache · Mar 16, 2024 · ad5b5f2 · ad5b5f2
1 parent 66122a6
commit ad5b5f2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 56 deletions.
diff --git a/hugegraph-pd/hg-pd-test/src/main/java/org/apache/hugegraph/pd/MonitorServiceTest.java b/hugegraph-pd/hg-pd-test/src/main/java/org/apache/hugegraph/pd/MonitorServiceTest.java
@@ -25,8 +25,6 @@
 import org.junit.Assert;
 import org.junit.BeforeClass;
 
-// import org.junit.Test;
-
 public class MonitorServiceTest {
     static PDConfig pdConfig;
 

diff --git a/hugegraph-pd/hg-pd-test/src/main/java/org/apache/hugegraph/pd/PartitionCacheTest.java b/hugegraph-pd/hg-pd-test/src/main/java/org/apache/hugegraph/pd/PartitionCacheTest.java
@@ -25,14 +25,15 @@
 import org.apache.hugegraph.pd.common.KVPair;
 import org.apache.hugegraph.pd.common.PartitionCache;
 import org.apache.hugegraph.pd.grpc.Metapb;
+import org.junit.Test;
 
 import com.google.common.collect.Range;
 import com.google.common.collect.RangeMap;
 import com.google.common.collect.TreeRangeMap;
 
 public class PartitionCacheTest {
 
-    // @Test
+    @Test
     public void test() {
         PartitionCache cache = new PartitionCache();
         for (int i = 0; i < 10; i++) {
@@ -51,7 +52,7 @@ public void test() {
     }
 
 
-    // @Test
+    @Test
     public void test1() {
         Map<String, RangeMap<Long, Integer>> keyToPartIdCache = new HashMap<>();
         // graphName + PartitionID组成key

diff --git a/hugegraph-pd/hg-pd-test/src/main/java/org/apache/hugegraph/pd/StoreNodeServiceTest.java b/hugegraph-pd/hg-pd-test/src/main/java/org/apache/hugegraph/pd/StoreNodeServiceTest.java
@@ -37,6 +37,7 @@
 import org.apache.hugegraph.pd.grpc.pulse.TransferLeader;
 import org.junit.Assert;
 import org.junit.BeforeClass;
+import org.junit.Test;
 
 public class StoreNodeServiceTest {
     static PDConfig pdConfig;
@@ -87,13 +88,16 @@ public static void deleteDirectory(File dir) {
         }
     }
 
-    // @Test
+    @Test
     public void testStoreNodeService() throws PDException {
         Assert.assertEquals(pdConfig.getPartition().getTotalCount(),
                             (long) pdConfig.getInitialStoreMap().size() *
                             pdConfig.getPartition().getMaxShardsPerStore()
                             / pdConfig.getPartition().getShardCount());
         StoreNodeService storeService = new StoreNodeService(pdConfig);
+        PartitionService partitionService = new PartitionService(pdConfig, storeService);
+        storeService.init(partitionService);
+
         int count = 6;
         Metapb.Store[] stores = new Metapb.Store[count];
         for (int i = 0; i < count; i++) {
@@ -168,7 +172,7 @@ public void testStoreNodeService() throws PDException {
 
     }
 
-    // @Test
+    @Test
     public void testSplitPartition() throws PDException {
         StoreNodeService storeService = new StoreNodeService(pdConfig);
         PartitionService partitionService = new PartitionService(pdConfig, storeService);
@@ -258,7 +262,7 @@ public void changePartitionKeyRange(Metapb.Partition partition,
         });
     }
 
-    // @Test
+    @Test
     public void testPartitionService() throws PDException, ExecutionException,
                                               InterruptedException {
         StoreNodeService storeService = new StoreNodeService(pdConfig);
@@ -267,7 +271,7 @@ public void testPartitionService() throws PDException, ExecutionException,
         for (int i = 0; i < count; i++) {
             Metapb.Store store = Metapb.Store.newBuilder()
                                              .setId(0)
-                                             .setAddress(String.valueOf(i))
+                                             .setAddress("127.0.0.1:850" + i)
                                              .setDeployPath("/data")
                                              .addLabels(Metapb.StoreLabel.newBuilder()
                                                                          .setKey("namespace")
@@ -281,6 +285,7 @@ public void testPartitionService() throws PDException, ExecutionException,
 
 
         PartitionService partitionService = new PartitionService(pdConfig, storeService);
+        storeService.init(partitionService);
 
         Metapb.Graph graph = Metapb.Graph.newBuilder()
                                          .setGraphName("defaultGH")
@@ -420,7 +425,7 @@ public void onPartitionRemoved(Metapb.Partition partition) {
 
     }
 
-    // @Test
+    @Test
     public void testMergeGraphParams() throws PDException {
         StoreNodeService storeService = new StoreNodeService(pdConfig);
         PartitionService partitionService = new PartitionService(pdConfig, storeService);
@@ -466,20 +471,4 @@ public void testMergeGraphParams() throws PDException {
         Assert.assertEquals(dfGraph.getPartitionCount(), graph.getPartitionCount());
 
     }
-
-    // @Test
-    public void test() {
-        int[] n = new int[3];
-
-
-        if (++n[2] > 1) {
-            System.out.println(n[2]);
-        }
-        if (++n[2] > 1) {
-            System.out.println(n[2]);
-        }
-        if (++n[2] > 1) {
-            System.out.println(n[2]);
-        }
-    }
 }
diff --git a/hugegraph-pd/hg-pd-test/src/main/java/org/apache/hugegraph/pd/UnitTestBase.java b/hugegraph-pd/hg-pd-test/src/main/java/org/apache/hugegraph/pd/UnitTestBase.java