This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.1 by this push:
new 732209cc4 fix bml project dao test (#3688)
732209cc4 is described below
commit 732209cc4660bcbe86460a18fca3a467ec210837
Author: 成彬彬 <[email protected]>
AuthorDate: Wed Oct 19 14:36:19 2022 +0800
fix bml project dao test (#3688)
---
.../linkis/bml/dao/impl/BmlProjectMapper.xml | 8 --
.../apache/linkis/bml/dao/BmlProjectDaoTest.java | 58 +++++++-----
.../org/apache/linkis/bml/dao/DownloadDaoTest.java | 2 +-
.../org/apache/linkis/bml/dao/ResourceDaoTest.java | 44 ++++++---
.../org/apache/linkis/bml/dao/TaskDaoTest.java | 33 +++++--
.../org/apache/linkis/bml/dao/VersionDaoTest.java | 100 ++++++++++++---------
.../src/test/resources/create.sql | 8 ++
7 files changed, 161 insertions(+), 92 deletions(-)
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/BmlProjectMapper.xml
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/BmlProjectMapper.xml
index ff28b0a18..83f8472a0 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/BmlProjectMapper.xml
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/BmlProjectMapper.xml
@@ -19,24 +19,20 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"; >
<mapper namespace="org.apache.linkis.bml.dao.BmlProjectDao">
-
<insert id="createNewProject" useGeneratedKeys = "true" keyProperty =
"bmlProject.id" keyColumn = "id">
insert ignore into linkis_ps_bml_project(name, `system`, source,
description, creator, enabled, create_time)
values(#{bmlProject.name}, #{bmlProject.system}, #{bmlProject.source},
#{bmlProject.description},
#{bmlProject.creator}, #{bmlProject.enabled}, #{bmlProject.createTime})
</insert>
-
<select id="getBmlProject"
resultType="org.apache.linkis.bml.entity.BmlProject">
select * from linkis_ps_bml_project where name = #{projectName}
</select>
-
<insert id="setProjectPriv">
insert ignore into linkis_ps_bml_project_user(project_id, username,
priv, creator, create_time) values
<foreach collection='usernames' item='username' open='('
separator='),(' close=')'>
#{projectId}, #{username}, #{priv}, #{creator}, #{createTime}
</foreach>
</insert>
-
<select id="getPrivInProject" resultType="java.lang.Integer">
select a.priv from linkis_ps_bml_project_user a join
linkis_ps_bml_project b on
a.project_id = b.id and b.name = #{projectName} and a.username =
#{username}
@@ -45,7 +41,6 @@
insert ignore into linkis_ps_bml_project_resource(project_id,
resource_id)
values(#{projectId}, #{resourceId})
</insert>
-
<select id="getProjectNameByResourceId" resultType="java.lang.String">
select a.name from linkis_ps_bml_project a join
linkis_ps_bml_project_resource b on b.resource_id = #{resourceId} and
a.id = b.project_id
@@ -53,16 +48,13 @@
<select id="getProjectIdByName" resultType="java.lang.Integer">
select id from linkis_ps_bml_project where name = #{projectName}
</select>
-
<insert id="attachResourceAndProject">
insert ignore into linkis_ps_bml_project_resource(project_id,
resource_id)
values(#{projectId}, #{resourceId})
</insert>
-
<select id="checkIfExists" resultType="java.lang.Integer">
select count(*) from linkis_ps_bml_project_resource where project_id =
#{resourceId} and resource_id = #{resourceId}
</select>
-
<delete id="deleteAllPriv">
delete from linkis_ps_bml_project_user where project_id = #{projectId}
</delete>
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/BmlProjectDaoTest.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/BmlProjectDaoTest.java
index 3416d60a9..ff8e52793 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/BmlProjectDaoTest.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/BmlProjectDaoTest.java
@@ -26,15 +26,31 @@ import java.util.Date;
import java.util.List;
import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertTrue;
class BmlProjectDaoTest extends BaseDaoTest {
+ private static final Logger logger =
LoggerFactory.getLogger(BmlProjectDaoTest.class);
+
@Autowired BmlProjectDao bmlProjectDao;
+ void insertNewProject() {
+ BmlProject bmlProject = new BmlProject();
+ bmlProject.setName("testName");
+ bmlProject.setSystem("testSy");
+ bmlProject.setSource("test");
+ bmlProject.setDescription("descTest");
+ bmlProject.setCreator("creCreatorUser");
+ bmlProject.setEnabled(1);
+ bmlProject.setCreateTime(new Date());
+ bmlProjectDao.createNewProject(bmlProject);
+ }
+
@Test
- void createNewProject() {
+ void testCreateNewProject() {
BmlProject bmlProject = new BmlProject();
bmlProject.setName("testName");
bmlProject.setSystem("testSy");
@@ -49,13 +65,13 @@ class BmlProjectDaoTest extends BaseDaoTest {
}
@Test
- void getBmlProject() {
- createNewProject();
+ void testGetBmlProject() {
+ insertNewProject();
bmlProjectDao.getBmlProject("testName");
}
@Test
- void setProjectPriv() {
+ void testSetProjectPriv() {
List<String> usernamesList = new ArrayList<>();
usernamesList.add("creCreatorUser");
usernamesList.add("creCreatorUser1");
@@ -64,50 +80,48 @@ class BmlProjectDaoTest extends BaseDaoTest {
}
@Test
- void getPrivInProject() {
- setProjectPriv();
- createNewProject();
- Integer i = bmlProjectDao.getPrivInProject("testName", "creCreatorUser");
- assertTrue(i != null);
+ void testGetPrivInProject() {
+ Integer privInt = bmlProjectDao.getPrivInProject("testName",
"creCreatorUser");
+ logger.info("privInt:" + privInt);
+ assertTrue(privInt == 2);
}
@Test
- void addProjectResource() {
+ void testAddProjectResource() {
bmlProjectDao.addProjectResource(1, "123");
}
@Test
- void getProjectNameByResourceId() {
- createNewProject();
- addProjectResource();
+ void testGetProjectNameByResourceId() {
String projectName = bmlProjectDao.getProjectNameByResourceId("123");
- assertTrue(projectName != null);
+ logger.info("projectName:" + projectName);
+ assertTrue(projectName.equals("testName"));
}
@Test
- void getProjectIdByName() {
- createNewProject();
+ void testGetProjectIdByName() {
+ insertNewProject();
bmlProjectDao.getProjectIdByName("testName");
Integer i = bmlProjectDao.getProjectIdByName("testName");
assertTrue(i != null);
}
@Test
- void attachResourceAndProject() {
- createNewProject();
+ void testAttachResourceAndProject() {
+ insertNewProject();
bmlProjectDao.attachResourceAndProject(1, "123");
}
@Test
- void checkIfExists() {
- setProjectPriv();
+ void testCheckIfExists() {
+ insertNewProject();
Integer i = bmlProjectDao.checkIfExists(1, "123");
assertTrue(i != null);
}
@Test
- void deleteAllPriv() {
- setProjectPriv();
+ void testDeleteAllPriv() {
+ insertNewProject();
bmlProjectDao.deleteAllPriv(1);
}
}
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/DownloadDaoTest.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/DownloadDaoTest.java
index 6ae0966c9..78de5d0b0 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/DownloadDaoTest.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/DownloadDaoTest.java
@@ -32,7 +32,7 @@ class DownloadDaoTest extends BaseDaoTest {
@Autowired DownloadDao downloadDao;
@Test
- void insertDownloadModel() {
+ void testInsertDownloadModel() {
DownloadModel downloadModel = new DownloadModel();
downloadModel.setDownloader("test");
downloadModel.setClientIp("192.143.253");
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/ResourceDaoTest.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/ResourceDaoTest.java
index fbba71b6c..99657dd41 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/ResourceDaoTest.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/ResourceDaoTest.java
@@ -31,9 +31,25 @@ class ResourceDaoTest extends BaseDaoTest {
@Autowired ResourceDao resourceDao;
+ void insertResource() {
+ Resource resource = new Resource();
+ resource.setResourceId("123");
+ resource.setResourceHeader("2");
+ resource.setDownloadedFileName("testFileName");
+ resource.setSystem("testSystem");
+ resource.setCreateTime(new Date());
+ resource.setUser("testUser");
+ resource.setExpireTime("2012.12.02");
+ resource.setMaxVersion(3);
+ resource.setUpdateTime(new Date());
+ resource.setUpdator("testUpdator");
+ resource.setEnableFlag(false);
+ resourceDao.uploadResource(resource);
+ }
+
@Test
- void getResources() {
- uploadResource();
+ void testGetResources() {
+ insertResource();
Map<String, Object> map = new HashMap<>();
map.put("owner", "testowner");
map.put("resource_id", "123");
@@ -42,14 +58,14 @@ class ResourceDaoTest extends BaseDaoTest {
}
@Test
- void deleteResource() {
- uploadResource();
+ void testDeleteResource() {
+ insertResource();
resourceDao.deleteResource("123");
}
@Test
- void batchDeleteResources() {
- uploadResource();
+ void testBatchDeleteResources() {
+ insertResource();
List<String> list = new ArrayList<>();
list.add("123");
list.add("2");
@@ -58,7 +74,7 @@ class ResourceDaoTest extends BaseDaoTest {
}
@Test
- void uploadResource() {
+ void testUploadResource() {
Resource resource = new Resource();
resource.setResourceId("123");
resource.setResourceHeader("2");
@@ -75,25 +91,25 @@ class ResourceDaoTest extends BaseDaoTest {
}
@Test
- void checkExists() {
- uploadResource();
+ void testCheckExists() {
+ insertResource();
resourceDao.checkExists("123");
}
@Test
- void getResource() {
- uploadResource();
+ void testGetResource() {
+ insertResource();
resourceDao.getResource("123");
}
@Test
- void getUserByResourceId() {
- uploadResource();
+ void testGetUserByResourceId() {
+ insertResource();
resourceDao.getUserByResourceId("123");
}
@Test
- void changeOwner() {
+ void testChangeOwner() {
String oldOwner = "oldtest";
String newOwner = "newtest";
resourceDao.changeOwner("123", oldOwner, newOwner);
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/TaskDaoTest.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/TaskDaoTest.java
index 97e30dbe2..68b42fb1b 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/TaskDaoTest.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/TaskDaoTest.java
@@ -30,8 +30,27 @@ import static org.junit.jupiter.api.Assertions.*;
class TaskDaoTest extends BaseDaoTest {
@Autowired TaskDao taskDao;
+ void insertResourceTask() {
+ ResourceTask resourceTask = new ResourceTask();
+ resourceTask.setResourceId("123");
+ resourceTask.setClientIp("192.168.142");
+ resourceTask.setEndTime(new Date());
+ resourceTask.setId(32);
+ resourceTask.setStartTime(new Date());
+ resourceTask.setErrMsg("testErr");
+ resourceTask.setExtraParams("testpar");
+ resourceTask.setInstance("testInst");
+ resourceTask.setLastUpdateTime(new Date());
+ resourceTask.setOperation("testOPer");
+ resourceTask.setState("1");
+ resourceTask.setSubmitUser("testSumUser");
+ resourceTask.setSystem("testSym");
+ resourceTask.setVersion("1.2");
+ taskDao.insert(resourceTask);
+ }
+
@Test
- void insert() {
+ void testInsert() {
ResourceTask resourceTask = new ResourceTask();
resourceTask.setResourceId("123");
resourceTask.setClientIp("192.168.142");
@@ -51,20 +70,20 @@ class TaskDaoTest extends BaseDaoTest {
}
@Test
- void updateState() {
- insert();
+ void testUpdateState() {
+ insertResourceTask();
taskDao.updateState(32, "1", new Date());
}
@Test
- void updateState2Failed() {
- insert();
+ void testUpdateState2Failed() {
+ insertResourceTask();
taskDao.updateState2Failed(32, "1", new Date(), "errMsg");
}
@Test
- void getNewestVersion() {
- insert();
+ void testGetNewestVersion() {
+ insertResourceTask();
taskDao.getNewestVersion("123");
}
}
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/VersionDaoTest.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/VersionDaoTest.java
index 0e5362521..b363c7e3a 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/VersionDaoTest.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/VersionDaoTest.java
@@ -35,21 +35,41 @@ class VersionDaoTest extends BaseDaoTest {
private final String resourceId = "123";
private final String version = "1.2";
+ void insertVersion() {
+ ResourceVersion resourceVersion = new ResourceVersion();
+ resourceVersion.setResourceId(resourceId);
+ resourceVersion.setUser("binbin");
+ resourceVersion.setSystem("testSys");
+ resourceVersion.setFileMd5("binbinmd5");
+ resourceVersion.setVersion(version);
+ resourceVersion.setSize(25);
+ resourceVersion.setStartByte(35);
+ resourceVersion.setEndByte(36);
+ resourceVersion.setResource("testreso");
+ resourceVersion.setDescription("testDesc");
+ resourceVersion.setStartTime(new Date());
+ resourceVersion.setEndTime(new Date());
+ resourceVersion.setClientIp("132.145.36");
+ resourceVersion.setUpdator("testUp");
+ resourceVersion.setEnableFlag(true);
+ versionDao.insertNewVersion(resourceVersion);
+ }
+
@Test
- void getVersion() {
- insertNewVersion();
+ void testGetVersion() {
+ insertVersion();
versionDao.getVersion(resourceId, version);
}
@Test
- void getVersions() {
- insertNewVersion();
+ void testGetVersions() {
+ insertVersion();
versionDao.getVersions(resourceId);
}
@Test
- void getResourcesVersions() {
- insertNewVersion();
+ void testGetResourcesVersions() {
+ insertVersion();
Map<String, Object> map = new HashMap<>();
map.put("system", "testSys");
map.put("user", "binbin");
@@ -61,20 +81,20 @@ class VersionDaoTest extends BaseDaoTest {
}
@Test
- void deleteVersion() {
- insertNewVersion();
+ void testDeleteVersion() {
+ insertVersion();
versionDao.deleteVersion(resourceId, version);
}
@Test
- void deleteVersions() {
- insertNewVersion();
+ void testDeleteVersions() {
+ insertVersion();
versionDao.deleteVersions(resourceId);
}
@Test
- void bathDeleteVersions() {
- insertNewVersion();
+ void testBathDeleteVersions() {
+ insertVersion();
List<String> resourceIdlist = new ArrayList<>();
resourceIdlist.add(resourceId);
resourceIdlist.add("21");
@@ -85,7 +105,7 @@ class VersionDaoTest extends BaseDaoTest {
}
@Test
- void insertNewVersion() {
+ void testInsertNewVersion() {
ResourceVersion resourceVersion = new ResourceVersion();
resourceVersion.setResourceId(resourceId);
resourceVersion.setUser("binbin");
@@ -106,68 +126,68 @@ class VersionDaoTest extends BaseDaoTest {
}
@Test
- void getResourcePath() {
- insertNewVersion();
+ void testGetResourcePath() {
+ insertVersion();
versionDao.getResourcePath(resourceId);
}
@Test
- void getNewestVersion() {
- insertNewVersion();
+ void testGetNewestVersion() {
+ insertVersion();
versionDao.getNewestVersion(resourceId);
}
@Test
- void getStartByteForResource() {
- insertNewVersion();
+ void testGetStartByteForResource() {
+ insertVersion();
versionDao.getStartByteForResource(resourceId, version);
}
@Test
- void getEndByte() {
- insertNewVersion();
+ void testGetEndByte() {
+ insertVersion();
versionDao.getEndByte(resourceId, version);
}
@Test
- void findResourceVersion() {
- insertNewVersion();
+ void testFindResourceVersion() {
+ insertVersion();
versionDao.findResourceVersion(resourceId, version);
}
@Test
- void getAllResourcesViaSystem() {
- insertNewVersion();
+ void testGetAllResourcesViaSystem() {
+ insertVersion();
versionDao.getAllResourcesViaSystem(resourceId, version);
}
@Test
- void selectResourcesViaSystemByPage() {
- insertNewVersion();
+ void testSelectResourcesViaSystemByPage() {
+ insertVersion();
versionDao.selectResourcesViaSystemByPage(resourceId, version);
}
@Test
- void checkVersion() {
- insertNewVersion();
+ void testCheckVersion() {
+ insertVersion();
versionDao.checkVersion(resourceId, version);
}
@Test
- void selectResourceVersionEnbleFlag() {
- insertNewVersion();
+ void testSelectResourceVersionEnbleFlag() {
+ insertVersion();
versionDao.selectResourceVersionEnbleFlag(resourceId, version);
}
@Test
- void deleteResource() {
- insertNewVersion();
+ void testDeleteResource() {
+ insertVersion();
versionDao.deleteResource(resourceId);
}
@Test
- void batchDeleteResources() {
- insertNewVersion();
+ void testBatchDeleteResources() {
+ insertVersion();
List<String> resourceIdlist = new ArrayList<>();
resourceIdlist.add(resourceId);
resourceIdlist.add("21");
@@ -178,20 +198,20 @@ class VersionDaoTest extends BaseDaoTest {
}
@Test
- void getResourceVersion() {
+ void testGetResourceVersion() {
versionDao.getResourceVersion(resourceId, version);
}
@Test
- void selectVersionByPage() {
- insertNewVersion();
+ void testSelectVersionByPage() {
+ insertVersion();
List<Version> list = versionDao.selectVersionByPage(resourceId);
assertTrue(list.size() >= 1);
}
@Test
- void getResourceVersionsByResourceId() {
- insertNewVersion();
+ void testGetResourceVersionsByResourceId() {
+ insertVersion();
List<ResourceVersion> list =
versionDao.getResourceVersionsByResourceId(resourceId);
assertTrue(list.size() >= 1);
}
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/resources/create.sql
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/resources/create.sql
index 12f4b1855..4ad89a52e 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/resources/create.sql
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/resources/create.sql
@@ -26,6 +26,7 @@ CREATE TABLE linkis_ps_bml_project_resource (
PRIMARY KEY ( id )
);
+
DROP TABLE IF EXISTS linkis_ps_bml_project;
CREATE TABLE linkis_ps_bml_project (
id int(10) NOT NULL AUTO_INCREMENT,
@@ -40,6 +41,7 @@ CREATE TABLE linkis_ps_bml_project (
UNIQUE KEY name ( name )
);
+
DROP TABLE IF EXISTS linkis_ps_bml_project_user;
CREATE TABLE linkis_ps_bml_project_user (
id int(10) NOT NULL AUTO_INCREMENT,
@@ -53,6 +55,8 @@ CREATE TABLE linkis_ps_bml_project_user (
UNIQUE KEY user_project ( username , project_id )
);
+
+
DROP TABLE IF EXISTS linkis_ps_bml_resources_version;
CREATE TABLE linkis_ps_bml_resources_version (
id bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'Primary key',
@@ -124,3 +128,7 @@ CREATE TABLE linkis_ps_resources_download_history (
downloader varchar(50) NOT NULL COMMENT 'Downloader',
PRIMARY KEY ( id )
);
+
+insert ignore into linkis_ps_bml_project_user(project_id, username, priv,
creator, create_time) values ( 1, 'creCreatorUser', 2, 'creatorTest', now());
+insert ignore into linkis_ps_bml_project(name, `system`, source, description,
creator, enabled, create_time)values('testName', 'testSy','test',
'descTest','creCreatorUser', 1, now());
+insert ignore into linkis_ps_bml_project_resource(project_id, resource_id)
values(1, '123');
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
