[Java] Remove java api sub package from test module (#8853)

java/test/src/main/java/io/ray/api/test/RayConfigTest.java

@@ -1,46 +0,0 @@
-package io.ray.api.test;
-
-import io.ray.runtime.config.RayConfig;
-import io.ray.runtime.generated.Common.WorkerType;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-public class RayConfigTest {
-
-  public static final int NUM_RETRIES = 5;
-
-  @Test
-  public void testCreateRayConfig() {
-    try {
-      System.setProperty("ray.job.resource-path", "path/to/ray/job/resource/path");
-      RayConfig rayConfig = RayConfig.create();
-      Assert.assertEquals(WorkerType.DRIVER, rayConfig.workerMode);
-      Assert.assertEquals("path/to/ray/job/resource/path", rayConfig.jobResourcePath);
-    } finally {
-      // Unset system properties.
-      System.clearProperty("ray.job.resource-path");
-    }
-  }
-
-  @Test
-  public void testGenerateHeadPortRandomly() {
-    boolean isSame = true;
-    final int port1 = RayConfig.create().headRedisPort;
-    // If we the 2 ports are the same, let's retry.
-    // This is used to avoid any flaky chance.
-    for (int i = 0; i < NUM_RETRIES; ++i) {
-      final int port2 = RayConfig.create().headRedisPort;
-      if (port1 != port2) {
-        isSame = false;
-        break;
-      }
-    }
-    Assert.assertFalse(isSame);
-  }
-
-  @Test
-  public void testSpecifyHeadPort() {
-    System.setProperty("ray.redis.head-port", "11111");
-    Assert.assertEquals(RayConfig.create().headRedisPort, 11111);
-  }
-}

java/test/src/main/java/io/ray/api/test/UniqueIdTest.java

@@ -1,56 +0,0 @@
-package io.ray.api.test;
-
-import io.ray.api.id.UniqueId;
-import io.ray.runtime.util.IdUtil;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.xml.bind.DatatypeConverter;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-public class UniqueIdTest {
-
-  @Test
-  public void testConstructUniqueId() {
-    // Test `fromHexString()`
-    UniqueId id1 = UniqueId.fromHexString("00000000123456789ABCDEF123456789ABCDEF00");
-    Assert.assertEquals("00000000123456789abcdef123456789abcdef00", id1.toString());
-    Assert.assertFalse(id1.isNil());
-
-    try {
-      UniqueId id2 = UniqueId.fromHexString("000000123456789ABCDEF123456789ABCDEF00");
-      // This shouldn't be happened.
-      Assert.assertTrue(false);
-    } catch (IllegalArgumentException e) {
-      Assert.assertTrue(true);
-    }
-
-    try {
-      UniqueId id3 = UniqueId.fromHexString("GGGGGGGGGGGGG");
-      // This shouldn't be happened.
-      Assert.assertTrue(false);
-    } catch (IllegalArgumentException e) {
-      Assert.assertTrue(true);
-    }
-
-    // Test `fromByteBuffer()`
-    byte[] bytes = DatatypeConverter.parseHexBinary("0123456789ABCDEF0123456789ABCDEF01234567");
-    ByteBuffer byteBuffer = ByteBuffer.wrap(bytes, 0, 20);
-    UniqueId id4 = UniqueId.fromByteBuffer(byteBuffer);
-    Assert.assertTrue(Arrays.equals(bytes, id4.getBytes()));
-    Assert.assertEquals("0123456789abcdef0123456789abcdef01234567", id4.toString());
-
-
-    // Test `genNil()`
-    UniqueId id6 = UniqueId.NIL;
-    Assert.assertEquals("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF".toLowerCase(), id6.toString());
-    Assert.assertTrue(id6.isNil());
-  }
-
-  @Test
-  void testMurmurHash() {
-    UniqueId id = UniqueId.fromHexString("3131313131313131313132323232323232323232");
-    long remainder = Long.remainderUnsigned(IdUtil.murmurHashCode(id), 1000000000);
-    Assert.assertEquals(remainder, 787616861);
-  }
-}

java/test/src/main/java/io/ray/benchmark/ActorPressTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.benchmark;
+package io.ray.benchmark;
 
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;

java/test/src/main/java/io/ray/benchmark/MaxPressureTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.benchmark;
+package io.ray.benchmark;
 
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;

java/test/src/main/java/io/ray/benchmark/MicroBenchmarks.java

@@ -1,4 +1,4 @@
-package io.ray.api.benchmark;
+package io.ray.benchmark;
 
 import io.ray.api.Ray;
 import org.slf4j.Logger;

java/test/src/main/java/io/ray/benchmark/PressureTestParameter.java

@@ -1,4 +1,4 @@
-package io.ray.api.benchmark;
+package io.ray.benchmark;
 
 import io.ray.api.ActorHandle;
 import java.io.Serializable;

java/test/src/main/java/io/ray/benchmark/PressureTestType.java

@@ -1,4 +1,4 @@
-package io.ray.api.benchmark;
+package io.ray.benchmark;
 
 public enum PressureTestType {
 

java/test/src/main/java/io/ray/benchmark/RateLimiterPressureTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.benchmark;
+package io.ray.benchmark;
 
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;

java/test/src/main/java/io/ray/benchmark/RayBenchmarkTest.java

@@ -1,11 +1,11 @@
-package io.ray.api.benchmark;
+package io.ray.benchmark;
 
 import com.google.common.util.concurrent.RateLimiter;
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;
 import io.ray.api.function.RayFunc1;
-import io.ray.api.test.BaseTest;
+import io.ray.test.BaseTest;
 import java.io.Serializable;
 import java.text.DecimalFormat;
 import java.util.ArrayList;

java/test/src/main/java/io/ray/benchmark/RemoteResult.java

@@ -1,4 +1,4 @@
-package io.ray.api.benchmark;
+package io.ray.benchmark;
 
 import java.io.Serializable;
 

java/test/src/main/java/io/ray/benchmark/RemoteResultWrapper.java

@@ -1,4 +1,4 @@
-package io.ray.api.benchmark;
+package io.ray.benchmark;
 
 import io.ray.api.ObjectRef;
 

java/test/src/main/java/io/ray/benchmark/SingleLatencyTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.benchmark;
+package io.ray.benchmark;
 
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;

java/test/src/main/java/io/ray/test/ActorConcurrentCallTest.java

@@ -1,17 +1,15 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.options.ActorCreationOptions;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-
 @Test
 public class ActorConcurrentCallTest extends BaseTest {
 

java/test/src/main/java/io/ray/test/ActorRestartTest.java

@@ -1,9 +1,8 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import io.ray.api.ActorHandle;
 import io.ray.api.Checkpointable;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.exception.RayActorException;
 import io.ray.api.id.ActorId;
 import io.ray.api.id.UniqueId;

java/test/src/main/java/io/ray/test/ActorTest.java

@@ -1,11 +1,10 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;
 import io.ray.api.PyActorHandle;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.exception.UnreconstructableException;
 import io.ray.api.id.ActorId;
 import io.ray.api.id.UniqueId;

java/test/src/main/java/io/ray/test/BaseMultiLanguageTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;

java/test/src/main/java/io/ray/test/BaseTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import io.ray.api.Ray;

java/test/src/main/java/io/ray/test/ClassLoaderTest.java

@@ -1,10 +1,9 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import io.ray.api.ActorHandle;
 import io.ray.api.BaseActorHandle;
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.options.ActorCreationOptions;
 import io.ray.runtime.AbstractRayRuntime;
 import io.ray.runtime.functionmanager.FunctionDescriptor;

java/test/src/main/java/io/ray/test/CrossLanguageInvocationTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;

java/test/src/main/java/io/ray/test/DynamicResourceTest.java

@@ -1,10 +1,9 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.WaitResult;
 import io.ray.api.options.CallOptions;
 import io.ray.api.runtimecontext.NodeInfo;

java/test/src/main/java/io/ray/test/FailureTest.java

@@ -1,9 +1,8 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.exception.RayActorException;
 import io.ray.api.exception.RayException;
 import io.ray.api.exception.RayTaskException;

java/test/src/main/java/io/ray/test/GcsClientTest.java

@@ -1,7 +1,6 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.base.Preconditions;
-import io.ray.api.TestUtils;
 import io.ray.api.id.JobId;
 import io.ray.api.runtimecontext.NodeInfo;
 import io.ray.runtime.config.RayConfig;

java/test/src/main/java/io/ray/test/HelloWorldTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;

java/test/src/main/java/io/ray/test/KillActorTest.java

@@ -1,10 +1,9 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.exception.RayActorException;
 import io.ray.api.options.ActorCreationOptions;
 import java.util.function.BiConsumer;

java/test/src/main/java/io/ray/test/MultiLanguageClusterTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;

java/test/src/main/java/io/ray/test/MultiThreadingTest.java

@@ -1,10 +1,9 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.WaitResult;
 import io.ray.api.exception.RayException;
 import io.ray.api.id.ActorId;

java/test/src/main/java/io/ray/test/ObjectStoreTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import io.ray.api.ObjectRef;

java/test/src/main/java/io/ray/test/PlasmaFreeTest.java

@@ -1,9 +1,8 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.id.TaskId;
 import java.util.Arrays;
 import org.testng.Assert;

java/test/src/main/java/io/ray/test/PlasmaStoreTest.java

@@ -1,7 +1,6 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.id.ObjectId;
 import io.ray.runtime.object.ObjectStore;
 import org.testng.Assert;

java/test/src/main/java/io/ray/test/RayCallTest.java

@@ -1,9 +1,8 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.id.ObjectId;
 import java.util.List;
 import java.util.Map;

java/test/src/main/java/io/ray/test/RayMethodsTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import io.ray.api.ObjectRef;

java/test/src/main/java/io/ray/test/RaySerializerTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import io.ray.api.PyActorHandle;
 import io.ray.api.Ray;

java/test/src/main/java/io/ray/test/RayletConfigTest.java

@@ -1,8 +1,7 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import io.ray.api.ActorHandle;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;

java/test/src/main/java/io/ray/test/RedisPasswordTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;

java/test/src/main/java/io/ray/test/ResourcesManagementTest.java

@@ -1,11 +1,10 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.WaitResult;
 import io.ray.api.options.ActorCreationOptions;
 import io.ray.api.options.CallOptions;

java/test/src/main/java/io/ray/test/RuntimeContextTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import io.ray.api.ActorHandle;
 import io.ray.api.Ray;

java/test/src/main/java/io/ray/test/SingleProcessModeTest.java

@@ -1,9 +1,8 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.id.ActorId;
 import java.util.ArrayList;
 import java.util.HashMap;

java/test/src/main/java/io/ray/test/StressTest.java

@@ -1,10 +1,9 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.id.ObjectId;
 import java.util.ArrayList;
 import java.util.List;

java/test/src/main/java/io/ray/test/TestProgressListener.java

@@ -1,4 +1,4 @@
-package io.ray.api;
+package io.ray.test;
 
 import java.time.LocalDateTime;
 import org.testng.IInvokedMethod;

java/test/src/main/java/io/ray/test/TestUtils.java

@@ -1,5 +1,7 @@
-package io.ray.api;
+package io.ray.test;
 
+import io.ray.api.ObjectRef;
+import io.ray.api.Ray;
 import io.ray.runtime.RayRuntimeInternal;
 import io.ray.runtime.RayRuntimeProxy;
 import io.ray.runtime.config.RunMode;

java/test/src/main/java/io/ray/test/WaitTest.java

@@ -1,9 +1,8 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.WaitResult;
 import java.util.ArrayList;
 import java.util.List;

java/test/src/main/java/io/ray/test/WorkerJvmOptionsTest.java

@@ -1,9 +1,8 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.options.ActorCreationOptions;
 import org.testng.Assert;
 import org.testng.annotations.Test;