Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit14ec690

Browse files
author
Thomas
committed
Enable Tests except
- ApplicationApiServiceIntegrationTest- DatasourceApiServiceIntegrationTest- LibraryQueryApiServiceIntegrationTest
1 parent6ecec74 commit14ec690

File tree

16 files changed

+226
-286
lines changed

16 files changed

+226
-286
lines changed

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/bundle/service/BundleServiceImpl.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
importreactor.core.publisher.Mono;
2020

2121
importjava.util.Collection;
22+
importjava.util.Map;
2223
importjava.util.Set;
2324
importjava.util.stream.Collectors;
2425

‎server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceIntegrationTest.java‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
packageorg.lowcoder.api.application;
22

33

4-
importjava.util.Map;
5-
importjava.util.Set;
6-
7-
importorg.junit.Assert;
8-
importorg.junit.Ignore;
9-
importorg.junit.Test;
10-
importorg.junit.runner.RunWith;
4+
importlombok.extern.slf4j.Slf4j;
5+
importorg.junit.jupiter.api.Assertions;
6+
importorg.junit.jupiter.api.BeforeEach;
7+
importorg.junit.jupiter.api.Disabled;
8+
importorg.junit.jupiter.api.Test;
119
importorg.lowcoder.api.application.ApplicationEndpoints.CreateApplicationRequest;
1210
importorg.lowcoder.api.application.view.ApplicationView;
11+
importorg.lowcoder.api.common.InitData;
1312
importorg.lowcoder.api.common.mockuser.WithMockUser;
1413
importorg.lowcoder.api.datasource.DatasourceApiService;
1514
importorg.lowcoder.api.datasource.DatasourceApiServiceIntegrationTest;
@@ -23,22 +22,32 @@
2322
importorg.lowcoder.sdk.exception.BizException;
2423
importorg.springframework.beans.factory.annotation.Autowired;
2524
importorg.springframework.boot.test.context.SpringBootTest;
26-
importorg.springframework.test.context.junit4.SpringRunner;
27-
28-
importlombok.extern.slf4j.Slf4j;
25+
importorg.springframework.test.context.ActiveProfiles;
2926
importreactor.core.publisher.Mono;
3027
importreactor.test.StepVerifier;
3128

