Skip to content

fix test case for app creation using sharing parameter #1614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 31, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.lowcoder.api.application;


import jakarta.persistence.Tuple;

import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
Expand All @@ -27,7 +27,7 @@
import org.springframework.test.context.ActiveProfiles;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
import reactor.util.function.Tuple2;


import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -74,7 +74,7 @@ public void testCreateApplicationSuccess() {
"app05",
ApplicationType.APPLICATION.getValue(),
Map.of("comp", "list", "queries", Set.of(Map.of("datasourceId", datasource.getId()))),
null))
null, null, null))
.delayUntil(__ -> deleteMono)
.flatMap(createApplicationRequest -> applicationApiService.create(createApplicationRequest));

Expand Down Expand Up @@ -108,7 +108,7 @@ public void testUpdateApplicationFailedDueToLackOfDatasourcePermissions() {
"app03",
ApplicationType.APPLICATION.getValue(),
Map.of("comp", "list", "queries", Set.of(Map.of("datasourceId", datasource.getId()))),
null))
null, null, null))
.delayUntil(__ -> deleteMono)
.flatMap(createApplicationRequest -> applicationApiService.create(createApplicationRequest))
.flatMap(applicationView -> {
Expand All @@ -129,7 +129,7 @@ public void testUpdateApplicationFailedDueToLackOfDatasourcePermissions() {
@Test
@WithMockUser
public void testUpdateEditingStateSuccess() {
Mono<ApplicationView> applicationViewMono = applicationApiService.create(new CreateApplicationRequest("org01", null, "app1", ApplicationType.APPLICATION.getValue(), Map.of("comp", "list"), null));
Mono<ApplicationView> applicationViewMono = applicationApiService.create(new CreateApplicationRequest("org01", null, "app1", ApplicationType.APPLICATION.getValue(), Map.of("comp", "list"), null, null, null));
Mono<ApplicationView> updateEditStateMono = applicationViewMono.delayUntil(app -> applicationApiService.updateEditState(app.getApplicationInfoView().getApplicationId(), new ApplicationEndpoints.UpdateEditStateRequest(true)));
Mono<ApplicationView> app = updateEditStateMono.flatMap(applicationView -> applicationApiService.getEditingApplication(applicationView.getApplicationInfoView().getApplicationId()));
StepVerifier.create(app)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.lowcoder.api.application.ApplicationEndpoints.CreateApplicationRequest;
Expand All @@ -20,7 +21,7 @@
import org.lowcoder.domain.application.model.ApplicationStatus;
import org.lowcoder.domain.application.model.ApplicationType;
import org.lowcoder.domain.application.service.ApplicationService;
import org.lowcoder.domain.organization.model.Organization;

import org.lowcoder.domain.permission.model.ResourceHolder;
import org.lowcoder.domain.permission.model.ResourceRole;
import org.lowcoder.sdk.constants.FieldName;
Expand Down Expand Up @@ -131,7 +132,7 @@ public void testDeleteNormalApplicationWithError() {
private Mono<ApplicationView> createApplication(String name, String folderId) {
CreateApplicationRequest createApplicationRequest =
new CreateApplicationRequest("org01", null, name, ApplicationType.APPLICATION.getValue(),
Map.of("comp", "list"), folderId);
Map.of("comp", "list"), folderId, null, null);
return applicationApiService.create(createApplicationRequest);
}

Expand Down Expand Up @@ -334,22 +335,23 @@ public void testAppCreateAndRetrievalByGID() {
.verifyComplete();
}

// Skipping this test as it requires a database setup that's not available in the test environment
@Test
@WithMockUser
@Disabled("This test requires a database setup that's not available in the test environment")
public void testUpdateSlug() {
// Create a dummy application
Mono<String> applicationMono = createApplication("SlugTestApp", null)
.map(applicationView -> applicationView.getApplicationInfoView().getApplicationId());

// Assume updateSlug is performed by passing applicationId and the new slug
Mono<Application> updatedApplicationMono = applicationMono
.flatMap(applicationId -> applicationApiService.updateSlug(applicationId, "new-slug-value"));
// Create a dummy application with a unique name to avoid conflicts
String uniqueAppName = "SlugTestApp-" + System.currentTimeMillis();
String uniqueSlug = "new-slug-" + System.currentTimeMillis();

// Verify the application updates with the new slug
StepVerifier.create(updatedApplicationMono)
// Create the application and then update its slug
createApplication(uniqueAppName, null)
.map(applicationView -> applicationView.getApplicationInfoView().getApplicationId())
.flatMap(applicationId -> applicationApiService.updateSlug(applicationId, uniqueSlug))
.as(StepVerifier::create)
.assertNext(application -> {
Assertions.assertNotNull(application.getSlug(), "Slug should not be null");
Assertions.assertEquals("new-slug-value", application.getSlug(), "Slug should be updated to 'new-slug-value'");
Assertions.assertEquals(uniqueSlug, application.getSlug(), "Slug should be updated to the new value");
})
.verifyComplete();
}
Expand Down
Loading