diff --git a/server/controller/src/test/java/ai/starwhale/mlops/domain/graph/TestGraph.java b/server/controller/src/test/java/ai/starwhale/mlops/domain/graph/GraphTest.java similarity index 96% rename from server/controller/src/test/java/ai/starwhale/mlops/domain/graph/TestGraph.java rename to server/controller/src/test/java/ai/starwhale/mlops/domain/graph/GraphTest.java index bfe18755ce..1a20a6492e 100644 --- a/server/controller/src/test/java/ai/starwhale/mlops/domain/graph/TestGraph.java +++ b/server/controller/src/test/java/ai/starwhale/mlops/domain/graph/GraphTest.java @@ -18,7 +18,7 @@ import org.junit.jupiter.api.Test; -public class TestGraph { +public class GraphTest { @Test public void testEmptyGraph() { diff --git a/server/controller/src/test/java/ai/starwhale/mlops/domain/job/TestJobStatusCalculator.java b/server/controller/src/test/java/ai/starwhale/mlops/domain/job/JobStatusCalculatorTest.java similarity index 99% rename from server/controller/src/test/java/ai/starwhale/mlops/domain/job/TestJobStatusCalculator.java rename to server/controller/src/test/java/ai/starwhale/mlops/domain/job/JobStatusCalculatorTest.java index 05500543c9..7e946856b0 100644 --- a/server/controller/src/test/java/ai/starwhale/mlops/domain/job/TestJobStatusCalculator.java +++ b/server/controller/src/test/java/ai/starwhale/mlops/domain/job/JobStatusCalculatorTest.java @@ -34,7 +34,7 @@ import org.junit.jupiter.api.Test; @Slf4j -public class TestJobStatusCalculator { +public class JobStatusCalculatorTest { JobStatusCalculator jobStatusCalculator = new JobStatusCalculator(); diff --git a/server/controller/src/test/java/ai/starwhale/mlops/domain/job/TestStatusRequirement.java b/server/controller/src/test/java/ai/starwhale/mlops/domain/job/StatusRequirementTest.java similarity index 99% rename from server/controller/src/test/java/ai/starwhale/mlops/domain/job/TestStatusRequirement.java rename to server/controller/src/test/java/ai/starwhale/mlops/domain/job/StatusRequirementTest.java index 523d92bc6d..485f6517ae 100644 --- a/server/controller/src/test/java/ai/starwhale/mlops/domain/job/TestStatusRequirement.java +++ b/server/controller/src/test/java/ai/starwhale/mlops/domain/job/StatusRequirementTest.java @@ -35,7 +35,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class TestStatusRequirement { +public class StatusRequirementTest { @Test public void testAny() { diff --git a/server/controller/src/test/java/ai/starwhale/mlops/domain/job/mapper/TestJobMapper.java b/server/controller/src/test/java/ai/starwhale/mlops/domain/job/mapper/JobMapperTest.java similarity index 99% rename from server/controller/src/test/java/ai/starwhale/mlops/domain/job/mapper/TestJobMapper.java rename to server/controller/src/test/java/ai/starwhale/mlops/domain/job/mapper/JobMapperTest.java index c9e8616b8b..63cd5f5918 100644 --- a/server/controller/src/test/java/ai/starwhale/mlops/domain/job/mapper/TestJobMapper.java +++ b/server/controller/src/test/java/ai/starwhale/mlops/domain/job/mapper/JobMapperTest.java @@ -40,7 +40,7 @@ @MybatisTest @AutoConfigureTestDatabase(replace = Replace.NONE) -public class TestJobMapper extends MySqlContainerHolder { +public class JobMapperTest extends MySqlContainerHolder { @Autowired private JobMapper jobMapper; diff --git a/server/controller/src/test/java/ai/starwhale/mlops/domain/swds/datastore/TestIndexWriter.java b/server/controller/src/test/java/ai/starwhale/mlops/domain/swds/datastore/IndexWriterTest.java similarity index 98% rename from server/controller/src/test/java/ai/starwhale/mlops/domain/swds/datastore/TestIndexWriter.java rename to server/controller/src/test/java/ai/starwhale/mlops/domain/swds/datastore/IndexWriterTest.java index 55c9d999f4..0fdca1f370 100644 --- a/server/controller/src/test/java/ai/starwhale/mlops/domain/swds/datastore/TestIndexWriter.java +++ b/server/controller/src/test/java/ai/starwhale/mlops/domain/swds/datastore/IndexWriterTest.java @@ -21,7 +21,6 @@ import ai.starwhale.mlops.api.protocol.datastore.RecordDesc; import ai.starwhale.mlops.api.protocol.datastore.UpdateTableRequest; import ai.starwhale.mlops.datastore.ColumnSchemaDesc; -import ai.starwhale.mlops.datastore.ColumnType; import ai.starwhale.mlops.datastore.TableSchemaDesc; import ai.starwhale.mlops.domain.swds.index.datastore.IndexWriter; import com.fasterxml.jackson.databind.ObjectMapper; @@ -32,7 +31,7 @@ import org.junit.jupiter.api.Test; import org.springframework.http.ResponseEntity; -public class TestIndexWriter { +public class IndexWriterTest { @Test public void testLegacySchema() { diff --git a/server/controller/src/test/java/ai/starwhale/mlops/domain/swds/objectstore/TestDsFileGetter.java b/server/controller/src/test/java/ai/starwhale/mlops/domain/swds/objectstore/DsFileGetterTest.java similarity index 98% rename from server/controller/src/test/java/ai/starwhale/mlops/domain/swds/objectstore/TestDsFileGetter.java rename to server/controller/src/test/java/ai/starwhale/mlops/domain/swds/objectstore/DsFileGetterTest.java index 26c6de44d8..dc0f7aaea8 100644 --- a/server/controller/src/test/java/ai/starwhale/mlops/domain/swds/objectstore/TestDsFileGetter.java +++ b/server/controller/src/test/java/ai/starwhale/mlops/domain/swds/objectstore/DsFileGetterTest.java @@ -33,7 +33,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class TestDsFileGetter { +public class DsFileGetterTest { @Test public void testFileGetter() throws IOException { diff --git a/server/controller/src/test/java/ai/starwhale/mlops/domain/swds/objectstore/TestStorageAccessParser.java b/server/controller/src/test/java/ai/starwhale/mlops/domain/swds/objectstore/StorageAccessParserTest.java similarity index 98% rename from server/controller/src/test/java/ai/starwhale/mlops/domain/swds/objectstore/TestStorageAccessParser.java rename to server/controller/src/test/java/ai/starwhale/mlops/domain/swds/objectstore/StorageAccessParserTest.java index acc6422a6b..f7b195c8ee 100644 --- a/server/controller/src/test/java/ai/starwhale/mlops/domain/swds/objectstore/TestStorageAccessParser.java +++ b/server/controller/src/test/java/ai/starwhale/mlops/domain/swds/objectstore/StorageAccessParserTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class TestStorageAccessParser { +public class StorageAccessParserTest { final String auths = "USER.S3.REGION=region\n" + "USER.S3.ENDPOINT=endpoint\n" diff --git a/server/controller/src/test/java/ai/starwhale/mlops/domain/swds/objectstore/TestStorageAuths.java b/server/controller/src/test/java/ai/starwhale/mlops/domain/swds/objectstore/StorageAuthsTest.java similarity index 98% rename from server/controller/src/test/java/ai/starwhale/mlops/domain/swds/objectstore/TestStorageAuths.java rename to server/controller/src/test/java/ai/starwhale/mlops/domain/swds/objectstore/StorageAuthsTest.java index 8bb8874b9a..757ea1c5ed 100644 --- a/server/controller/src/test/java/ai/starwhale/mlops/domain/swds/objectstore/TestStorageAuths.java +++ b/server/controller/src/test/java/ai/starwhale/mlops/domain/swds/objectstore/StorageAuthsTest.java @@ -21,7 +21,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class TestStorageAuths { +public class StorageAuthsTest { @Test public void testS3() { diff --git a/server/controller/src/test/java/ai/starwhale/mlops/domain/swds/objectstore/TestStorageUri.java b/server/controller/src/test/java/ai/starwhale/mlops/domain/swds/objectstore/StorageUriTest.java similarity index 99% rename from server/controller/src/test/java/ai/starwhale/mlops/domain/swds/objectstore/TestStorageUri.java rename to server/controller/src/test/java/ai/starwhale/mlops/domain/swds/objectstore/StorageUriTest.java index 2e5e8164ae..ce4c9b4913 100644 --- a/server/controller/src/test/java/ai/starwhale/mlops/domain/swds/objectstore/TestStorageUri.java +++ b/server/controller/src/test/java/ai/starwhale/mlops/domain/swds/objectstore/StorageUriTest.java @@ -19,7 +19,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class TestStorageUri { +public class StorageUriTest { /** diff --git a/server/controller/src/test/java/ai/starwhale/mlops/domain/task/TestStepHelper.java b/server/controller/src/test/java/ai/starwhale/mlops/domain/task/StepHelperTest.java similarity index 99% rename from server/controller/src/test/java/ai/starwhale/mlops/domain/task/TestStepHelper.java rename to server/controller/src/test/java/ai/starwhale/mlops/domain/task/StepHelperTest.java index 67d5bd6c6d..40408d6ade 100644 --- a/server/controller/src/test/java/ai/starwhale/mlops/domain/task/TestStepHelper.java +++ b/server/controller/src/test/java/ai/starwhale/mlops/domain/task/StepHelperTest.java @@ -37,7 +37,7 @@ import org.junit.jupiter.api.Test; @Slf4j -public class TestStepHelper { +public class StepHelperTest { StepHelper stepHelper = new StepHelper(); diff --git a/server/controller/src/test/java/ai/starwhale/mlops/domain/task/TestTaskService.java b/server/controller/src/test/java/ai/starwhale/mlops/domain/task/TaskServiceTest.java similarity index 98% rename from server/controller/src/test/java/ai/starwhale/mlops/domain/task/TestTaskService.java rename to server/controller/src/test/java/ai/starwhale/mlops/domain/task/TaskServiceTest.java index 24131023e0..1a735fa1c2 100644 --- a/server/controller/src/test/java/ai/starwhale/mlops/domain/task/TestTaskService.java +++ b/server/controller/src/test/java/ai/starwhale/mlops/domain/task/TaskServiceTest.java @@ -19,7 +19,6 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -40,13 +39,12 @@ import ai.starwhale.mlops.storage.StorageAccessService; import com.github.pagehelper.PageInfo; import java.time.LocalDateTime; -import java.time.ZoneOffset; import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class TestTaskService { +public class TaskServiceTest { TaskService taskService; TaskConvertor taskConvertor; diff --git a/server/controller/src/test/java/ai/starwhale/mlops/domain/task/TestTaskWatcherForJobStatus.java b/server/controller/src/test/java/ai/starwhale/mlops/domain/task/TaskWatcherForJobStatusTest.java similarity index 99% rename from server/controller/src/test/java/ai/starwhale/mlops/domain/task/TestTaskWatcherForJobStatus.java rename to server/controller/src/test/java/ai/starwhale/mlops/domain/task/TaskWatcherForJobStatusTest.java index 8a7e70116e..cb1a788c28 100644 --- a/server/controller/src/test/java/ai/starwhale/mlops/domain/task/TestTaskWatcherForJobStatus.java +++ b/server/controller/src/test/java/ai/starwhale/mlops/domain/task/TaskWatcherForJobStatusTest.java @@ -41,7 +41,7 @@ /** * test for {@link TaskWatcherForJobStatus} */ -public class TestTaskWatcherForJobStatus { +public class TaskWatcherForJobStatusTest { @Test public void testJobRunning() { diff --git a/server/controller/src/test/java/ai/starwhale/mlops/domain/task/log/TestTaskLogK8sCollector.java b/server/controller/src/test/java/ai/starwhale/mlops/domain/task/log/TaskLogK8sCollectorTest.java similarity index 98% rename from server/controller/src/test/java/ai/starwhale/mlops/domain/task/log/TestTaskLogK8sCollector.java rename to server/controller/src/test/java/ai/starwhale/mlops/domain/task/log/TaskLogK8sCollectorTest.java index b298e7919b..9b1875d257 100644 --- a/server/controller/src/test/java/ai/starwhale/mlops/domain/task/log/TestTaskLogK8sCollector.java +++ b/server/controller/src/test/java/ai/starwhale/mlops/domain/task/log/TaskLogK8sCollectorTest.java @@ -34,7 +34,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class TestTaskLogK8sCollector { +public class TaskLogK8sCollectorTest { StorageAccessService storageService; diff --git a/server/controller/src/test/java/ai/starwhale/mlops/domain/task/mapper/TestTaskMapper.java b/server/controller/src/test/java/ai/starwhale/mlops/domain/task/mapper/TaskMapperTest.java similarity index 98% rename from server/controller/src/test/java/ai/starwhale/mlops/domain/task/mapper/TestTaskMapper.java rename to server/controller/src/test/java/ai/starwhale/mlops/domain/task/mapper/TaskMapperTest.java index d6c8a9f045..ee8dbb3224 100644 --- a/server/controller/src/test/java/ai/starwhale/mlops/domain/task/mapper/TestTaskMapper.java +++ b/server/controller/src/test/java/ai/starwhale/mlops/domain/task/mapper/TaskMapperTest.java @@ -27,8 +27,6 @@ import java.util.Comparator; import java.util.List; import java.util.UUID; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mybatis.spring.boot.test.autoconfigure.MybatisTest; @@ -38,7 +36,7 @@ @MybatisTest @AutoConfigureTestDatabase(replace = Replace.NONE) -public class TestTaskMapper extends MySqlContainerHolder { +public class TaskMapperTest extends MySqlContainerHolder { @Autowired private TaskMapper taskMapper; diff --git a/server/controller/src/test/java/ai/starwhale/mlops/domain/user/mapper/TestUserMapper.java b/server/controller/src/test/java/ai/starwhale/mlops/domain/user/mapper/UserMapperTest.java similarity index 97% rename from server/controller/src/test/java/ai/starwhale/mlops/domain/user/mapper/TestUserMapper.java rename to server/controller/src/test/java/ai/starwhale/mlops/domain/user/mapper/UserMapperTest.java index 466e199cab..31029a1683 100644 --- a/server/controller/src/test/java/ai/starwhale/mlops/domain/user/mapper/TestUserMapper.java +++ b/server/controller/src/test/java/ai/starwhale/mlops/domain/user/mapper/UserMapperTest.java @@ -17,7 +17,6 @@ package ai.starwhale.mlops.domain.user.mapper; import ai.starwhale.mlops.domain.MySqlContainerHolder; -import ai.starwhale.mlops.domain.task.po.TaskEntity; import ai.starwhale.mlops.domain.user.po.UserEntity; import java.util.Collections; import java.util.Comparator; @@ -32,7 +31,7 @@ @MybatisTest @AutoConfigureTestDatabase(replace = Replace.NONE) -public class TestUserMapper extends MySqlContainerHolder { +public class UserMapperTest extends MySqlContainerHolder { @Autowired private UserMapper userMapper; diff --git a/server/controller/src/test/java/ai/starwhale/mlops/login/TestLoginRequest.java b/server/controller/src/test/java/ai/starwhale/mlops/login/LoginRequestTest.java similarity index 97% rename from server/controller/src/test/java/ai/starwhale/mlops/login/TestLoginRequest.java rename to server/controller/src/test/java/ai/starwhale/mlops/login/LoginRequestTest.java index 6e49a1d57b..da32a3b715 100644 --- a/server/controller/src/test/java/ai/starwhale/mlops/login/TestLoginRequest.java +++ b/server/controller/src/test/java/ai/starwhale/mlops/login/LoginRequestTest.java @@ -19,7 +19,7 @@ import cn.hutool.http.HttpResponse; import cn.hutool.http.HttpUtil; -public class TestLoginRequest { +public class LoginRequestTest { public void login() { for (int i = 0; i < 5; i++) { diff --git a/server/controller/src/test/java/ai/starwhale/mlops/login/TestPasswordEncoder.java b/server/controller/src/test/java/ai/starwhale/mlops/login/PasswordEncoderTest.java similarity index 97% rename from server/controller/src/test/java/ai/starwhale/mlops/login/TestPasswordEncoder.java rename to server/controller/src/test/java/ai/starwhale/mlops/login/PasswordEncoderTest.java index 7982d1ce03..f9ded1aba2 100644 --- a/server/controller/src/test/java/ai/starwhale/mlops/login/TestPasswordEncoder.java +++ b/server/controller/src/test/java/ai/starwhale/mlops/login/PasswordEncoderTest.java @@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test; import org.springframework.security.crypto.password.PasswordEncoder; -public class TestPasswordEncoder { +public class PasswordEncoderTest { @Test public void testEncoder() { diff --git a/server/controller/src/test/java/ai/starwhale/mlops/schedule/k8s/TestJobEventHandler.java b/server/controller/src/test/java/ai/starwhale/mlops/schedule/k8s/JobEventHandlerTest.java similarity index 99% rename from server/controller/src/test/java/ai/starwhale/mlops/schedule/k8s/TestJobEventHandler.java rename to server/controller/src/test/java/ai/starwhale/mlops/schedule/k8s/JobEventHandlerTest.java index 7118291eda..4370a714e2 100644 --- a/server/controller/src/test/java/ai/starwhale/mlops/schedule/k8s/TestJobEventHandler.java +++ b/server/controller/src/test/java/ai/starwhale/mlops/schedule/k8s/JobEventHandlerTest.java @@ -29,7 +29,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class TestJobEventHandler { +public class JobEventHandlerTest { TaskStatusReceiver taskStatusReceiver; JobEventHandler jobEventHandler; diff --git a/server/controller/src/test/java/ai/starwhale/mlops/schedule/k8s/TestK8sJobTemplate.java b/server/controller/src/test/java/ai/starwhale/mlops/schedule/k8s/K8sJobTemplateTest.java similarity index 98% rename from server/controller/src/test/java/ai/starwhale/mlops/schedule/k8s/TestK8sJobTemplate.java rename to server/controller/src/test/java/ai/starwhale/mlops/schedule/k8s/K8sJobTemplateTest.java index bab903463e..369bc88514 100644 --- a/server/controller/src/test/java/ai/starwhale/mlops/schedule/k8s/TestK8sJobTemplate.java +++ b/server/controller/src/test/java/ai/starwhale/mlops/schedule/k8s/K8sJobTemplateTest.java @@ -30,11 +30,11 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class TestK8sJobTemplate { +public class K8sJobTemplateTest { K8sJobTemplate k8sJobTemplate = new K8sJobTemplate(""); - public TestK8sJobTemplate() throws IOException { + public K8sJobTemplateTest() throws IOException { } @Test diff --git a/server/controller/src/test/java/ai/starwhale/mlops/schedule/k8s/TestK8sResourcePoolConverter.java b/server/controller/src/test/java/ai/starwhale/mlops/schedule/k8s/K8sResourcePoolConverterTest.java similarity index 98% rename from server/controller/src/test/java/ai/starwhale/mlops/schedule/k8s/TestK8sResourcePoolConverter.java rename to server/controller/src/test/java/ai/starwhale/mlops/schedule/k8s/K8sResourcePoolConverterTest.java index b9c756d15f..12c9767620 100644 --- a/server/controller/src/test/java/ai/starwhale/mlops/schedule/k8s/TestK8sResourcePoolConverter.java +++ b/server/controller/src/test/java/ai/starwhale/mlops/schedule/k8s/K8sResourcePoolConverterTest.java @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class TestK8sResourcePoolConverter { +public class K8sResourcePoolConverterTest { @Test public void testNormalCase() { diff --git a/server/controller/src/test/java/ai/starwhale/mlops/schedule/k8s/TestK8sTaskScheduler.java b/server/controller/src/test/java/ai/starwhale/mlops/schedule/k8s/K8sTaskSchedulerTest.java similarity index 95% rename from server/controller/src/test/java/ai/starwhale/mlops/schedule/k8s/TestK8sTaskScheduler.java rename to server/controller/src/test/java/ai/starwhale/mlops/schedule/k8s/K8sTaskSchedulerTest.java index bdf44ddafd..ca3f2674a8 100644 --- a/server/controller/src/test/java/ai/starwhale/mlops/schedule/k8s/TestK8sTaskScheduler.java +++ b/server/controller/src/test/java/ai/starwhale/mlops/schedule/k8s/K8sTaskSchedulerTest.java @@ -53,7 +53,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class TestK8sTaskScheduler { +public class K8sTaskSchedulerTest { public static final String bucket = "bucket"; public static final String accessKey = "accessKey"; public static final String secretKey = "secretKey"; @@ -156,11 +156,11 @@ public V1Job renderJob(String jobName, Map initEnv = Map.of("DOWNLOADS", "s3://bucket/path_swmp;/opt/starwhale/swmp/ s3://bucket/path_rt;/opt/starwhale/swrt/", - "SW_S3_BUCKET", TestK8sTaskScheduler.bucket, - "SW_S3_ENDPOINT", TestK8sTaskScheduler.endpoint, - "SW_S3_SECRET", TestK8sTaskScheduler.secretKey, - "SW_S3_ACCESS_KEY", TestK8sTaskScheduler.accessKey, - "SW_S3_REGION", TestK8sTaskScheduler.region, + "SW_S3_BUCKET", K8sTaskSchedulerTest.bucket, + "SW_S3_ENDPOINT", K8sTaskSchedulerTest.endpoint, + "SW_S3_SECRET", K8sTaskSchedulerTest.secretKey, + "SW_S3_ACCESS_KEY", K8sTaskSchedulerTest.accessKey, + "SW_S3_REGION", K8sTaskSchedulerTest.region, FileStorageEnv.ENV_TYPE, "S3"); Map initActual = dp.getEnvs().stream().filter(env -> env.getValue() != null) .collect(Collectors.toMap(V1EnvVar::getName, V1EnvVar::getValue));