You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by li...@apache.org on 2022/11/12 15:57:48 UTC
[dolphinscheduler] branch dev updated: [Improvement-12850][UT] Improve the ut of DataSourceMapperTest (#12851)
This is an automated email from the ASF dual-hosted git repository.
lidongdai pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 7c711e622f [Improvement-12850][UT] Improve the ut of DataSourceMapperTest (#12851)
7c711e622f is described below
commit 7c711e622f8e5c7efbcbbd349aeb5f117ddab792
Author: rickchengx <38...@users.noreply.github.com>
AuthorDate: Sat Nov 12 23:57:40 2022 +0800
[Improvement-12850][UT] Improve the ut of DataSourceMapperTest (#12851)
---
.../dao/mapper/DataSourceMapperTest.java | 32 ++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/DataSourceMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/DataSourceMapperTest.java
index 30fe34323f..ef1fcee7c0 100644
--- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/DataSourceMapperTest.java
+++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/DataSourceMapperTest.java
@@ -272,6 +272,38 @@ public class DataSourceMapperTest extends BaseDaoTest {
.containsAll(Arrays.asList(dataSourceIds)));
}
+ @Test
+ public void testSelectPagingByIds() {
+ User user1 = createGeneralUser("user1");
+ User user2 = createGeneralUser("user2");
+ DataSource dataSource1ForUser1 = createDataSource(user1.getId(), "dataSource1ForUser1");
+ DataSource dataSource2ForUser2 = createDataSource(user2.getId(), "dataSource2ForUser2");
+ DataSource dataSource3ForUser1 = createDataSource(user1.getId(), dataSource1ForUser1.getName() + "test");
+
+ // select without conditions
+ Page page = new Page(0, 4);
+ List<DataSource> actualDataSources = dataSourceMapper.selectPagingByIds(page, null, null).getRecords();
+ Assertions.assertEquals(3, actualDataSources.size());
+ Assertions.assertTrue(actualDataSources.stream().map(t -> t.getId()).collect(toList())
+ .containsAll(Arrays.asList(dataSource1ForUser1.getId(), dataSource2ForUser2.getId(),
+ dataSource3ForUser1.getId())));
+
+ // select with name
+ actualDataSources = dataSourceMapper.selectPagingByIds(page, null, dataSource1ForUser1.getName()).getRecords();
+ Assertions.assertEquals(2, actualDataSources.size());
+ Assertions.assertTrue(actualDataSources.stream().map(t -> t.getId()).collect(toList())
+ .containsAll(Arrays.asList(dataSource1ForUser1.getId(), dataSource3ForUser1.getId())));
+
+ // select with dataSourceIds and name
+ actualDataSources = dataSourceMapper
+ .selectPagingByIds(page, Arrays.asList(dataSource1ForUser1.getId(), dataSource2ForUser2.getId()),
+ dataSource1ForUser1.getName())
+ .getRecords();
+ Assertions.assertEquals(1, actualDataSources.size());
+ Assertions.assertTrue(actualDataSources.stream().map(t -> t.getId()).collect(toList())
+ .containsAll(Arrays.asList(dataSource1ForUser1.getId())));
+ }
+
/**
* create datasource relation
* @param userId