Skip to content

Commit 9621815

Browse files
vjkoskelavjkoskela
authored
Update equality tests of buildables to use Commons version and delete the MAD version of the test helper. (#202)
1 parent 9c23698 commit 9621815

File tree

8 files changed

+30
-117
lines changed

8 files changed

+30
-117
lines changed

‎src/main/java/com/arpnetworking/metrics/mad/model/AggregatedData.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public Statistic getStatistic() {
4040
return _statistic;
4141
}
4242

43-
public boolean isSpecified() {
43+
public boolean getIsSpecified() {
4444
return _isSpecified;
4545
}
4646

@@ -80,7 +80,7 @@ public int hashCode() {
8080
getStatistic(),
8181
getValue(),
8282
getPopulationSize(),
83-
isSpecified(),
83+
getIsSpecified(),
8484
getSupportingData());
8585
}
8686

@@ -105,7 +105,7 @@ public Object toLogValue() {
105105
.put("statistic", _statistic)
106106
.put("value", _value)
107107
.put("populationSize", _populationSize)
108-
.put("isSpecified", _isSpecified)
108+
.put("getIsSpecified", _isSpecified)
109109
.build();
110110
}
111111

@@ -206,7 +206,7 @@ public AggregatedData build() {
206206
throw new IllegalStateException("populationSize must not be null");
207207
}
208208
if (_isSpecified == null) {
209-
throw new IllegalStateException("isSpecified must not be null");
209+
throw new IllegalStateException("getIsSpecified must not be null");
210210
}
211211
return new AggregatedData(this);
212212
}

