github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 06:37:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

MINOR: Cleanup Java Test Code in Production Classpath

Browse source 
Fixes #8592
This commit is contained in:
Armin 2017-11-06 12:17:38 +01:00 • committed by Armin Braun
parent d316ba12d2
commit 63dc6b8e34
3 changed files with 37 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
logstash-core/spec/logstash/event_spec.rb
View file

@ -146,7 +146,7 @@ describe LogStash::Event do
end
it "should set XXJavaProxy Jackson crafted" do
proxy = org.logstash.Util.getMapFixtureJackson()
proxy = org.logstash.RspecTestUtils.getMapFixtureJackson()
# proxy is {"string": "foo", "int": 42, "float": 42.42, "array": ["bar","baz"], "hash": {"string":"quux"} }
e = LogStash::Event.new()
e.set("[proxy]", proxy)
@ -159,7 +159,7 @@ describe LogStash::Event do
end
it "should set XXJavaProxy hand crafted" do
proxy = org.logstash.Util.getMapFixtureHandcrafted()
proxy = org.logstash.RspecTestUtils.getMapFixtureHandcrafted()
# proxy is {"string": "foo", "int": 42, "float": 42.42, "array": ["bar","baz"], "hash": {"string":"quux"} }
e = LogStash::Event.new()
e.set("[proxy]", proxy)

26
logstash-core/src/main/java/org/logstash/Util.java
View file

@ -1,9 +1,6 @@
package org.logstash;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
@ -12,29 +9,6 @@ import java.util.Map;
public class Util {
private Util() {}
public static Object getMapFixtureJackson() throws IOException {
StringBuilder json = new StringBuilder();
json.append("{");
json.append("\"string\": \"foo\", ");
json.append("\"int\": 42, ");
json.append("\"float\": 42.42, ");
json.append("\"array\": [\"bar\",\"baz\"], ");
json.append("\"hash\": {\"string\":\"quux\"} }");
return ObjectMappers.JSON_MAPPER.readValue(json.toString(), Object.class);
}
public static Map<String, Object> getMapFixtureHandcrafted() {
HashMap<String, Object> inner = new HashMap<>();
inner.put("string", "quux");
HashMap<String, Object> map = new HashMap<>();
map.put("string", "foo");
map.put("int", 42);
map.put("float", 42.42);
map.put("array", Arrays.asList("bar", "baz"));
map.put("hash", inner);
return map;
}
@SuppressWarnings("unchecked")
public static void mapMerge(final Map<String, Object> target, final Map<String, Object> add) {
LinkedHashSet<Object> buffer = null;

35
logstash-core/src/test/java/org/logstash/RspecTestUtils.java Normal file
View file

@ -0,0 +1,35 @@
package org.logstash;
import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
/**
* Utility Methods used in RSpec Tests.
*/
public final class RspecTestUtils {
public static Object getMapFixtureJackson() throws IOException {
StringBuilder json = new StringBuilder();
json.append("{");
json.append("\"string\": \"foo\", ");
json.append("\"int\": 42, ");
json.append("\"float\": 42.42, ");
json.append("\"array\": [\"bar\",\"baz\"], ");
json.append("\"hash\": {\"string\":\"quux\"} }");
return ObjectMappers.JSON_MAPPER.readValue(json.toString(), Object.class);
}
public static Map<String, Object> getMapFixtureHandcrafted() {
HashMap<String, Object> inner = new HashMap<>();
inner.put("string", "quux");
HashMap<String, Object> map = new HashMap<>();
map.put("string", "foo");
map.put("int", 42);
map.put("float", 42.42);
map.put("array", Arrays.asList("bar", "baz"));
map.put("hash", inner);
return map;
}
}