[geode] branch develop updated: GEODE-5641: add no-arg constructor to DiskDirRule

[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


The following commit(s) were added to refs/heads/develop by this push:
     new ebe44c2  GEODE-5641: add no-arg constructor to DiskDirRule
ebe44c2 is described below

commit ebe44c22d30774a916beca33c2316289a44ca3c5
Author: Kirk Lund <kl...@apache.org>
AuthorDate: Mon Aug 27 10:31:22 2018 -0700

    GEODE-5641: add no-arg constructor to DiskDirRule
    
    To redirect default disk store to a TemporaryFolder, you can simply
    add this to any test:
    
    @Rule
    public DiskDirRule diskDirRule = new DiskDirRule();
    
    Or in a DistributedTest use:
    
    @Rule
    public DistributedDiskDirRule diskDirRule = new DistributedDiskDirRule();
---
 .../test/dunit/rules/DistributedDiskDirRule.java   | 29 +++++++++-------------
 .../apache/geode/test/junit/rules/DiskDirRule.java | 23 +++++------------
 2 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/geode-dunit/src/main/java/org/apache/geode/test/dunit/rules/DistributedDiskDirRule.java b/geode-dunit/src/main/java/org/apache/geode/test/dunit/rules/DistributedDiskDirRule.java
index 3425fdd..f4cbd03 100644
--- a/geode-dunit/src/main/java/org/apache/geode/test/dunit/rules/DistributedDiskDirRule.java
+++ b/geode-dunit/src/main/java/org/apache/geode/test/dunit/rules/DistributedDiskDirRule.java
@@ -109,13 +109,19 @@ public class DistributedDiskDirRule extends DiskDirRule implements SerializableT
   }
 
   public DistributedDiskDirRule(Builder builder) {
-    this(builder.fillIn(), new RemoteInvoker());
+    this(builder, new RemoteInvoker());
   }
 
   protected DistributedDiskDirRule(Builder builder, RemoteInvoker invoker) {
-    super(builder.initializeHelperRules, null, null);
-    temporaryFolder = builder.temporaryFolder;
-    testName = builder.testName;
+    this(builder.initializeHelperRules, builder.temporaryFolder, builder.testName, invoker);
+  }
+
+  protected DistributedDiskDirRule(boolean initializeHelperRules,
+      SerializableTemporaryFolder temporaryFolder, SerializableTestName testName,
+      RemoteInvoker invoker) {
+    super(initializeHelperRules, null, null);
+    this.temporaryFolder = temporaryFolder;
+    this.testName = testName;
     this.invoker = invoker;
   }
 
@@ -236,8 +242,8 @@ public class DistributedDiskDirRule extends DiskDirRule implements SerializableT
    */
   public static class Builder {
     private boolean initializeHelperRules = true;
-    private SerializableTemporaryFolder temporaryFolder;
-    private SerializableTestName testName;
+    private SerializableTemporaryFolder temporaryFolder = new SerializableTemporaryFolder();
+    private SerializableTestName testName = new SerializableTestName();
 
     public Builder() {
       // nothing
@@ -264,18 +270,7 @@ public class DistributedDiskDirRule extends DiskDirRule implements SerializableT
     }
 
     public DistributedDiskDirRule build() {
-      fillIn();
       return new DistributedDiskDirRule(this);
     }
-
-    private Builder fillIn() {
-      if (temporaryFolder == null) {
-        temporaryFolder = new SerializableTemporaryFolder();
-      }
-      if (testName == null) {
-        testName = new SerializableTestName();
-      }
-      return this;
-    }
   }
 }
diff --git a/geode-dunit/src/main/java/org/apache/geode/test/junit/rules/DiskDirRule.java b/geode-dunit/src/main/java/org/apache/geode/test/junit/rules/DiskDirRule.java
index bbeec89..85951ef 100644
--- a/geode-dunit/src/main/java/org/apache/geode/test/junit/rules/DiskDirRule.java
+++ b/geode-dunit/src/main/java/org/apache/geode/test/junit/rules/DiskDirRule.java
@@ -43,6 +43,10 @@ public class DiskDirRule extends DescribedExternalResource {
 
   private String originalValue;
 
+  public DiskDirRule() {
+    this(new Builder());
+  }
+
   public DiskDirRule(TemporaryFolder temporaryFolder) {
     this(new Builder().temporaryFolder(temporaryFolder));
   }
@@ -59,10 +63,6 @@ public class DiskDirRule extends DescribedExternalResource {
     this(builder.initializeHelperRules, builder.temporaryFolder, builder.testName);
   }
 
-  protected DiskDirRule() {
-    this(false, null, null);
-  }
-
   protected DiskDirRule(boolean initializeHelperRules, TemporaryFolder temporaryFolder,
       TestName testName) {
     this.initializeHelperRules = initializeHelperRules;
@@ -143,8 +143,8 @@ public class DiskDirRule extends DescribedExternalResource {
    */
   public static class Builder {
     private boolean initializeHelperRules = true;
-    private TemporaryFolder temporaryFolder;
-    private TestName testName;
+    private TemporaryFolder temporaryFolder = new TemporaryFolder();
+    private TestName testName = new TestName();
 
     public Builder() {
       // nothing
@@ -171,18 +171,7 @@ public class DiskDirRule extends DescribedExternalResource {
     }
 
     public DiskDirRule build() {
-      fillIn();
       return new DiskDirRule(this);
     }
-
-    private Builder fillIn() {
-      if (temporaryFolder == null) {
-        temporaryFolder = new TemporaryFolder();
-      }
-      if (testName == null) {
-        testName = new TestName();
-      }
-      return this;
-    }
   }
 }