‎src/main/java/com/arpnetworking/tsdcore/model/PeriodicDataToProtoConverter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public Messages.StatisticSetRecord convert(
9393
.setStatistic(datum.getStatistic().getName())
9494
.setValue(datum.getValue().getValue())
9595
.setUnit(unit)
96-
.setUserSpecified(datum.isSpecified());
96+
.setUserSpecified(datum.getIsSpecified());
9797

9898
final ByteString supportingData = serializeSupportingData(datum);
9999
if (supportingData != null) {

‎src/test/java/com/arpnetworking/metrics/mad/model/AggregatedDataTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
package com.arpnetworking.metrics.mad.model;
1717

1818
import com.arpnetworking.commons.test.BuildableTestHelper;
19+
import com.arpnetworking.commons.test.EqualityTestHelper;
1920
import com.arpnetworking.commons.test.ThreadLocalBuildableTestHelper;
2021
import com.arpnetworking.metrics.mad.model.statistics.Statistic;
2122
import com.arpnetworking.metrics.mad.model.statistics.StatisticFactory;
2223
import com.arpnetworking.test.TestBeanFactory;
23-
import com.arpnetworking.utility.test.BuildableEqualsAndHashCodeTester;
2424
import org.junit.Assert;
2525
import org.junit.Test;
2626

@@ -58,15 +58,16 @@ public void testReset() throws Exception {
5858
}
5959

6060
@Test
61-
public void testEqualsAndHashCode() {
62-
BuildableEqualsAndHashCodeTester.assertEqualsAndHashCode(
61+
public void testEqualsAndHashCode() throws Exception {
62+
EqualityTestHelper.testEquality(
6363
_aggregatedDataBuilder.get(),
6464
new AggregatedData.Builder()
6565
.setStatistic(MEDIAN_STATISTIC)
6666
.setValue(TestBeanFactory.createSample())
6767
.setIsSpecified(false)
6868
.setPopulationSize(2L)
69-
.setSupportingData(new Object()));
69+
.setSupportingData(new Object()),
70+
AggregatedData.class);
7071
}
7172

7273
@Test

‎src/test/java/com/arpnetworking/metrics/mad/model/DefaultMetricTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
package com.arpnetworking.metrics.mad.model;
1717

1818
import com.arpnetworking.commons.test.BuildableTestHelper;
19+
import com.arpnetworking.commons.test.EqualityTestHelper;
1920
import com.arpnetworking.commons.test.ThreadLocalBuildableTestHelper;
2021
import com.arpnetworking.metrics.mad.model.statistics.Statistic;
2122
import com.arpnetworking.metrics.mad.model.statistics.StatisticFactory;
2223
import com.arpnetworking.test.TestBeanFactory;
23-
import com.arpnetworking.utility.test.BuildableEqualsAndHashCodeTester;
2424
import com.google.common.collect.ImmutableList;
2525
import com.google.common.collect.ImmutableMap;
2626
import org.junit.Assert;
@@ -60,15 +60,16 @@ public void testReset() throws Exception {
6060
}
6161

6262
@Test
63-
public void testEqualsAndHashCode() {
64-
BuildableEqualsAndHashCodeTester.assertEqualsAndHashCode(
63+
public void testEqualsAndHashCode() throws Exception {
64+
EqualityTestHelper.testEquality(
6565
_defaultMetricBuilder.get(),
6666
new DefaultMetric.Builder()
6767
.setType(MetricType.TIMER)
6868
.setValues(ImmutableList.of(TestBeanFactory.createSample()))
6969
.setStatistics(ImmutableMap.of(
7070
MEDIAN_STATISTIC,
71-
ImmutableList.of())));
71+
ImmutableList.of())),
72+
Metric.class);
7273
}
7374

7475
@Test

‎src/test/java/com/arpnetworking/metrics/mad/model/json/TelegrafTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
package com.arpnetworking.metrics.mad.model.json;
1717

1818
import com.arpnetworking.commons.test.BuildableTestHelper;
19+
import com.arpnetworking.commons.test.EqualityTestHelper;
1920
import com.arpnetworking.commons.test.ThreadLocalBuildableTestHelper;
20-
import com.arpnetworking.utility.test.BuildableEqualsAndHashCodeTester;
2121
import com.google.common.collect.ImmutableMap;
2222
import org.junit.Assert;
2323
import org.junit.Test;
@@ -51,14 +51,15 @@ public void testReset() throws Exception {
5151
}
5252

5353
@Test
54-
public void testEqualsAndHashCode() {
55-
BuildableEqualsAndHashCodeTester.assertEqualsAndHashCode(
54+
public void testEqualsAndHashCode() throws Exception {
55+
EqualityTestHelper.testEquality(
5656
_telegrafBuilder.get(),
5757
new Telegraf.Builder()
5858
.setTimestamp(System.currentTimeMillis() + 1000)
5959
.setName("test2")
6060
.setFields(ImmutableMap.of("metric2", "60"))
61-
.setTags(ImmutableMap.of("host", "localhost2")));
61+
.setTags(ImmutableMap.of("host", "localhost2")),
62+
Telegraf.class);
6263
}
6364

6465
@Test

‎src/test/java/com/arpnetworking/tsdcore/model/CalculatedValueTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
package com.arpnetworking.tsdcore.model;
1717

1818
import com.arpnetworking.commons.test.BuildableTestHelper;
19+
import com.arpnetworking.commons.test.EqualityTestHelper;
1920
import com.arpnetworking.commons.test.ThreadLocalBuildableTestHelper;
2021
import com.arpnetworking.test.TestBeanFactory;
21-
import com.arpnetworking.utility.test.BuildableEqualsAndHashCodeTester;
2222
import org.junit.Assert;
2323
import org.junit.Test;
2424

@@ -49,12 +49,13 @@ public void testReset() throws Exception {
4949
}
5050

5151
@Test
52-
public void testEqualsAndHashCode() {
53-
BuildableEqualsAndHashCodeTester.assertEqualsAndHashCode(
52+
public void testEqualsAndHashCode() throws Exception {
53+
EqualityTestHelper.testEquality(
5454
_calculatedValueBuilder.get(),
5555
new CalculatedValue.Builder<>()
5656
.setValue(TestBeanFactory.createSample())
57-
.setData(new Object()));
57+
.setData(new Object()),
58+
CalculatedValue.class);
5859
}
5960

6061
@Test

‎src/test/java/com/arpnetworking/tsdcore/model/PeriodicDataTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
package com.arpnetworking.tsdcore.model;
1717

1818
import com.arpnetworking.commons.test.BuildableTestHelper;
19+
import com.arpnetworking.commons.test.EqualityTestHelper;
1920
import com.arpnetworking.commons.test.ThreadLocalBuildableTestHelper;
2021
import com.arpnetworking.metrics.mad.model.AggregatedData;
2122
import com.arpnetworking.metrics.mad.model.statistics.Statistic;
2223
import com.arpnetworking.metrics.mad.model.statistics.StatisticFactory;
2324
import com.arpnetworking.test.TestBeanFactory;
24-
import com.arpnetworking.utility.test.BuildableEqualsAndHashCodeTester;
2525
import com.google.common.collect.ImmutableMap;
2626
import com.google.common.collect.ImmutableMultimap;
2727
import org.junit.Assert;
@@ -70,8 +70,8 @@ public void testReset() throws Exception {
7070
}
7171

7272
@Test
73-
public void testEqualsAndHashCode() {
74-
BuildableEqualsAndHashCodeTester.assertEqualsAndHashCode(
73+
public void testEqualsAndHashCode() throws Exception {
74+
EqualityTestHelper.testEquality(
7575
_periodicDataBuilder.get(),
7676
new PeriodicData.Builder()
7777
.setPeriod(Duration.ofMinutes(2))
@@ -85,7 +85,8 @@ public void testEqualsAndHashCode() {
8585
.setIsSpecified(false)
8686
.setValue(TestBeanFactory.createSample())
8787
.setPopulationSize(2L)
88-
.build())));
88+
.build())),
89+
PeriodicData.class);
8990
}
9091

9192
@Test

‎src/test/java/com/arpnetworking/utility/test/BuildableEqualsAndHashCodeTester.java‎

Lines changed: 0 additions & 92 deletions
This file was deleted.

0 commit comments

Comments
 (0)