Skip to content

Make ConfigsExportServiceTest support windows #4765

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

Merged
kezhenxu94 merged 2 commits into from
Mar 3, 2023
Merged

Make ConfigsExportServiceTest support windows #4765

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db4bcad
Make ConfigsExportServiceTest support windows
Mar 2, 2023
362a5b8
fix
Mar 3, 2023
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
13 changes: 6 additions & 7 deletions ...tal/src/test/java/com/ctrip/framework/apollo/portal/service/ConfigsExportServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;

import org.assertj.core.util.Files;
import org.assertj.core.util.Lists;
import org.junit.Test;
import org.mockito.InjectMocks;
Expand Down Expand Up @@ -82,11 +83,9 @@ public class ConfigsExportServiceTest extends AbstractUnitTest {

@Test
public void testNamespaceExportImport() throws FileNotFoundException {
String filePath = "/tmp/apollo.zip";
File file = new File(filePath);
if (file.exists()) {
file.delete();
}
File temporaryFolder = Files.newTemporaryFolder();
temporaryFolder.deleteOnExit();
String filePath = temporaryFolder + File.separator + "export.zip";

//export config
UserInfo userInfo = genUser();
Expand Down Expand Up @@ -152,7 +151,7 @@ public void testNamespaceExportImport() throws FileNotFoundException {
when(namespaceService.findNamespaceBOs(appId2, Env.DEV, clusterName1, false)).thenReturn(app2Cluster1Namespace);
when(namespaceService.findNamespaceBOs(appId2, Env.DEV, clusterName2, false)).thenReturn(app2Cluster2Namespace);

FileOutputStream fileOutputStream = new FileOutputStream("/tmp/apollo.zip");
FileOutputStream fileOutputStream = new FileOutputStream(filePath);

configsExportService.exportData(fileOutputStream, Lists.newArrayList(Env.DEV));

Expand All @@ -171,7 +170,7 @@ public void testNamespaceExportImport() throws FileNotFoundException {
HttpStatusCodeException itemNotFoundException = new HttpClientErrorException(HttpStatus.NOT_FOUND);
when(itemService.loadItem(any(), any(), any(), any(), anyString())).thenThrow(itemNotFoundException);

FileInputStream fileInputStream = new FileInputStream("/tmp/apollo.zip");
FileInputStream fileInputStream = new FileInputStream(filePath);
ZipInputStream zipInputStream = new ZipInputStream(fileInputStream);

try {
Expand Down