[geode] 04/05: GEODE-6183: Cleanup and rename DistributedSystemIntegrationTest

[kl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

klund pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git

commit c6f0b1a5b563d54f3bfd5d9c6f2588be8409ceec
Author: Kirk Lund <kl...@apache.org>
AuthorDate: Thu May 30 13:27:54 2019 -0700

    GEODE-6183: Cleanup and rename DistributedSystemIntegrationTest
    
    * Fixup IDE warnings
    * Reformat test code
---
 .../DistributedSystemIntegrationJUnitTest.java     | 94 ---------------------
 .../DistributedSystemIntegrationTest.java          | 95 ++++++++++++++++++++++
 2 files changed, 95 insertions(+), 94 deletions(-)

diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/DistributedSystemIntegrationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/DistributedSystemIntegrationJUnitTest.java
deleted file mode 100755
index 5c27045..0000000
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/DistributedSystemIntegrationJUnitTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.geode.distributed;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.net.URL;
-import java.util.Properties;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TemporaryFolder;
-import org.junit.rules.TestName;
-
-import org.apache.geode.test.junit.categories.MembershipTest;
-
-/**
- * Integration tests for DistributedSystem class. These tests require file system I/O.
- */
-@Category({MembershipTest.class})
-public class DistributedSystemIntegrationJUnitTest {
-
-  @Rule
-  public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
-
-  @Rule
-  public final TemporaryFolder temporaryFolder = new TemporaryFolder();
-
-  @Rule
-  public final TestName testName = new TestName();
-
-  @Test
-  public void getPropertiesFileShouldUsePathInSystemProperty() throws Exception {
-    File propertiesFile = this.temporaryFolder.newFile("test.properties");
-    System.setProperty(DistributedSystem.PROPERTIES_FILE_PROPERTY,
-        propertiesFile.getCanonicalPath());
-    Properties properties = new Properties();
-    properties.store(new FileWriter(propertiesFile, false), this.testName.getMethodName());
-
-    assertThat(DistributedSystem.getPropertiesFile()).isEqualTo(propertiesFile.getCanonicalPath());
-  }
-
-  @Test
-  public void getPropertiesFileUrlShouldUsePathInSystemProperty() throws Exception {
-    File propertiesFile = this.temporaryFolder.newFile("test.properties");
-    System.setProperty(DistributedSystem.PROPERTIES_FILE_PROPERTY,
-        propertiesFile.getCanonicalPath());
-    Properties properties = new Properties();
-    properties.store(new FileWriter(propertiesFile, false), this.testName.getMethodName());
-
-    URL propertiesURL = propertiesFile.getCanonicalFile().toURI().toURL();
-    assertThat(DistributedSystem.getPropertiesFileURL()).isEqualTo(propertiesURL);
-  }
-
-  @Test
-  public void getSecurityPropertiesFileShouldUsePathInSystemProperty() throws Exception {
-    File propertiesFile = this.temporaryFolder.newFile("testsecurity.properties");
-    System.setProperty(DistributedSystem.SECURITY_PROPERTIES_FILE_PROPERTY,
-        propertiesFile.getCanonicalPath());
-    Properties properties = new Properties();
-    properties.store(new FileWriter(propertiesFile, false), this.testName.getMethodName());
-
-    assertThat(DistributedSystem.getSecurityPropertiesFile())
-        .isEqualTo(propertiesFile.getCanonicalPath());
-  }
-
-  @Test
-  public void getSecurityPropertiesFileUrlShouldUsePathInSystemProperty() throws Exception {
-    File propertiesFile = this.temporaryFolder.newFile("testsecurity.properties");
-    System.setProperty(DistributedSystem.SECURITY_PROPERTIES_FILE_PROPERTY,
-        propertiesFile.getCanonicalPath());
-    Properties properties = new Properties();
-    properties.store(new FileWriter(propertiesFile, false), this.testName.getMethodName());
-
-    URL propertiesURL = propertiesFile.getCanonicalFile().toURI().toURL();
-    assertThat(DistributedSystem.getSecurityPropertiesFileURL()).isEqualTo(propertiesURL);
-  }
-}
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/DistributedSystemIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/DistributedSystemIntegrationTest.java
new file mode 100755
index 0000000..8075cb5
--- /dev/null
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/DistributedSystemIntegrationTest.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.distributed;
+
+import static org.apache.geode.distributed.DistributedSystem.PROPERTIES_FILE_PROPERTY;
+import static org.apache.geode.distributed.DistributedSystem.SECURITY_PROPERTIES_FILE_PROPERTY;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.net.URL;
+import java.util.Properties;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.contrib.java.lang.system.RestoreSystemProperties;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TemporaryFolder;
+import org.junit.rules.TestName;
+
+import org.apache.geode.test.junit.categories.MembershipTest;
+
+/**
+ * Integration tests for DistributedSystem class. These tests require file system I/O.
+ */
+@Category(MembershipTest.class)
+public class DistributedSystemIntegrationTest {
+
+  @Rule
+  public RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
+
+  @Rule
+  public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+  @Rule
+  public TestName testName = new TestName();
+
+  @Test
+  public void getPropertiesFileShouldUsePathInSystemProperty() throws Exception {
+    File propertiesFile = temporaryFolder.newFile("test.properties");
+    System.setProperty(PROPERTIES_FILE_PROPERTY, propertiesFile.getCanonicalPath());
+    new Properties().store(new FileWriter(propertiesFile, false), testName.getMethodName());
+
+    String value = DistributedSystem.getPropertiesFile();
+
+    assertThat(value).isEqualTo(propertiesFile.getCanonicalPath());
+  }
+
+  @Test
+  public void getPropertiesFileUrlShouldUsePathInSystemProperty() throws Exception {
+    File propertiesFile = temporaryFolder.newFile("test.properties");
+    System.setProperty(PROPERTIES_FILE_PROPERTY, propertiesFile.getCanonicalPath());
+    new Properties().store(new FileWriter(propertiesFile, false), testName.getMethodName());
+    URL expectedPropertiesURL = propertiesFile.getCanonicalFile().toURI().toURL();
+
+    URL value = DistributedSystem.getPropertiesFileURL();
+
+    assertThat(value).isEqualTo(expectedPropertiesURL);
+  }
+
+  @Test
+  public void getSecurityPropertiesFileShouldUsePathInSystemProperty() throws Exception {
+    File propertiesFile = temporaryFolder.newFile("testsecurity.properties");
+    System.setProperty(SECURITY_PROPERTIES_FILE_PROPERTY, propertiesFile.getCanonicalPath());
+    new Properties().store(new FileWriter(propertiesFile, false), testName.getMethodName());
+
+    String value = DistributedSystem.getSecurityPropertiesFile();
+
+    assertThat(value).isEqualTo(propertiesFile.getCanonicalPath());
+  }
+
+  @Test
+  public void getSecurityPropertiesFileUrlShouldUsePathInSystemProperty() throws Exception {
+    File propertiesFile = temporaryFolder.newFile("testsecurity.properties");
+    System.setProperty(SECURITY_PROPERTIES_FILE_PROPERTY, propertiesFile.getCanonicalPath());
+    new Properties().store(new FileWriter(propertiesFile, false), testName.getMethodName());
+    URL expectedPropertiesURL = propertiesFile.getCanonicalFile().toURI().toURL();
+
+    URL value = DistributedSystem.getSecurityPropertiesFileURL();
+
+    assertThat(value).isEqualTo(expectedPropertiesURL);
+  }
+}