Skip to content

Commit d60a385

Browse files
committed
merged pull request #83 adding set to addTags call
1 parent 81735c6 commit d60a385

File tree

2 files changed

+36
-1
lines changed

2 files changed

+36
-1
lines changed

pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,12 @@
111111
<version>1.3.0-1</version>
112112
<scope>test</scope>
113113
</dependency>
114+
<dependency>
115+
<groupId>net.javacrumbs.json-unit</groupId>
116+
<artifactId>json-unit</artifactId>
117+
<version>2.38.0</version>
118+
<scope>test</scope>
119+
</dependency>
114120

115121

116122
<dependency>

src/test/java/org/kairosdb/client/builder/QueryTagBuilderTest.java

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
package org.kairosdb.client.builder;
22

3+
import java.util.Collections;
4+
import java.util.HashSet;
5+
import java.util.Set;
36
import org.junit.Test;
47

58
import java.io.IOException;
69
import java.util.Date;
710

11+
import static net.javacrumbs.jsonunit.JsonAssert.assertJsonEquals;
12+
import static net.javacrumbs.jsonunit.JsonAssert.when;
13+
import static net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER;
814
import static org.hamcrest.CoreMatchers.equalTo;
915
import static org.junit.Assert.assertThat;
1016

@@ -125,9 +131,32 @@ public void test() throws IOException
125131
.setStart(1, TimeUnit.HOURS);
126132
builder.addMetric("metricName")
127133
.addTag("foo", "bar")
128-
.addTag("fi", "fum");
134+
.addTag("fi", Collections.singleton("fum"));
129135

130136
assertThat(builder.build(), equalTo("{\"metrics\":[{\"name\":\"metricName\",\"tags\":{\"fi\":[\"fum\"],\"foo\":[\"bar\"]}}],\"start_relative\":{\"value\":1,\"unit\":\"HOURS\"}}"));
131137
}
132138

139+
@Test
140+
public void testMultipleTags() throws IOException
141+
{
142+
QueryTagBuilder builder = QueryTagBuilder.getInstance()
143+
.setStart(1, TimeUnit.HOURS);
144+
Set<String> tags = new HashSet<>();
145+
Set<String> tags1 = new HashSet<>();
146+
tags.add("bar");
147+
tags.add("Bar");
148+
tags.add("bars");
149+
150+
tags1.add("fum");
151+
tags1.add("Fum");
152+
tags1.add("fums");
153+
154+
builder.addMetric("metricName")
155+
.addTag("foo",tags)
156+
.addTag("fi",tags1);
157+
assertJsonEquals(
158+
builder.build(),
159+
"{\"metrics\":[{\"name\":\"metricName\",\"tags\":{\"foo\":[\"bar\",\"Bar\",\"bars\"],\"fi\":[\"fum\",\"Fum\",\"fums\"]}}],\"start_relative\":{\"value\":1,\"unit\":\"HOURS\"}}",
160+
when(IGNORING_ARRAY_ORDER));
161+
}
133162
}

0 commit comments

Comments
 (0)