Skip to content

Commit 0828bd6

Browse files
committed
fix tests
1 parent a4a0d37 commit 0828bd6

File tree

2 files changed

+24
-17
lines changed

2 files changed

+24
-17
lines changed

src/main/java/com/arpnetworking/metrics/mad/sources/TransformingSource.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,11 @@ public Builder setReplaceExisting(final Boolean value) {
347347
}
348348
}
349349

350+
/**
351+
* Represents a set of transformations to apply.
352+
*
353+
* @author Brandon Arp (brandon dot arp at inscopemetrics dot com)
354+
*/
350355
public static final class TransformationSet {
351356
public ImmutableMap<Pattern, ImmutableList<String>> getFindAndReplace() {
352357
return _findAndReplace;

src/test/java/com/arpnetworking/metrics/mad/sources/TransformingSourceTest.java

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,16 @@ public class TransformingSourceTest {
4848
public void setUp() {
4949
_mockObserver = Mockito.mock(Observer.class);
5050
_mockSource = Mockito.mock(Source.class);
51+
_transformSetBuilder = new TransformingSource.TransformationSet.Builder()
52+
.setFindAndReplace(ImmutableMap.of(
53+
"foo/([^/]*)/bar", ImmutableList.of("foo/bar"),
54+
"cat/([^/]*)/dog", ImmutableList.of("cat/dog", "cat/dog/$1"),
55+
"tagged/([^/]*)/dog", ImmutableList.of("tagged/dog;animal=$1"),
56+
"named/(?<animal>[^/]*)", ImmutableList.of("named/extracted_animal;extracted=${animal}"),
57+
"tagged/([^/]*)/animal", ImmutableList.of("tagged/${animal}/animal")));
5158
_transformingSourceBuilder = new TransformingSource.Builder()
5259
.setName("TransformingSourceTest")
53-
.setTransformations(ImmutableList.of(
54-
new TransformingSource.TransformationSet.Builder()
55-
.setFindAndReplace(ImmutableMap.of(
56-
"foo/([^/]*)/bar", ImmutableList.of("foo/bar"),
57-
"cat/([^/]*)/dog", ImmutableList.of("cat/dog", "cat/dog/$1"),
58-
"tagged/([^/]*)/dog", ImmutableList.of("tagged/dog;animal=$1"),
59-
"named/(?<animal>[^/]*)", ImmutableList.of("named/extracted_animal;extracted=${animal}"),
60-
"tagged/([^/]*)/animal", ImmutableList.of("tagged/${animal}/animal")))
61-
.build()
62-
))
60+
.setTransformations(ImmutableList.of(_transformSetBuilder.build()))
6361
.setSource(_mockSource);
6462
}
6563

@@ -90,17 +88,19 @@ public void testToString() {
9088

9189
@Test
9290
public void testMergingObserverInvalidEvent() {
91+
final TransformingSource.TransformationSet transformationSet = new TransformingSource.TransformationSet.Builder()
92+
.setFindAndReplace(ImmutableMap.of())
93+
.build();
9394
final TransformingSource transformingSource = new TransformingSource.Builder()
9495
.setName("testMergingObserverInvalidEventTransformingSource")
9596
.setSource(_mockSource)
96-
.setFindAndReplace(ImmutableMap.of())
97+
.setTransformations(ImmutableList.of(
98+
transformationSet))
9799
.build();
98100
Mockito.reset(_mockSource);
99101
new TransformingSource.TransformingObserver(
100102
transformingSource,
101-
ImmutableMap.of(),
102-
ImmutableMap.of(),
103-
ImmutableList.of())
103+
ImmutableList.of(transformationSet))
104104
.notify(OBSERVABLE, "Not a Record");
105105
Mockito.verifyZeroInteractions(_mockSource);
106106
}
@@ -405,7 +405,7 @@ public void testMatchOverridesTagInCapture() {
405405

406406
@Test
407407
public void testStaticDimensionInjection() {
408-
_transformingSourceBuilder.setInject(ImmutableMap.of(
408+
_transformSetBuilder.setInject(ImmutableMap.of(
409409
"injected",
410410
new TransformingSource.DimensionInjection.Builder()
411411
.setValue("value")
@@ -453,7 +453,7 @@ public void testStaticDimensionInjection() {
453453

454454
@Test
455455
public void testStaticDimensionInjectionOverwrite() {
456-
_transformingSourceBuilder.setInject(ImmutableMap.of(
456+
_transformSetBuilder.setInject(ImmutableMap.of(
457457
"injected",
458458
new TransformingSource.DimensionInjection.Builder()
459459
.setValue("new_value")
@@ -509,7 +509,7 @@ public void testStaticDimensionInjectionOverwrite() {
509509

510510
@Test
511511
public void testRemoveDimension() {
512-
_transformingSourceBuilder.setRemove(ImmutableList.of("remove"));
512+
_transformSetBuilder.setRemove(ImmutableList.of("remove"));
513513
final Record matchingRecord = TestBeanFactory.createRecordBuilder()
514514
.setMetrics(ImmutableMap.of(
515515
"doesnt_match",
@@ -697,6 +697,7 @@ private void assertRecordsEqual(final Record actualRecord, final Record expected
697697
}
698698

699699
private Record mapRecord(final Record record) {
700+
_transformingSourceBuilder.setTransformations(ImmutableList.of(_transformSetBuilder.build()));
700701
final Source transformingSource = _transformingSourceBuilder.build();
701702
transformingSource.attach(_mockObserver);
702703
notify(_mockSource, record);
@@ -717,6 +718,7 @@ private static void notify(final Observable observable, final Object event) {
717718
private Observer _mockObserver;
718719
private Source _mockSource;
719720
private TransformingSource.Builder _transformingSourceBuilder;
721+
private TransformingSource.TransformationSet.Builder _transformSetBuilder;
720722

721723
private static final Observable OBSERVABLE = new Observable() {
722724
@Override

0 commit comments

Comments
 (0)