Merge pull request #162 from zacharygoodwin/PROC-1479

PROC-1479: Add force logging field

proctor-common/src/main/java/com/indeed/proctor/common/model/ConsumableTestDefinition.java

@@ -36,6 +36,7 @@ public class ConsumableTestDefinition {
  private boolean evaluateForIncognitoUsers = false;
  private boolean enableUnitlessAllocations = false;
  private boolean containsUnitlessAllocation = false;
+ private boolean forceLogging = false;
 
  public ConsumableTestDefinition() {
  /* intentionally empty */
@@ -139,7 +140,8 @@ private ConsumableTestDefinition(
  @Nullable final TestDependency dependsOn,
  final boolean evaluateForIncognitoUsers,
  final boolean enableUnitlessAllocations,
- final boolean containsUnitlessAllocation) {
+ final boolean containsUnitlessAllocation,
+ final boolean forceLogging) {
  this.constants = constants;
  this.version = version;
  this.salt = salt;
@@ -154,6 +156,7 @@ private ConsumableTestDefinition(
  this.evaluateForIncognitoUsers = evaluateForIncognitoUsers;
  this.enableUnitlessAllocations = enableUnitlessAllocations;
  this.containsUnitlessAllocation = containsUnitlessAllocation;
+ this.forceLogging = forceLogging;
  }
 
  @Nonnull
@@ -287,6 +290,14 @@ public void setContainsUnitlessAllocation(final boolean containsUnitlessAllocati
  this.containsUnitlessAllocation = containsUnitlessAllocation;
  }
 
+ public boolean getForceLogging() {
+ return forceLogging;
+ }
+
+ public void setForceLogging(final boolean forceLogging) {
+ this.forceLogging = forceLogging;
+ }
+
  @Nonnull
  public static ConsumableTestDefinition fromTestDefinition(@Nonnull final TestDefinition td) {
  final Map<String, Object> specialConstants = td.getSpecialConstants();
@@ -342,6 +353,7 @@ public static ConsumableTestDefinition fromTestDefinition(@Nonnull final TestDef
  td.getDependsOn(),
  td.getEvaluateForIncognitoUsers(),
  td.getEnableUnitlessAllocations(),
- containsUnitlessAllocation);
+ containsUnitlessAllocation,
+ td.getForceLogging());
  }
 }

proctor-common/src/main/java/com/indeed/proctor/common/model/TestDefinition.java

@@ -55,6 +55,8 @@ public class TestDefinition {
 
  private boolean enableUnitlessAllocations;
 
+ private boolean forceLogging;
+
  public TestDefinition() {
  /* intentionally empty */
  }
@@ -138,6 +140,7 @@ public TestDefinition(
  this.description = description;
  this.metaTags = metaTags;
  this.evaluateForIncognitoUsers = false;
+ this.forceLogging = false;
  }
 
  public TestDefinition(@Nonnull final TestDefinition other) {
@@ -159,6 +162,7 @@ private TestDefinition(@Nonnull final Builder builder) {
  dependsOn = builder.dependsOn;
  evaluateForIncognitoUsers = builder.evaluateForIncognitoUsers;
  enableUnitlessAllocations = builder.enableUnitlessAllocations;
+ forceLogging = builder.forceLogging;
  }
 
  public static Builder builder() {
@@ -324,6 +328,10 @@ public boolean getEnableUnitlessAllocations() {
  return enableUnitlessAllocations;
  }
 
+ public boolean getForceLogging() {
+ return forceLogging;
+ }
+
  @Override
  public String toString() {
  return "TestDefinition{"
@@ -359,6 +367,8 @@ public String toString() {
  + evaluateForIncognitoUsers
  + ", enableUnitlessAllocations="
  + enableUnitlessAllocations
+ + ", forceLogging="
+ + forceLogging
  + '}';
  }
 
@@ -392,7 +402,8 @@ public int hashCode() {
  metaTags,
  dependsOn,
  evaluateForIncognitoUsers,
- enableUnitlessAllocations);
+ enableUnitlessAllocations,
+ forceLogging);
  }
 
  /**
@@ -424,7 +435,8 @@ && bucketListEqual(buckets, that.buckets)
  && Objects.equals(metaTags, that.metaTags)
  && Objects.equals(dependsOn, that.dependsOn)
  && Objects.equals(evaluateForIncognitoUsers, that.evaluateForIncognitoUsers)
- && Objects.equals(enableUnitlessAllocations, that.enableUnitlessAllocations);
+ && Objects.equals(enableUnitlessAllocations, that.enableUnitlessAllocations)
+ && Objects.equals(forceLogging, that.forceLogging);
  }
 
  @VisibleForTesting
@@ -465,6 +477,7 @@ public static class Builder {
  private TestDependency dependsOn;
  private boolean evaluateForIncognitoUsers;
  private boolean enableUnitlessAllocations;
+ private boolean forceLogging;
 
  public Builder from(@Nonnull final TestDefinition other) {
  setVersion(other.version);
@@ -481,6 +494,7 @@ public Builder from(@Nonnull final TestDefinition other) {
  setDependsOn(other.dependsOn);
  setEvaluateForIncognitoUsers(other.evaluateForIncognitoUsers);
  setEnableUnitlessAllocations(other.enableUnitlessAllocations);
+ setForceLogging(other.forceLogging);
  return this;
  }
 
@@ -589,6 +603,11 @@ public Builder setEnableUnitlessAllocations(final boolean enableUnitlessAllocati
  return this;
  }
 
+ public Builder setForceLogging(final boolean forceLogging) {
+ this.forceLogging = forceLogging;
+ return this;
+ }
+
  public TestDefinition build() {
  return new TestDefinition(this);
  }

proctor-common/src/test/java/com/indeed/proctor/common/model/TestTestDefinition.java

@@ -274,6 +274,7 @@ public void testBuilder() {
  .setMetaTags(metatags)
  .setDependsOn(dependsOn)
  .setEvaluateForIncognitoUsers(incognito)
+ .setForceLogging(true)
  .build();
 
  final TestDefinition definition2 = TestDefinition.builder().from(definition1).build();
@@ -292,6 +293,7 @@ public void testBuilder() {
  assertThat(definition.getMetaTags()).isEqualTo(metatags);
  assertThat(definition.getDependsOn()).isEqualTo(dependsOn);
  assertThat(definition.getEvaluateForIncognitoUsers()).isEqualTo(incognito);
+ assertThat(definition.getEvaluateForIncognitoUsers()).isEqualTo(true);
  }
  }
 }