29+
importjava.util.Map;
30+
importjava.util.Set;
31+
3232
@SuppressWarnings({"OptionalGetWithoutIsPresent"})
3333
@SpringBootTest
34-
@RunWith(SpringRunner.class)
34+
@ActiveProfiles("ApplicationApiServiceIntegrationTest")
35+
//@RunWith(SpringRunner.class)
3536
@Slf4j(topic ="ApplicationApiServiceIntegrationTest")
37+
@Disabled("Enable after all plugins are loaded in test mode")
3638
publicclassApplicationApiServiceIntegrationTest {
3739

3840
@Autowired
3941
privateApplicationApiServiceapplicationApiService;
4042
@Autowired
4143
privateDatasourceApiServicedatasourceApiService;
44+
@Autowired
45+
privateInitDatainitData;
46+
47+
@BeforeEach
48+
publicvoidbeforeEach() {
49+
initData.init();
50+
}
4251

4352
@SuppressWarnings("ConstantConditions")
4453
@Test
@@ -68,11 +77,10 @@ public void testCreateApplicationSuccess() {
6877
.flatMap(createApplicationRequest ->applicationApiService.create(createApplicationRequest));
6978

7079
StepVerifier.create(applicationViewMono)
71-
.assertNext(applicationView ->Assert.assertNotNull(applicationView.getApplicationInfoView().getApplicationId()))
80+
.assertNext(applicationView ->Assertions.assertNotNull(applicationView.getApplicationInfoView().getApplicationId()))
7281
.verifyComplete();
7382
}
7483

75-
@Ignore
7684
@SuppressWarnings("ConstantConditions")
7785
@Test
7886
@WithMockUser(id ="user02")

‎server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceTest.java‎

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
packageorg.lowcoder.api.application;
22

33

4-
importjava.util.List;
5-
importjava.util.Map;
6-
importjava.util.Set;
7-
8-
importorg.junit.Assert;
9-
importorg.junit.Ignore;
10-
importorg.junit.Test;
11-
importorg.junit.runner.RunWith;
4+
importlombok.extern.slf4j.Slf4j;
5+
importorg.junit.jupiter.api.Assertions;
6+
importorg.junit.jupiter.api.BeforeEach;
7+
importorg.junit.jupiter.api.Test;
128
importorg.lowcoder.api.application.ApplicationEndpoints.CreateApplicationRequest;
139
importorg.lowcoder.api.application.view.ApplicationPermissionView;
1410
importorg.lowcoder.api.application.view.ApplicationView;
11+
importorg.lowcoder.api.common.InitData;
1512
importorg.lowcoder.api.common.mockuser.WithMockUser;
1613
importorg.lowcoder.api.datasource.DatasourceApiService;
1714
importorg.lowcoder.api.home.FolderApiService;
@@ -27,13 +24,16 @@
2724
importorg.lowcoder.sdk.exception.BizException;
2825
importorg.springframework.beans.factory.annotation.Autowired;
2926
importorg.springframework.boot.test.context.SpringBootTest;
30-
importorg.springframework.test.context.junit4.SpringRunner;
31-
32-
importlombok.extern.slf4j.Slf4j;
27+
importorg.springframework.test.context.ActiveProfiles;
3328
importreactor.core.publisher.Mono;
3429
importreactor.test.StepVerifier;
30+
31+
importjava.util.List;
32+
importjava.util.Map;
33+
importjava.util.Set;
3534
@SpringBootTest
36-
@RunWith(SpringRunner.class)
35+
//@RunWith(SpringRunner.class)
36+
@ActiveProfiles("ApplicationApiServiceTest")
3737
@Slf4j(topic ="ApplicationApiServiceTest")
3838
publicclassApplicationApiServiceTest {
3939

@@ -45,10 +45,16 @@ public class ApplicationApiServiceTest {
4545
privateApplicationServiceapplicationService;
4646
@Autowired
4747
privateDatasourceApiServicedatasourceApiService;
48+
@Autowired
49+
privateInitDatainitData;
50+
51+
@BeforeEach
52+
publicvoidbeforeEach() {
53+
initData.init();
54+
}
4855

4956
@Test
5057
@WithMockUser
51-
@Ignore("Disabled until it is fixed")
5258
publicvoidtestAutoInheritFoldersPermissionsOnAppCreate() {
5359
Mono<ApplicationPermissionView>permissionViewMono =
5460
folderApiService.grantPermission("folder01",Set.of("user02"),Set.of("group01"),ResourceRole.EDITOR)
@@ -58,23 +64,23 @@ public void testAutoInheritFoldersPermissionsOnAppCreate() {
5864

5965
StepVerifier.create(permissionViewMono)
6066
.assertNext(applicationPermissionView -> {
61-
Assert.assertTrue(applicationPermissionView.getPermissions().stream()
67+
Assertions.assertTrue(applicationPermissionView.getPermissions().stream()
6268
.anyMatch(permissionItemView ->
6369
equals(permissionItemView,PermissionItemView.builder()
6470
.type(ResourceHolder.GROUP)
6571
.id("group01")
6672
.role(ResourceRole.EDITOR.getValue())
6773
.build())
6874
));
69-
Assert.assertTrue(applicationPermissionView.getPermissions().stream()
75+
Assertions.assertTrue(applicationPermissionView.getPermissions().stream()
7076
.anyMatch(permissionItemView ->
7177
equals(permissionItemView,PermissionItemView.builder()
7278
.type(ResourceHolder.USER)
7379
.id("user01")
7480
.role(ResourceRole.OWNER.getValue())
7581
.build())
7682
));
77-
Assert.assertTrue(applicationPermissionView.getPermissions().stream()
83+
Assertions.assertTrue(applicationPermissionView.getPermissions().stream()
7884
.anyMatch(permissionItemView ->
7985
equals(permissionItemView,PermissionItemView.builder()
8086
.type(ResourceHolder.USER)
@@ -94,7 +100,6 @@ private boolean equals(PermissionItemView p1, PermissionItemView p2) {
94100

95101
@Test
96102
@WithMockUser
97-
@Ignore("Disabled until it is fixed")
98103
publicvoidtestRecycleAndDeleteApplicationSuccess() {
99104

100105
Mono<Application>applicationMono =createApplication("app02",null)
@@ -103,13 +108,12 @@ public void testRecycleAndDeleteApplicationSuccess() {
103108
.delayUntil(applicationId ->applicationApiService.delete(applicationId))
104109
.flatMap(applicationId ->applicationService.findById(applicationId));
105110
StepVerifier.create(applicationMono)
106-
.assertNext(application ->Assert.assertSame(application.getApplicationStatus(),ApplicationStatus.DELETED))
111+
.assertNext(application ->Assertions.assertSame(application.getApplicationStatus(),ApplicationStatus.DELETED))
107112
.verifyComplete();
108113
}
109114

110115
@Test
111116
@WithMockUser
112-
@Ignore("Disabled until it is fixed")
113117
publicvoidtestDeleteNormalApplicationWithError() {
114118

115119
StepVerifier.create(applicationApiService.delete("app02"))
@@ -127,20 +131,19 @@ private Mono<ApplicationView> createApplication(String name, String folderId) {
127131

128132
@Test
129133
@WithMockUser
130-
@Ignore("Disabled until it is fixed")
131134
publicvoidtestPublishApplication() {
132135
Mono<String>applicationIdMono =createApplication("test",null)
133136
.map(applicationView ->applicationView.getApplicationInfoView().getApplicationId())
134137
.cache();
135138

136139
// edit dsl before publish
137140
StepVerifier.create(applicationIdMono.flatMap(id ->applicationApiService.getEditingApplication(id)))
138-
.assertNext(applicationView ->Assert.assertEquals(Map.of("comp","list"),applicationView.getApplicationDSL()))
141+
.assertNext(applicationView ->Assertions.assertEquals(Map.of("comp","list"),applicationView.getApplicationDSL()))
139142
.verifyComplete();
140143

141144
// published dsl before publish
142145
StepVerifier.create(applicationIdMono.flatMap(id ->applicationApiService.getPublishedApplication(id,ApplicationRequestType.PUBLIC_TO_ALL)))
143-
.assertNext(applicationView ->Assert.assertEquals(Map.of("comp","table"),applicationView.getApplicationDSL()))
146+
.assertNext(applicationView ->Assertions.assertEquals(Map.of("comp","table"),applicationView.getApplicationDSL()))
144147
.verifyComplete();
145148

146149
// publish
@@ -149,18 +152,17 @@ public void testPublishApplication() {
149152

150153
// edit dsl after publish
151154
StepVerifier.create(applicationIdMono.flatMap(id ->applicationApiService.getEditingApplication(id)))
152-
.assertNext(applicationView ->Assert.assertEquals(Map.of("comp","list"),applicationView.getApplicationDSL()))
155+
.assertNext(applicationView ->Assertions.assertEquals(Map.of("comp","list"),applicationView.getApplicationDSL()))
153156
.verifyComplete();
154157

155158
// published dsl after publish
156159
StepVerifier.create(applicationIdMono.flatMap(id ->applicationApiService.getPublishedApplication(id,ApplicationRequestType.PUBLIC_TO_ALL)))
157-
.assertNext(applicationView ->Assert.assertEquals(Map.of("comp","list"),applicationView.getApplicationDSL()))
160+
.assertNext(applicationView ->Assertions.assertEquals(Map.of("comp","list"),applicationView.getApplicationDSL()))
158161
.verifyComplete();
159162
}
160163

161164
@Test
162165
@WithMockUser
163-
@Ignore("Disabled until it is fixed")
164166
publicvoidtestPermissions() {
165167
// test grant permissions.
166168
Mono<ApplicationPermissionView>applicationPermissionViewMono =
@@ -169,8 +171,8 @@ public void testPermissions() {
169171
StepVerifier.create(applicationPermissionViewMono)
170172
.assertNext(applicationPermissionView -> {
171173
List<PermissionItemView>permissions =applicationPermissionView.getPermissions();
172-
Assert.assertEquals(2,permissions.size());
173-
Assert.assertTrue(permissions.stream()
174+
Assertions.assertEquals(2,permissions.size());
175+
Assertions.assertTrue(permissions.stream()
174176
.anyMatch(permissionItemView -> {
175177
PermissionItemViewother =PermissionItemView.builder()
176178
.type(ResourceHolder.USER)
@@ -179,7 +181,7 @@ public void testPermissions() {
179181
.build();
180182
returnequals(permissionItemView,other);
181183
}));
182-
Assert.assertTrue(permissions.stream()
184+
Assertions.assertTrue(permissions.stream()
183185
.anyMatch(permissionItemView -> {
184186
PermissionItemViewother =PermissionItemView.builder()
185187
.type(ResourceHolder.GROUP)
@@ -205,16 +207,16 @@ public void testPermissions() {
205207
returnequals(permissionItemView,other);
206208
})
207209
.toList();
208-
Assert.assertEquals(1,permissionItemViews.size());
210+
Assertions.assertEquals(1,permissionItemViews.size());
209211
StringpermissionId =permissionItemViews.get(0).getPermissionId();
210212
returnapplicationApiService.updatePermission("app01",permissionId,ResourceRole.VIEWER);
211213
})
212214
.then(applicationApiService.getApplicationPermissions("app01"));
213215
StepVerifier.create(applicationPermissionViewMono)
214216
.assertNext(applicationPermissionView -> {
215217
List<PermissionItemView>permissions =applicationPermissionView.getPermissions();
216-
Assert.assertEquals(2,permissions.size());
217-
Assert.assertTrue(permissions.stream()
218+
Assertions.assertEquals(2,permissions.size());
219+
Assertions.assertTrue(permissions.stream()
218220
.anyMatch(permissionItemView -> {
219221
PermissionItemViewother =PermissionItemView.builder()
220222
.type(ResourceHolder.USER)
@@ -223,7 +225,7 @@ public void testPermissions() {
223225
.build();
224226
returnequals(permissionItemView,other);
225227
}));
226-
Assert.assertTrue(permissions.stream()
228+
Assertions.assertTrue(permissions.stream()
227229
.anyMatch(permissionItemView -> {
228230
PermissionItemViewother =PermissionItemView.builder()
229231
.type(ResourceHolder.GROUP)
@@ -249,7 +251,7 @@ public void testPermissions() {
249251
returnequals(permissionItemView,other);
250252
})
251253
.toList();
252-
Assert.assertEquals(1,permissionItemViews.size());
254+
Assertions.assertEquals(1,permissionItemViews.size());
253255
StringpermissionId =permissionItemViews.get(0).getPermissionId();
254256
returnapplicationApiService.removePermission("app01",permissionId);
255257
})
@@ -258,8 +260,8 @@ public void testPermissions() {
258260
StepVerifier.create(applicationPermissionViewMono)
259261
.assertNext(applicationPermissionView -> {
260262
List<PermissionItemView>permissions =applicationPermissionView.getPermissions();
261-
Assert.assertEquals(1,permissions.size());
262-
Assert.assertTrue(permissions.stream()
263+
Assertions.assertEquals(1,permissions.size());
264+
Assertions.assertTrue(permissions.stream()
263265
.anyMatch(permissionItemView -> {
264266
PermissionItemViewother =PermissionItemView.builder()
265267
.type(ResourceHolder.GROUP)

‎server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/CompoundApplicationDslFilterTest.java‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,65 @@
11
packageorg.lowcoder.api.application;
22

33
importorg.apache.commons.collections4.MapUtils;
4-
importorg.junit.Assert;
5-
importorg.junit.Ignore;
6-
importorg.junit.Test;
7-
importorg.junit.runner.RunWith;
4+
importorg.junit.jupiter.api.Assertions;
5+
importorg.junit.jupiter.api.BeforeEach;
6+
importorg.junit.jupiter.api.Test;
7+
importorg.lowcoder.api.common.InitData;
88
importorg.lowcoder.api.common.mockuser.WithMockUser;
99
importorg.lowcoder.sdk.constants.DslConstants.CompoundAppDslConstants;
1010
importorg.lowcoder.sdk.test.JsonFileReader;
1111
importorg.springframework.beans.factory.annotation.Autowired;
1212
importorg.springframework.boot.test.context.SpringBootTest;
13-
importorg.springframework.test.context.junit4.SpringRunner;
13+
importorg.springframework.test.context.ActiveProfiles;
1414

1515
importjava.util.HashMap;
1616
importjava.util.Map;
1717
importjava.util.Set;
1818

1919
@SpringBootTest
20-
@RunWith(SpringRunner.class)
20+
@ActiveProfiles("test")
21+
//@RunWith(SpringRunner.class)
2122
publicclassCompoundApplicationDslFilterTest {
2223

2324
@Autowired
2425
privateCompoundApplicationDslFilterfilter;
26+
@Autowired
27+
privateInitDatainitData;
28+
29+
@BeforeEach
30+
publicvoidbeforeEach() {
31+
initData.init();
32+
}
2533

2634
@Test
27-
@Ignore("Disabled until it is fixed")
2835
publicvoidtestGetAllSubAppIdsFromCompoundAppDsl() {
2936

3037
Map<String,Object>dsl =JsonFileReader.readMap(CompoundApplicationDslFilterTest.class);
3138
Set<String>ids =filter.getAllSubAppIdsFromCompoundAppDsl(getTargetDsl(dsl));
32-
Assert.assertEquals(Set.of("app01","app03","app04","app06","app07"),ids);// only get the leaf's id.
39+
Assertions.assertEquals(Set.of("app01","app03","app04","app06","app07"),ids);// only get the leaf's id.
3340
}
3441

3542
@Test
3643
@WithMockUser
37-
@Ignore("Disabled until it is fixed")
3844
publicvoidtestRemoveSubAppsFromCompoundDslWithAdminUser() {
3945

4046
Map<String,Object>dsl =JsonFileReader.readMap(CompoundApplicationDslFilterTest.class);
4147
filter.removeSubAppsFromCompoundDsl(dsl).block();
4248
Set<String>ids =filter.getAllSubAppIdsFromCompoundAppDsl(getTargetDsl(dsl));
4349
// admin user has all applications' permissions, so will remove nothing.
44-
Assert.assertEquals(Set.of("app01","app03","app04","app06","app07"),ids);
50+
Assertions.assertEquals(Set.of("app01","app03","app04","app06","app07"),ids);
4551
}
4652

4753
@Test
4854
@WithMockUser(id ="user02")
49-
@Ignore("Disabled until it is fixed")
5055
publicvoidtestRemoveSubAppsFromCompoundDslWithNormalUser() {
5156

5257
Map<String,Object>dsl =JsonFileReader.readMap(CompoundApplicationDslFilterTest.class);
5358
filter.removeSubAppsFromCompoundDsl(dsl).block();
5459
Set<String>ids =filter.getAllSubAppIdsFromCompoundAppDsl(getTargetDsl(dsl));
5560
// current user has no permissions, so will remove all, except the applications with the
5661
// "hideWhenNoPermission" value equal to false.
57-
Assert.assertEquals(Set.of("app03"),ids);
62+
Assertions.assertEquals(Set.of("app03"),ids);
5863
}
5964

6065
@SuppressWarnings("unchecked")

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp