Skip to content

Commit 793a546

Browse files
FalkWolskyFalkWolsky
authored
Merge pull request #279 from lowcoder-org/fix-failing-tests-for-api-service
Fix Failing Tests For Api Service
2 parents 83b5d43 + cb4d672 commit 793a546

File tree

18 files changed

+55
-68
lines changed

18 files changed

+55
-68
lines changed

‎server/api-service/lowcoder-domain/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
</dependency>
8686
<dependency>
8787
<groupId>de.flapdoodle.embed</groupId>
88-
<artifactId>de.flapdoodle.embed.mongo</artifactId>
88+
<artifactId>de.flapdoodle.embed.mongo.spring30x</artifactId>
8989
<scope>test</scope>
9090
</dependency>
9191
<dependency>

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/configurations/RedisRateLimiterConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
@Configuration
1111
public class RedisRateLimiterConfig {
1212

13-
@Value("${spring.redis.url:redis}")
13+
@Value("${spring.data.redis.url:redis}")
1414
private String redis;
1515

1616
@Bean

‎server/api-service/lowcoder-server/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
</dependency>
156156
<dependency>
157157
<groupId>de.flapdoodle.embed</groupId>
158-
<artifactId>de.flapdoodle.embed.mongo</artifactId>
158+
<artifactId>de.flapdoodle.embed.mongo.spring30x</artifactId>
159159
<scope>test</scope>
160160
</dependency>
161161
<dependency>

‎server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ spring:
88
authentication-database: admin
99
auto-index-creation: false
1010
uri: mongodb://localhost:27017/lowcoder?socketTimeoutMS=5000
11-
redis:
12-
url: redis://localhost:6379
11+
redis:
12+
url: redis://localhost:6379
1313
main:
1414
allow-bean-definition-overriding: true
1515
allow-circular-references: true

‎server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application-selfhost.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ spring:
1616
data:
1717
mongodb:
1818
uri: ${MONGODB_URL:mongodb://localhost:27017/lowcoder?socketTimeoutMS=5000}
19-
redis:
20-
url: ${REDIS_URL:redis://localhost:6379}
19+
redis:
20+
url: ${REDIS_URL:redis://localhost:6379}

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

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package org.lowcoder.api.application;
22

33

4+
import lombok.extern.slf4j.Slf4j;
45
import org.junit.Assert;
6+
import org.junit.Before;
57
import org.junit.Ignore;
68
import org.junit.Test;
79
import org.junit.runner.RunWith;
@@ -23,6 +25,7 @@
2325
import org.lowcoder.domain.permission.model.ResourceRole;
2426
import org.lowcoder.sdk.exception.BizError;
2527
import org.lowcoder.sdk.exception.BizException;
28+
import org.pf4j.PluginManager;
2629
import org.springframework.beans.factory.annotation.Autowired;
2730
import org.springframework.boot.test.context.SpringBootTest;
2831
import org.springframework.test.context.junit4.SpringRunner;
@@ -32,11 +35,10 @@
3235
import java.util.List;
3336
import java.util.Map;
3437
import java.util.Set;
35-
36-
@Ignore
3738
@SuppressWarnings({"OptionalGetWithoutIsPresent"})
3839
@SpringBootTest
3940
@RunWith(SpringRunner.class)
41+
@Slf4j(topic = "ApplicationApiServiceTest")
4042
public class ApplicationApiServiceTest {
4143

4244
@Autowired
@@ -48,6 +50,19 @@ public class ApplicationApiServiceTest {
4850
@Autowired
4951
private DatasourceApiService datasourceApiService;
5052

53+
@Autowired
54+
private PluginManager pluginManager;
55+
56+
@Before
57+
public void init() {
58+
try {
59+
pluginManager.loadPlugins();
60+
pluginManager.startPlugins();
61+
} catch (Exception e) {
62+
log.error("Failed to load/start plugins. Exception: " + e);
63+
}
64+
}
65+
5166
@Test
5267
@WithMockUser
5368
public void testAutoInheritFoldersPermissionsOnAppCreate() {
@@ -269,6 +284,7 @@ public void testPermissions() {
269284
.verifyComplete();
270285
}
271286

287+
@Ignore
272288
@SuppressWarnings("ConstantConditions")
273289
@Test
274290
@WithMockUser(id = "user02")
@@ -301,6 +317,7 @@ public void testCreateApplicationSuccess() {
301317
.verifyComplete();
302318
}
303319

320+
@Ignore
304321
@SuppressWarnings("ConstantConditions")
305322
@Test
306323
@WithMockUser(id = "user02")

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import java.util.Map;
1717
import java.util.Set;
1818

19-
@Ignore
2019
@SpringBootTest
2120
@RunWith(SpringRunner.class)
2221
public class CompoundApplicationDslFilterTest {

‎server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/AuthenticationControllerTest.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.lowcoder.api.authentication;
22

33
import com.google.common.collect.Iterables;
4-
import org.junit.Ignore;
54
import org.junit.Test;
65
import org.junit.runner.RunWith;
76
import org.lowcoder.api.authentication.AuthenticationController.FormLoginRequest;
@@ -34,7 +33,6 @@
3433
import static org.lowcoder.sdk.exception.BizError.INVALID_PASSWORD;
3534
import static org.lowcoder.sdk.exception.BizError.USER_LOGIN_ID_EXIST;
3635

37-
@Ignore
3836
@SpringBootTest
3937
@RunWith(SpringRunner.class)
4038
@ActiveProfiles("AuthenticationControllerTest")
@@ -84,7 +82,7 @@ public void testFormRegisterSuccess() {
8482
assertEquals(email, connection.getRawId());
8583
assertEquals(email, connection.getName());
8684
assertNull(connection.getAvatar());
87-
assertEquals(1, connection.getOrgIds().size());
85+
assertEquals(0, connection.getOrgIds().size());
8886
assertNull(connection.getAuthConnectionAuthToken());
8987
assertEquals(Map.of("email", email), connection.getRawUserInfo());
9088
//exchange
@@ -95,7 +93,6 @@ public void testFormRegisterSuccess() {
9593
})
9694
.verifyComplete();
9795
}
98-
9996
@Test
10097
public void testFormLoginSuccess() {
10198
String email = "test_login@ob.dev";
@@ -137,7 +134,7 @@ public void testFormLoginSuccess() {
137134
assertEquals(email, connection.getRawId());
138135
assertEquals(email, connection.getName());
139136
assertNull(connection.getAvatar());
140-
assertEquals(1, connection.getOrgIds().size());
137+
assertEquals(0, connection.getOrgIds().size());
141138
assertNull(connection.getAuthConnectionAuthToken());
142139
assertEquals(Map.of("email", email), connection.getRawUserInfo());
143140
//exchange

‎server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/GoogleAuthenticateTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929

3030
import static org.junit.Assert.*;
3131

32-
@Ignore
3332
@SpringBootTest
3433
@RunWith(SpringRunner.class)
3534
public class GoogleAuthenticateTest {
@@ -43,6 +42,7 @@ public class GoogleAuthenticateTest {
4342
@Autowired
4443
private AuthenticationService authenticationService;
4544

45+
@Ignore
4646
@Test
4747
public void testGoogleRegisterSuccess() {
4848
String email = "test_register@ob.dev";

‎server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceTest.java

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)