From e95b08534c8d9f2e9a77e42791dd6cb087274df7 Mon Sep 17 00:00:00 2001 From: peacewong Date: Tue, 28 Nov 2023 11:48:25 +0800 Subject: [PATCH] move java test class to java dir --- .../linkis/ecm/restful/ECMRestfulApi.java | 1 - .../impl/TemplateConfUtilsTest.java | 85 ++++++++++--------- .../interceptor/impl/TestCommentHelper.java | 72 ++++++++-------- .../impl/TestHDFSCacheLogWriter.java | 75 ++++++++++++++++ .../impl/TestHDFSCacheLogWriter.java | 82 ------------------ 5 files changed, 154 insertions(+), 161 deletions(-) rename linkis-computation-governance/linkis-entrance/src/test/{scala => java}/org/apache/linkis/entrance/interceptor/impl/TemplateConfUtilsTest.java (60%) rename linkis-computation-governance/linkis-entrance/src/test/{scala => java}/org/apache/linkis/entrance/interceptor/impl/TestCommentHelper.java (50%) create mode 100644 linkis-computation-governance/linkis-entrance/src/test/java/org/apache/linkis/entrance/interceptor/impl/TestHDFSCacheLogWriter.java delete mode 100644 linkis-computation-governance/linkis-entrance/src/test/scala/org/apache/linkis/entrance/interceptor/impl/TestHDFSCacheLogWriter.java diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/java/org/apache/linkis/ecm/restful/ECMRestfulApi.java b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/java/org/apache/linkis/ecm/restful/ECMRestfulApi.java index 241c77cfbb..d4fc0a49e1 100644 --- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/java/org/apache/linkis/ecm/restful/ECMRestfulApi.java +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/java/org/apache/linkis/ecm/restful/ECMRestfulApi.java @@ -18,7 +18,6 @@ package org.apache.linkis.ecm.restful; import org.apache.linkis.common.conf.Configuration; -import org.apache.linkis.ecm.server.util.ECMUtils; import org.apache.linkis.server.Message; import org.apache.linkis.server.utils.ModuleUserUtils; diff --git a/linkis-computation-governance/linkis-entrance/src/test/scala/org/apache/linkis/entrance/interceptor/impl/TemplateConfUtilsTest.java b/linkis-computation-governance/linkis-entrance/src/test/java/org/apache/linkis/entrance/interceptor/impl/TemplateConfUtilsTest.java similarity index 60% rename from linkis-computation-governance/linkis-entrance/src/test/scala/org/apache/linkis/entrance/interceptor/impl/TemplateConfUtilsTest.java rename to linkis-computation-governance/linkis-entrance/src/test/java/org/apache/linkis/entrance/interceptor/impl/TemplateConfUtilsTest.java index 8e4674d241..c965529b57 100644 --- a/linkis-computation-governance/linkis-entrance/src/test/scala/org/apache/linkis/entrance/interceptor/impl/TemplateConfUtilsTest.java +++ b/linkis-computation-governance/linkis-entrance/src/test/java/org/apache/linkis/entrance/interceptor/impl/TemplateConfUtilsTest.java @@ -14,17 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.linkis.entrance.interceptor.impl; -import static org.junit.jupiter.api.Assertions.*; +package org.apache.linkis.entrance.interceptor.impl; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; class TemplateConfUtilsTest { - @Test - void getCustomTemplateConfName() { - String sqlCode = "" + @Test + void getCustomTemplateConfName() { + String sqlCode = + "" + "--注解\n" + "select * from table;\n" + " --注解 \n" @@ -33,10 +34,11 @@ void getCustomTemplateConfName() { + " --@set yy=123\n" + " --注解"; - String res = TemplateConfUtils.getCustomTemplateConfName(sqlCode, "sql"); - assertEquals(res, ""); + String res = TemplateConfUtils.getCustomTemplateConfName(sqlCode, "sql"); + Assertions.assertEquals(res, ""); - String sqlCode2 = "" + String sqlCode2 = + "" + "---@set 123=注解\n" + "select * from table;\n" + " --注解 \n" @@ -45,10 +47,11 @@ void getCustomTemplateConfName() { + " --@set yy=123\n" + " --注解"; - res = TemplateConfUtils.getCustomTemplateConfName(sqlCode2, "sql"); - assertEquals(res, ""); + res = TemplateConfUtils.getCustomTemplateConfName(sqlCode2, "sql"); + Assertions.assertEquals(res, ""); - String sqlCode3 = "" + String sqlCode3 = + "" + "---@set ec.resource.name=345\n" + "select * from table;\n" + " --注解 \n" @@ -58,19 +61,21 @@ void getCustomTemplateConfName() { + " --@set yy=123\n" + " --注解"; - res = TemplateConfUtils.getCustomTemplateConfName(sqlCode3, "sql"); - assertEquals(res, "345"); + res = TemplateConfUtils.getCustomTemplateConfName(sqlCode3, "sql"); + Assertions.assertEquals(res, "345"); - String sqlCode4 = "" + String sqlCode4 = + "" + "---@set ec.resource.name= name1 \n" + " select \"--注解\" as test\n" + " --@set yy=123\n" + " --注解"; - res = TemplateConfUtils.getCustomTemplateConfName(sqlCode4, "sql"); - assertEquals(res, "name1"); + res = TemplateConfUtils.getCustomTemplateConfName(sqlCode4, "sql"); + Assertions.assertEquals(res, "name1"); - String sqlCode5 = "" + String sqlCode5 = + "" + "##@set ec.resource.name=pyname1\n" + "select * from table;\n" + " --注解 \n" @@ -80,44 +85,44 @@ void getCustomTemplateConfName() { + "#@set yy=123\n" + " #注解"; - res = TemplateConfUtils.getCustomTemplateConfName(sqlCode5, "python"); - assertEquals(res, "pyname1"); + res = TemplateConfUtils.getCustomTemplateConfName(sqlCode5, "python"); + Assertions.assertEquals(res, "pyname1"); - String sqlCode6 = "" + String sqlCode6 = + "" + "///@set ec.resource.name= scalaname1 \n" + " select \"//注解\" as test\n" + "//@set yy=123\n" + " #注解"; - res = TemplateConfUtils.getCustomTemplateConfName(sqlCode6, "scala"); - assertEquals(res, "scalaname1"); + res = TemplateConfUtils.getCustomTemplateConfName(sqlCode6, "scala"); + Assertions.assertEquals(res, "scalaname1"); - String sqlCode7 = "" + String sqlCode7 = + "" + "---@set ec.resource.name= hqlname1 \n" + " select \"--注解\" as test\n" + " --@set yy=123\n" + " --注解"; - res = TemplateConfUtils.getCustomTemplateConfName(sqlCode7, "hql"); - assertEquals(res, "hqlname1"); + res = TemplateConfUtils.getCustomTemplateConfName(sqlCode7, "hql"); + Assertions.assertEquals(res, "hqlname1"); - String sqlCode8 = "---@set ec.resource.name=linkis_test2;\n" + String sqlCode8 = + "---@set ec.resource.name=linkis_test2;\n" + " ---@set ec.resource.name=scriptis_test hive;\n" + " select * from dss autotest.demo data limit 100;"; - res=TemplateConfUtils.getCustomTemplateConfName(sqlCode8,"hql"); - assertEquals(res,"linkis_test2"); - - - } - @Test - void getCustomTemplateConfName2() { - - - String sqlCode9= "---@set ec.resource.name=linkis_test2;\r\n---@set ec.resource.name=scriptis_test_hive;\r\n--@set limitn=100\r\nselect * from dss_autotest.demo_data limit ${limitn};\r\n"; + res = TemplateConfUtils.getCustomTemplateConfName(sqlCode8, "hql"); + Assertions.assertEquals(res, "linkis_test2"); + } + @Test + void getCustomTemplateConfName2() { + String sqlCode9 = + "---@set ec.resource.name=linkis_test2;\r\n---@set ec.resource.name=scriptis_test_hive;\r\n--@set limitn=100\r\nselect * from dss_autotest.demo_data limit ${limitn};\r\n"; - String res=TemplateConfUtils.getCustomTemplateConfName(sqlCode9,"hql"); - assertEquals(res,"linkis_test2"); - } -} \ No newline at end of file + String res = TemplateConfUtils.getCustomTemplateConfName(sqlCode9, "hql"); + Assertions.assertEquals(res, "linkis_test2"); + } +} diff --git a/linkis-computation-governance/linkis-entrance/src/test/scala/org/apache/linkis/entrance/interceptor/impl/TestCommentHelper.java b/linkis-computation-governance/linkis-entrance/src/test/java/org/apache/linkis/entrance/interceptor/impl/TestCommentHelper.java similarity index 50% rename from linkis-computation-governance/linkis-entrance/src/test/scala/org/apache/linkis/entrance/interceptor/impl/TestCommentHelper.java rename to linkis-computation-governance/linkis-entrance/src/test/java/org/apache/linkis/entrance/interceptor/impl/TestCommentHelper.java index 34482d293c..622d06c4e8 100644 --- a/linkis-computation-governance/linkis-entrance/src/test/scala/org/apache/linkis/entrance/interceptor/impl/TestCommentHelper.java +++ b/linkis-computation-governance/linkis-entrance/src/test/java/org/apache/linkis/entrance/interceptor/impl/TestCommentHelper.java @@ -17,53 +17,49 @@ package org.apache.linkis.entrance.interceptor.impl; -import static org.junit.jupiter.api.Assertions.*; - import java.util.Arrays; -import org.apache.linkis.common.utils.CodeAndRunTypeUtils; + import org.junit.jupiter.api.Test; import org.junit.platform.commons.util.StringUtils; -import scala.reflect.internal.TypeDebugging; public class TestCommentHelper { - String sqlCode="" - + "--注解\n" - + "select * from table;\n" - + " --注解 \n" - + "--注解\n" - + " select \"--注解\" as test\n" - + " --@set yy=123\n" - + " --注解"; + String sqlCode = + "" + + "--注解\n" + + "select * from table;\n" + + " --注解 \n" + + "--注解\n" + + " select \"--注解\" as test\n" + + " --@set yy=123\n" + + " --注解"; - String scalaCode="" - + "// 注解\n" - + "print(1+1)\n" - + "//@set yy=123\n" - + " print(2)\n" - + " // 注解 \n" - + "// test\n" - + "print(\"//注解测试\")"; + String scalaCode = + "" + + "// 注解\n" + + "print(1+1)\n" + + "//@set yy=123\n" + + " print(2)\n" + + " // 注解 \n" + + "// test\n" + + "print(\"//注解测试\")"; - String scalaCodeRes="print(1+1)\n" - + "print(2)\n" - + "print(\"//注解测试\")"; + String scalaCodeRes = "print(1+1)\n" + "print(2)\n" + "print(\"//注解测试\")"; - @Test - void sqlDealCommentTest() { - String code=SQLCommentHelper.dealComment(sqlCode); - //System.out.println(code); - } + @Test + void sqlDealCommentTest() { + String code = SQLCommentHelper.dealComment(sqlCode); + // System.out.println(code); + } - @Test - void scalaDealCommentTest() { - String code=ScalaCommentHelper.dealComment(scalaCode); - String[] lines = Arrays.stream(code.split("\n")) + @Test + void scalaDealCommentTest() { + String code = ScalaCommentHelper.dealComment(scalaCode); + String[] lines = + Arrays.stream(code.split("\n")) .map(String::trim) .filter(x -> StringUtils.isNotBlank(x)) .toArray(String[]::new); - String result=String.join("\n",lines); - // assertEquals(result,scalaCodeRes); - } - - -} \ No newline at end of file + String result = String.join("\n", lines); + // assertEquals(result,scalaCodeRes); + } +} diff --git a/linkis-computation-governance/linkis-entrance/src/test/java/org/apache/linkis/entrance/interceptor/impl/TestHDFSCacheLogWriter.java b/linkis-computation-governance/linkis-entrance/src/test/java/org/apache/linkis/entrance/interceptor/impl/TestHDFSCacheLogWriter.java new file mode 100644 index 0000000000..fabff88473 --- /dev/null +++ b/linkis-computation-governance/linkis-entrance/src/test/java/org/apache/linkis/entrance/interceptor/impl/TestHDFSCacheLogWriter.java @@ -0,0 +1,75 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.linkis.entrance.interceptor.impl; + +import org.apache.linkis.entrance.log.Cache; +import org.apache.linkis.entrance.log.HDFSCacheLogWriter; + +import org.apache.commons.lang3.StringUtils; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import oshi.util.FileUtil; + +class TestHDFSCacheLogWriter { + + @Test + void write() throws IOException { + + Cache cache = new Cache(5); + String fileName = UUID.randomUUID().toString().replace("-", "") + "-test.log"; + String logPath = System.getProperty("java.io.tmpdir") + File.separator + fileName; + System.out.println(logPath); + String chartSet = "utf-8"; + String username = System.getProperty("user.name"); + + File file = new File(logPath); + file.createNewFile(); + + HDFSCacheLogWriter logWriter = + new HDFSCacheLogWriter( + // "D:\\DataSphere\\linkis\\docs\\test.log", + logPath, chartSet, cache, username); + + String[] msgArr = + new String[] { + "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", + "17", "18" + }; + + List msgList = new ArrayList(Arrays.asList(msgArr)); + String msg = String.join("\n", msgList); + + logWriter.write(msg); + logWriter.flush(); + + List list = FileUtil.readFile(logPath); + String res = String.join("\n", list); + + res = res.replace("\n\n", "\n"); + res = StringUtils.strip(res, " \n"); + Assertions.assertEquals(res, msg); + } +} diff --git a/linkis-computation-governance/linkis-entrance/src/test/scala/org/apache/linkis/entrance/interceptor/impl/TestHDFSCacheLogWriter.java b/linkis-computation-governance/linkis-entrance/src/test/scala/org/apache/linkis/entrance/interceptor/impl/TestHDFSCacheLogWriter.java deleted file mode 100644 index 34826ff222..0000000000 --- a/linkis-computation-governance/linkis-entrance/src/test/scala/org/apache/linkis/entrance/interceptor/impl/TestHDFSCacheLogWriter.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.linkis.entrance.interceptor.impl; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.UUID; -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.linkis.cs.common.entity.source.ContextID; -import org.apache.linkis.entrance.log.Cache; -import org.apache.linkis.entrance.log.HDFSCacheLogWriter; -import org.apache.linkis.rpc.BaseRPCSender; -import org.apache.linkis.rpc.Sender; -import org.apache.linkis.storage.fs.FileSystem; -import org.apache.linkis.storage.fs.impl.LocalFileSystem; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.Mockito; -import oshi.util.FileUtil; - -class TestHDFSCacheLogWriter { - - - @Test - void write() throws IOException { - - Cache cache = new Cache(5); - String fileName= UUID.randomUUID().toString().replace("-", "")+"-test.log"; - String logPath = System.getProperty("java.io.tmpdir")+ File.separator+fileName; - System.out.println(logPath); - String chartSet="utf-8"; - String username=System.getProperty("user.name"); - - File file=new File(logPath); - file.createNewFile(); - - HDFSCacheLogWriter logWriter =new HDFSCacheLogWriter( - //"D:\\DataSphere\\linkis\\docs\\test.log", - logPath, - chartSet, - cache, - username - ); - - String[] msgArr =new String[]{"1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18"}; - - List msgList = new ArrayList(Arrays.asList(msgArr)); - String msg=String.join("\n", msgList); - - logWriter.write(msg); - logWriter.flush(); - - List list = FileUtil.readFile(logPath); - String res=String.join("\n", list); - - res=res.replace("\n\n","\n"); - res=StringUtils.strip(res, " \n"); - Assertions.assertEquals(res,msg); - - - } -} \ No newline at end of file