Skip to content
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.

Sign up for GitHub

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

chore: Fixed flaky test in partial export service #30000

Merged
merged 1 commit into from
Jan 3, 2024
Merged

chore: Fixed flaky test in partial export service #30000

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 21 additions & 24 deletions .../appsmith-server/src/test/java/com/appsmith/server/services/PartialExportServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@
import com.appsmith.external.models.DBAuth;
import com.appsmith.external.models.Datasource;
import com.appsmith.external.models.DatasourceConfiguration;
import com.appsmith.external.models.DatasourceStorage;
import com.appsmith.external.models.DatasourceStorageDTO;
import com.appsmith.external.models.DefaultResources;
import com.appsmith.external.models.Property;
import com.appsmith.server.applications.base.ApplicationService;
import com.appsmith.server.datasources.base.DatasourceService;
import com.appsmith.server.domains.Application;
import com.appsmith.server.domains.GitApplicationMetadata;
import com.appsmith.server.domains.NewAction;
import com.appsmith.server.domains.Plugin;
import com.appsmith.server.domains.User;
import com.appsmith.server.domains.Workspace;
Expand Down Expand Up @@ -206,9 +208,6 @@ public void setup() {
datasourceMap.put("DS1", ds1);
datasourceMap.put("DS2", ds2);
isSetupDone = true;

Mockito.when(pluginService.findAllByIdsWithoutPermission(Mockito.any(), Mockito.anyList()))
.thenReturn(Flux.fromIterable(List.of(installedPlugin, installedJsPlugin)));
}

private Application createGitConnectedApp(String applicationName) {
Expand Down Expand Up @@ -237,6 +236,9 @@ private Application createGitConnectedApp(String applicationName) {
@Test
@WithUserDetails(value = "api_user")
void testGetPartialExport_nonGitConnectedApp_success() {
Mockito.when(pluginService.findAllByIdsWithoutPermission(Mockito.any(), Mockito.anyList()))
.thenReturn(Flux.fromIterable(List.of(installedPlugin, installedJsPlugin)));

// Create an application with all resources
Application testApplication = new Application();
testApplication.setName("testGetPartialExport_nonGitConnectedApp_success");
Expand All @@ -263,10 +265,10 @@ void testGetPartialExport_nonGitConnectedApp_success() {
StepVerifier.create(partialExportFileDTOMono)
.assertNext(applicationJson -> {
assertThat(applicationJson.getDatasourceList().size()).isEqualTo(2);
assertThat(applicationJson.getDatasourceList().get(0).getName())
.isEqualTo("DS1");
assertThat(applicationJson.getDatasourceList().get(1).getName())
.isEqualTo("DS2");
List<String> dsNames = applicationJson.getDatasourceList().stream()
.map(DatasourceStorage::getName)
.toList();
assertThat(dsNames).containsAll(List.of("DS1", "DS2"));
assertThat(applicationJson.getDatasourceList().get(0).getPluginId())
.isEqualTo("installed-plugin");
assertThat(applicationJson.getDatasourceList().get(1).getPluginId())
Expand All @@ -278,6 +280,9 @@ void testGetPartialExport_nonGitConnectedApp_success() {
@Test
@WithUserDetails(value = "api_user")
public void testGetPartialExport_gitConnectedApp_branchResourceExported() {
Mockito.when(pluginService.findAllByIdsWithoutPermission(Mockito.any(), Mockito.anyList()))
.thenReturn(Flux.fromIterable(List.of(installedPlugin, installedJsPlugin)));

Application application = createGitConnectedApp("testGetPartialExport_gitConnectedApp_branchResourceExported");

// update git branch name for page
Expand Down Expand Up @@ -318,28 +323,20 @@ public void testGetPartialExport_gitConnectedApp_branchResourceExported() {
StepVerifier.create(partialExportFileDTOMono)
.assertNext(applicationJson -> {
assertThat(applicationJson.getDatasourceList().size()).isEqualTo(2);
assertThat(applicationJson.getDatasourceList().get(0).getName())
.isEqualTo("DS1");
assertThat(applicationJson.getDatasourceList().get(1).getName())
.isEqualTo("DS2");
List<String> dsNames = applicationJson.getDatasourceList().stream()
.map(DatasourceStorage::getName)
.toList();
assertThat(dsNames).containsAll(List.of("DS1", "DS2"));
assertThat(applicationJson.getDatasourceList().get(0).getPluginId())
.isEqualTo("installed-plugin");
assertThat(applicationJson.getDatasourceList().get(1).getPluginId())
.isEqualTo("installed-plugin");
assertThat(applicationJson.getActionList().size()).isEqualTo(1);
assertThat(applicationJson
.getActionList()
.get(0)
.getUnpublishedAction()
.getName())
.isEqualTo("validAction");
assertThat(applicationJson
.getActionList()
.get(0)
.getUnpublishedAction()
.getPageId())
.isEqualTo("Page 2");
assertThat(applicationJson.getActionList().get(0).getId()).isEqualTo("Page 2_validAction");

NewAction newAction = applicationJson.getActionList().get(0);
assertThat(newAction.getUnpublishedAction().getName()).isEqualTo("validAction");
assertThat(newAction.getUnpublishedAction().getPageId()).isEqualTo("Page 2");
assertThat(newAction.getId()).isEqualTo("Page 2_validAction");
})
.verifyComplete();
}
Expand Down
Loading