Fix lots of test failures for api-service

aq-ikhwa-tech · aq-ikhwa-tech · commit 191aed0ecab8 · 2023-07-12T18:12:30.000+05:00
- Corrected dependency for embedded mongo as per Spring 3 support
- Added code piece to load and start plugins for them to be available in the tests' Spring Context.
- Corrected wrong redis uri scheme as per Spring 3 support.
diff --git a/server/api-service/lowcoder-domain/pom.xml b/server/api-service/lowcoder-domain/pom.xml
@@ -85,7 +85,7 @@
         </dependency>
         <dependency>
             <groupId>de.flapdoodle.embed</groupId>
-            <artifactId>de.flapdoodle.embed.mongo</artifactId>
+            <artifactId>de.flapdoodle.embed.mongo.spring30x</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/configurations/RedisRateLimiterConfig.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/configurations/RedisRateLimiterConfig.java
@@ -10,7 +10,7 @@
 @Configuration
 public class RedisRateLimiterConfig {
 
-    @Value("${spring.redis.url:redis}")
+    @Value("${spring.data.redis.url:redis}")
     private String redis;
 
     @Bean
diff --git a/server/api-service/lowcoder-plugins/sqlBasedPlugin/src/main/java/org/lowcoder/plugin/sql/SqlBasedPlugin.java b/server/api-service/lowcoder-plugins/sqlBasedPlugin/src/main/java/org/lowcoder/plugin/sql/SqlBasedPlugin.java
@@ -0,0 +1,12 @@
+package org.lowcoder.plugin.sql;
+
+import org.pf4j.Plugin;
+import org.pf4j.PluginWrapper;
+
+public class SqlBasedPlugin extends Plugin {
+
+    public SqlBasedPlugin(PluginWrapper wrapper) {
+        super(wrapper);
+    }
+
+}
diff --git a/server/api-service/lowcoder-server/pom.xml b/server/api-service/lowcoder-server/pom.xml
@@ -155,7 +155,7 @@
         </dependency>
         <dependency>
             <groupId>de.flapdoodle.embed</groupId>
-            <artifactId>de.flapdoodle.embed.mongo</artifactId>
+            <artifactId>de.flapdoodle.embed.mongo.spring30x</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml b/server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml
@@ -8,8 +8,8 @@ spring:
       authentication-database: admin
       auto-index-creation: false
       uri: mongodb://localhost:27017/lowcoder?socketTimeoutMS=5000
-  redis:
-    url: redis://localhost:6379
+    redis:
+      url: redis://localhost:6379
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true
diff --git a/server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application-selfhost.yml b/server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application-selfhost.yml
@@ -16,5 +16,5 @@ spring:
   data:
     mongodb:
       uri: ${MONGODB_URL:mongodb://localhost:27017/lowcoder?socketTimeoutMS=5000}
-  redis:
-    url: ${REDIS_URL:redis://localhost:6379}
+    redis:
+      url: ${REDIS_URL:redis://localhost:6379}
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceTest.java
@@ -1,7 +1,9 @@
 package org.lowcoder.api.application;
 
 
+import lombok.extern.slf4j.Slf4j;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -23,6 +25,7 @@
 import org.lowcoder.domain.permission.model.ResourceRole;
 import org.lowcoder.sdk.exception.BizError;
 import org.lowcoder.sdk.exception.BizException;
+import org.pf4j.PluginManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -32,11 +35,10 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
-@Ignore
 @SuppressWarnings({"OptionalGetWithoutIsPresent"})
 @SpringBootTest
 @RunWith(SpringRunner.class)
+@Slf4j(topic = "ApplicationApiServiceTest")
 public class ApplicationApiServiceTest {
 
     @Autowired
@@ -48,6 +50,19 @@ public class ApplicationApiServiceTest {
     @Autowired
     private DatasourceApiService datasourceApiService;
 
+    @Autowired
+    private PluginManager pluginManager;
+
+    @Before
+    public void init() {
+        try {
+            pluginManager.loadPlugins();
+            pluginManager.startPlugins();
+        } catch (Exception e) {
+            log.error("Failed to load/start plugins. Exception: " + e);
+        }
+    }
+
     @Test
     @WithMockUser
     public void testAutoInheritFoldersPermissionsOnAppCreate() {
@@ -269,6 +284,7 @@ public void testPermissions() {
                 .verifyComplete();
     }
 
+    @Ignore
     @SuppressWarnings("ConstantConditions")
     @Test
     @WithMockUser(id = "user02")
@@ -301,6 +317,7 @@ public void testCreateApplicationSuccess() {
                 .verifyComplete();
     }
 
+    @Ignore
     @SuppressWarnings("ConstantConditions")
     @Test
     @WithMockUser(id = "user02")
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/CompoundApplicationDslFilterTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/CompoundApplicationDslFilterTest.java
@@ -16,7 +16,6 @@
 import java.util.Map;
 import java.util.Set;
 
-@Ignore
 @SpringBootTest
 @RunWith(SpringRunner.class)
 public class CompoundApplicationDslFilterTest {
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/AuthenticationControllerTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/AuthenticationControllerTest.java
@@ -34,7 +34,6 @@
 import static org.lowcoder.sdk.exception.BizError.INVALID_PASSWORD;
 import static org.lowcoder.sdk.exception.BizError.USER_LOGIN_ID_EXIST;
 
-@Ignore
 @SpringBootTest
 @RunWith(SpringRunner.class)
 @ActiveProfiles("AuthenticationControllerTest")
@@ -49,6 +48,7 @@ public class AuthenticationControllerTest {
     @Autowired
     private AuthenticationService authenticationService;
 
+    @Ignore
     @Test
     public void testFormRegisterSuccess() {
         String email = "test_register@ob.dev";
@@ -96,6 +96,7 @@ public void testFormRegisterSuccess() {
                 .verifyComplete();
     }
 
+    @Ignore
     @Test
     public void testFormLoginSuccess() {
         String email = "test_login@ob.dev";
@@ -149,6 +150,7 @@ public void testFormLoginSuccess() {
                 .verifyComplete();
     }
 
+    @Ignore
     @Test
     public void testRegisterFailByLoginIdExist() {
 
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/GoogleAuthenticateTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/GoogleAuthenticateTest.java
@@ -29,7 +29,6 @@
 
 import static org.junit.Assert.*;
 
-@Ignore
 @SpringBootTest
 @RunWith(SpringRunner.class)
 public class GoogleAuthenticateTest {
@@ -43,6 +42,7 @@ public class GoogleAuthenticateTest {
     @Autowired
     private AuthenticationService authenticationService;
 
+    @Ignore
     @Test
     public void testGoogleRegisterSuccess() {
         String email = "test_register@ob.dev";
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/InitData.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/InitData.java
@@ -57,7 +57,7 @@ public void init() {
     @SuppressWarnings({"ConstantConditions"})
     private void execute() {
 
-        String currentDirPath = JsonFileReader.buildPath("com/lowcoder/api/common/json");
+        String currentDirPath = JsonFileReader.buildPath("org/lowcoder/api/common/json");
         File dir = new File(currentDirPath);
         Stream.of(dir.listFiles())
                 .filter(file -> file.isFile() && file.getName().endsWith(".json"))
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/datasource/DatasourceApiServiceTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/datasource/DatasourceApiServiceTest.java
@@ -26,14 +26,14 @@
 import static org.lowcoder.domain.permission.model.ResourceRole.OWNER;
 import static org.lowcoder.domain.permission.model.ResourceRole.VIEWER;
 
-@Ignore
 @SpringBootTest
 @RunWith(SpringRunner.class)
 public class DatasourceApiServiceTest {
 
     @Autowired
     private DatasourceApiService datasourceApiService;
 
+    @Ignore
     @Test
     @WithMockUser(id = "user02")
     public void testListOrgDatasource() {
@@ -62,6 +62,7 @@ private DatasourceView findDatasourceView(Collection<DatasourceView> datasourceV
                 .orElse(null);
     }
 
+    @Ignore
     @Test
     @WithMockUser
     public void testGrantPermissionAndGetPermissionSuccess() {
@@ -89,6 +90,7 @@ public void testGrantPermissionAndGetPermissionSuccess() {
                 .verifyComplete();
     }
 
+    @Ignore
     @Test
     @WithMockUser
     public void testUpdatePermissionAndDeletePermissionSuccess() {
@@ -126,6 +128,7 @@ public void testUpdatePermissionAndDeletePermissionSuccess() {
                 .verifyComplete();
     }
 
+    @Ignore
     @Test
     @WithMockUser(id = "user02")
     public void testUpdatePermissionErrorWithNoPermission() {
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/infra/ServerConfigRepositoryTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/infra/ServerConfigRepositoryTest.java
@@ -18,7 +18,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@Ignore
 @RunWith(SpringRunner.class)
 @SpringBootTest
 @Slf4j
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/query/LibraryQueryApiServiceTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/query/LibraryQueryApiServiceTest.java
@@ -21,7 +21,6 @@
 
 import static org.lowcoder.api.common.mockuser.WithMockUser.DEFAULT_CURRENT_ORG_ID;
 
-@Ignore
 @SuppressWarnings("SameParameterValue")
 @SpringBootTest
 @RunWith(SpringRunner.class)
@@ -32,6 +31,7 @@ public class LibraryQueryApiServiceTest {
     @Autowired
     private LibraryQueryApiService libraryQueryApiService;
 
+    @Ignore
     @Test
     @WithMockUser
     public void testListLibraryQueries() {
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/service/FolderApiServiceTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/service/FolderApiServiceTest.java
@@ -24,7 +24,6 @@
 
 import static org.junit.Assert.assertEquals;
 
-@Ignore
 @SpringBootTest
 @RunWith(SpringRunner.class)
 public class FolderApiServiceTest {
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/service/impl/ApplicationHistorySnapshotServiceTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/service/impl/ApplicationHistorySnapshotServiceTest.java
@@ -17,7 +17,6 @@
 import lombok.extern.slf4j.Slf4j;
 import reactor.test.StepVerifier;
 
-@Ignore
 @SuppressWarnings({"ReactiveStreamsNullableInLambdaInTransform"})
 @RunWith(SpringRunner.class)
 @SpringBootTest
diff --git a/server/api-service/lowcoder-server/src/test/resources/application.yml b/server/api-service/lowcoder-server/src/test/resources/application.yml
@@ -1,11 +1,15 @@
 spring:
-  mongodb:
-    embedded:
-      version: 4.0.2
   main:
     allow-circular-references: true
-  redis:
-    url: redis://localhost:6370
+  data:
+    redis:
+      url: redis://localhost:6370
+
+de:
+  flapdoodle:
+    mongodb:
+      embedded:
+        version: 4.0.2
 
 server:
   port: 8080
diff --git a/server/api-service/pom.xml b/server/api-service/pom.xml
@@ -278,7 +278,7 @@
             </dependency>
             <dependency>
                 <groupId>de.flapdoodle.embed</groupId>
-                <artifactId>de.flapdoodle.embed.mongo</artifactId>
+                <artifactId>de.flapdoodle.embed.mongo.spring30x</artifactId>
                 <version>4.7.0</version>
             </dependency>
             <dependency>
