GEODE-5212: Convert ExportLogsIntegrationTest to DistributedTest (apache#2155)

  Due to differences on how defaultDirectory is initialized between
  Windows and Unix, this test fails if its integration test.
  So converted it to be a DistributedTest.

Signed-off-by: Jens Deppe <[email protected]>

Author: sboorlagadda

geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsDUnitTest.java

@@ -19,6 +19,7 @@
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toSet;
+import static org.apache.commons.io.FileUtils.listFiles;
 import static org.apache.geode.management.internal.cli.commands.ExportLogsCommand.FORMAT;
 import static org.apache.geode.management.internal.cli.commands.ExportLogsCommand.ONLY_DATE_FORMAT;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -27,6 +28,7 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.nio.charset.Charset;
+import java.nio.file.Path;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
@@ -41,10 +43,12 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.logging.log4j.Logger;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.junit.rules.TemporaryFolder;
 
 import org.apache.geode.cache.Cache;
 import org.apache.geode.distributed.ConfigurationProperties;
@@ -70,12 +74,18 @@ public class ExportLogsDUnitTest {
   @Rule
   public GfshCommandRule gfshConnector = new GfshCommandRule();
 
-  private MemberVM locator;
+  @Rule
+  public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+  protected MemberVM locator;
   private MemberVM server1;
   private MemberVM server2;
 
   private Map<MemberVM, List<LogLine>> expectedMessages;
 
+  public File getWorkingDirectory() throws Exception {
+    return locator.getWorkingDir();
+  }
 
   @Before
   public void setup() throws Exception {
@@ -103,9 +113,53 @@ public void setup() throws Exception {
       });
     }
 
+    connect();
+  }
+
+  public void connect() throws Exception {
     gfshConnector.connectAndVerify(locator);
   }
 
+  @After
+  public void after() throws Exception {
+    Stream.of(getWorkingDirectory().listFiles())
+        .filter(f -> f.getName().endsWith(".zip")).forEach(file -> file.delete());
+  }
+
+  @Test
+  public void withFiles_savedToLocatorWorkingDir() throws Exception {
+    String[] extensions = {"zip"};
+    // Expects locator to produce file in own working directory when connected via JMX
+    gfshConnector.executeCommand("export logs");
+    assertThat(listFiles(getWorkingDirectory(), extensions, false)).isNotEmpty();
+  }
+
+  @Test
+  public void withFiles_savedToLocatorSpecifiedRelativeDir() throws Exception {
+    String[] extensions = {"zip"};
+    Path workingDirPath = getWorkingDirectory().toPath();
+    Path subdirPath = workingDirPath.resolve("some").resolve("test").resolve("directory");
+    Path relativeDir = workingDirPath.relativize(subdirPath);
+    // Expects locator to produce file in own working directory when connected via JMX
+    gfshConnector.executeCommand("export logs --dir=" + relativeDir.toString());
+    assertThat(listFiles(getWorkingDirectory(), extensions, false)).isEmpty();
+    assertThat(listFiles(getWorkingDirectory(), extensions, true)).isNotEmpty();
+    assertThat(listFiles(subdirPath.toFile(), extensions, false)).isNotEmpty();
+  }
+
+  @Test
+  public void withFiles_savedToLocatorSpecifiedAbsoluteDir() throws Exception {
+    String[] extensions = {"zip"};
+    Path workingDirPath = getWorkingDirectory().toPath();
+    Path absoluteDirPath =
+        workingDirPath.resolve("some").resolve("test").resolve("directory").toAbsolutePath();
+    // Expects locator to produce file in own working directory when connected via JMX
+    gfshConnector.executeCommand("export logs --dir=" + absoluteDirPath.toString());
+    assertThat(listFiles(getWorkingDirectory(), extensions, false)).isEmpty();
+    assertThat(listFiles(getWorkingDirectory(), extensions, true)).isNotEmpty();
+    assertThat(listFiles(absoluteDirPath.toFile(), extensions, false)).isNotEmpty();
+  }
+
   @Test
   public void startAndEndDateCanIncludeLogs() throws Exception {
     ZonedDateTime now = LocalDateTime.now().atZone(ZoneId.systemDefault());
@@ -219,7 +273,7 @@ public void exportLogsRegionIsCleanedUpProperly() throws IOException, ClassNotFo
   }
 
 
-  private void verifyZipFileContents(Set<String> acceptedLogLevels) throws IOException {
+  private void verifyZipFileContents(Set<String> acceptedLogLevels) throws Exception {
     File unzippedLogFileDir = unzipExportedLogs();
 
     Set<File> dirsFromZipFile =
@@ -270,19 +324,19 @@ private void verifyLogFileContents(Set<String> acceptedLogLevels, File dirForMem
 
   }
 
-  private File unzipExportedLogs() throws IOException {
-    File locatorWorkingDir = locator.getWorkingDir();
-    List<File> filesInDir = Stream.of(locatorWorkingDir.listFiles()).collect(toList());
+  private File unzipExportedLogs() throws Exception {
+    File locatorWorkingDir = getWorkingDirectory();
+    List<File> filesInDir = Stream.of(getWorkingDirectory().listFiles()).collect(toList());
     assertThat(filesInDir).isNotEmpty();
 
 
-    List<File> zipFilesInDir = Stream.of(locatorWorkingDir.listFiles())
+    List<File> zipFilesInDir = Stream.of(getWorkingDirectory().listFiles())
         .filter(f -> f.getName().endsWith(".zip")).collect(toList());
     assertThat(zipFilesInDir)
         .describedAs(filesInDir.stream().map(File::getAbsolutePath).collect(joining(",")))
         .hasSize(1);
 
-    File unzippedLogFileDir = new File(locatorWorkingDir, "unzippedLogs");
+    File unzippedLogFileDir = temporaryFolder.newFolder("unzippedLogs");
     ZipUtils.unzip(zipFilesInDir.get(0).getCanonicalPath(), unzippedLogFileDir.getCanonicalPath());
     return unzippedLogFileDir;
   }

geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsIntegrationTest.java

@@ -23,11 +23,13 @@
 import org.apache.geode.test.junit.rules.GfshCommandRule;
 
 @Category({GfshTest.class})
-public class ExportLogsOverHttpIntegrationTest extends ExportLogsIntegrationTest {
+public class ExportLogsOverHttpDistributedTest extends ExportLogsDUnitTest {
 
   @Override
   public void connect() throws Exception {
-    gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
+    if (!gfshConnector.isConnected()) {
+      gfshConnector.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
+    }
   }
 
   public File getWorkingDirectory() throws Exception {