Skip to content
This repository has been archived by the owner on Jul 10, 2024. It is now read-only.

Commit

Permalink
PROC-1525: Add unit tests for groups writer
Browse files Browse the repository at this point in the history
  • Loading branch information
@zacharygoodwin
zacharygoodwin committed Jun 18, 2024
1 parent c566c00 commit 6f573e2
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 6 deletions.
2 changes: 1 addition & 1 deletion proctor-consumer/src/main/java/com/indeed/proctor/consumer/ProctorGroupsWriter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ public ProctorGroupsWriter build() {
// Do not log payload experiments which were overwritten
if (consumableTestDefinition != null
&& consumableTestDefinition.getPayloadExperimentConfig() != null
&& proctorResult.getProperties().values().stream()
&& !proctorResult.getProperties().values().stream()
.map(PayloadProperty::getTestName)
.collect(Collectors.toSet())
.contains(testName)) {
Expand Down
71 changes: 66 additions & 5 deletions proctor-consumer/src/test/java/com/indeed/proctor/consumer/ProctorGroupsWriterTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
package com.indeed.proctor.consumer;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSortedMap;
import com.google.common.collect.Ordering;
import com.indeed.proctor.common.PayloadProperty;
import com.indeed.proctor.common.ProctorResult;
import com.indeed.proctor.common.model.Allocation;
import com.indeed.proctor.common.model.ConsumableTestDefinition;
import com.indeed.proctor.common.model.PayloadExperimentConfig;
import com.indeed.proctor.common.model.TestBucket;
import com.indeed.proctor.common.model.TestDefinition;
import com.indeed.proctor.common.model.TestType;
import com.indeed.proctor.consumer.logging.TestGroupFormatter;
import org.assertj.core.util.Strings;
import org.junit.Test;
Expand All @@ -25,6 +32,8 @@ public class ProctorGroupsWriterTest {
private static final String GROUP1_TEST_NAME = "d_foo_tst";
private static final String SILENT_TEST_NAME = "e_silent_tst";
private static final String FORCED_TEST_NAME = "f_forced_tst";
private static final String PAYLOAD_PROPERTY_TEST_NAME = "g_payload_tst";
private static final String WINNING_PAYLOAD_PROPERTY_TEST_NAME = "h_winning_payload_tst";

// for this test, buckets can be reused between test definitions, sorting by testname
public static final TestBucket INACTIVE_BUCKET = new TestBucket("fooname", -1, "foodesc");
Expand All @@ -46,6 +55,8 @@ public class ProctorGroupsWriterTest {
.put(GROUP1_TEST_NAME, GROUP1_BUCKET)
.put(SILENT_TEST_NAME, GROUP1_BUCKET)
.put(FORCED_TEST_NAME, GROUP1_BUCKET)
.put(WINNING_PAYLOAD_PROPERTY_TEST_NAME, GROUP1_BUCKET)
.put(PAYLOAD_PROPERTY_TEST_NAME, GROUP1_BUCKET)
.build();
private static final Map<String, Allocation> ALLOCATIONS =
new ImmutableSortedMap.Builder<String, Allocation>(Ordering.natural())
Expand All @@ -54,19 +65,65 @@ public class ProctorGroupsWriterTest {
.put(EMPTY_ALLOCID_DEFINITION_TEST_NAME, ALLOCATION_EMPTY_ID)
.put(GROUP1_TEST_NAME, ALLOCATION_A)
.put(SILENT_TEST_NAME, ALLOCATION_A)
.put(WINNING_PAYLOAD_PROPERTY_TEST_NAME, ALLOCATION_A)
.put(PAYLOAD_PROPERTY_TEST_NAME, ALLOCATION_A)
.build();

static final ConsumableTestDefinition PROPERTY_TD =
ConsumableTestDefinition.fromTestDefinition(
TestDefinition.builder()
.setTestType(TestType.RANDOM)
.setSalt("foo")
.setForceLogging(true)
.setPayloadExperimentConfig(
PayloadExperimentConfig.builder()
.priority("123")
.namespaces(ImmutableList.of("test"))
.build())
.build());
static final ConsumableTestDefinition WINNING_PROPERTY_TD =
ConsumableTestDefinition.fromTestDefinition(
TestDefinition.builder()
.setTestType(TestType.RANDOM)
.setSalt("foo")
.setForceLogging(true)
.setPayloadExperimentConfig(
PayloadExperimentConfig.builder()
.priority("20000")
.namespaces(ImmutableList.of("test"))
.build())
.build());

private static final Map<String, ConsumableTestDefinition> DEFINITIONS =
ImmutableMap.<String, ConsumableTestDefinition>builder()
.put(INACTIVE_TEST_NAME, stubDefinition(INACTIVE_BUCKET))
.put(EMPTY_ALLOCID_DEFINITION_TEST_NAME, stubDefinition(GROUP1_BUCKET))
.put(GROUP1_TEST_NAME, stubDefinition(GROUP1_BUCKET))
.put(SILENT_TEST_NAME, stubDefinition(GROUP1_BUCKET, d -> d.setSilent(true)))
.put(FORCED_TEST_NAME, stubDefinition(GROUP1_BUCKET))
.put(WINNING_PAYLOAD_PROPERTY_TEST_NAME, WINNING_PROPERTY_TD)
.put(PAYLOAD_PROPERTY_TEST_NAME, PROPERTY_TD)
.build();
private static final Map<String, PayloadProperty> PROPERTIES;

static {
try {
PROPERTIES =
ImmutableMap.<String, PayloadProperty>builder()
.put(
"foo",
PayloadProperty.builder()
.value(new ObjectMapper().readTree("1"))
.testName(WINNING_PAYLOAD_PROPERTY_TEST_NAME)
.build())
.build();
} catch (final JsonProcessingException e) {
throw new RuntimeException(e);
}
}

private static final ProctorResult PROCTOR_RESULT =
new ProctorResult(null, BUCKETS, ALLOCATIONS, DEFINITIONS);
new ProctorResult(null, BUCKETS, ALLOCATIONS, DEFINITIONS, PROPERTIES);

@Test
public void testWithEmptyResult() {
Expand All @@ -86,7 +143,7 @@ public void testWithEmptyResult() {
public void testDoubleFormattingWriter() {
// legacy Indeed behavior
final String expected =
"b_missing_definition0,c_empty_alloc_id0,d_foo_tst1,f_forced_tst1,#A:b_missing_definition0,#A:d_foo_tst1,f_forced_tst1";
"b_missing_definition0,c_empty_alloc_id0,d_foo_tst1,f_forced_tst1,h_winning_payload_tst1,#A:b_missing_definition0,#A:d_foo_tst1,f_forced_tst1,#A:h_winning_payload_tst1";

final ProctorGroupsWriter defaultWriter =
new ProctorGroupsWriter.Builder(
Expand All @@ -101,9 +158,11 @@ public void testDoubleFormattingWriter() {
EMPTY_ALLOCID_DEFINITION_TEST_NAME + 0,
GROUP1_TEST_NAME + 1,
FORCED_TEST_NAME + 1,
WINNING_PAYLOAD_PROPERTY_TEST_NAME + 1,
"#A:" + MISSING_DEFINITION_TEST_NAME + 0,
"#A:" + GROUP1_TEST_NAME + 1,
FORCED_TEST_NAME + 1)
FORCED_TEST_NAME + 1,
"#A:" + WINNING_PAYLOAD_PROPERTY_TEST_NAME + 1)
.with(","));
}

Expand All @@ -116,15 +175,17 @@ public void testCustomWriter() {
.setIncludeInactiveGroups(true)
.build();
assertThat(writerWithAllocIds.writeGroupsAsString(PROCTOR_RESULT))
.isEqualTo("#A:a_inactive_tst-1,#A:d_foo_tst1,#A:e_silent_tst1,f_forced_tst1");
.isEqualTo(
"#A:a_inactive_tst-1,#A:d_foo_tst1,#A:e_silent_tst1,f_forced_tst1,#A:h_winning_payload_tst1");

final ProctorGroupsWriter writerWithoutAllocIds =
new ProctorGroupsWriter.Builder(TestGroupFormatter.WITHOUT_ALLOC_ID)
.setIncludeSilentTests(true)
.setIncludeTestWithoutDefinition(false)
.build();
assertThat(writerWithoutAllocIds.writeGroupsAsString(PROCTOR_RESULT))
.isEqualTo("c_empty_alloc_id0,d_foo_tst1,e_silent_tst1,f_forced_tst1");
.isEqualTo(
"c_empty_alloc_id0,d_foo_tst1,e_silent_tst1,f_forced_tst1,h_winning_payload_tst1");
}

@Test
Expand Down

0 comments on commit 6f573e2

Please sign in to comment.