Skip to content

Commit 13d83de

Browse files
committed
Move cef messages to text ficture files
1 parent ff27efa commit 13d83de

File tree

5 files changed

+21
-5
lines changed

5 files changed

+21
-5
lines changed

.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,3 +231,6 @@ indent_size = 3
231231

232232
[*.{csv,sql}-spec]
233233
trim_trailing_whitespace = false
234+
235+
[*.txt]
236+
insert_final_newline = false

modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/CefProcessorTests.java

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,43 +11,53 @@
1111

1212
import org.elasticsearch.ingest.IngestDocument;
1313
import org.elasticsearch.test.ESTestCase;
14+
import org.junit.runners.model.TestClass;
1415

16+
import java.io.IOException;
17+
import java.net.URISyntaxException;
18+
import java.net.URL;
19+
import java.nio.file.Files;
20+
import java.nio.file.Paths;
1521
import java.time.Instant;
1622
import java.time.ZoneId;
1723
import java.time.ZonedDateTime;
1824
import java.util.HashMap;
1925
import java.util.List;
2026
import java.util.Map;
27+
import java.util.Objects;
2128

2229
import static java.util.Map.entry;
2330
import static org.hamcrest.Matchers.aMapWithSize;
2431
import static org.hamcrest.Matchers.containsInAnyOrder;
2532
import static org.hamcrest.Matchers.equalTo;
2633

2734
public class CefProcessorTests extends ESTestCase {
28-
35+
private static String readCefMessageFile(String fileName) throws IOException, URISyntaxException {
36+
URL resource = TestClass.class.getResource("/" + fileName);
37+
return Files.readString(Paths.get(Objects.requireNonNull(resource).toURI()));
38+
}
2939
private IngestDocument document;
3040

31-
public void testParse() {
41+
public void testParse() throws IOException, URISyntaxException {
3242
String message;
3343
List<String> headers;
3444
Map<String, String> extensions;
3545
{
36-
message = "CEF:0|vendor|product|version|class|name|severity|";
46+
message = readCefMessageFile("basic_cef_message.txt");
3747
headers = CefParser.parseHeaders(message);
3848
extensions = CefParser.parseExtensions(headers.removeLast());
3949
assertThat(headers, equalTo(List.of("CEF:0", "vendor", "product", "version", "class", "name", "severity")));
4050
assertThat(extensions, aMapWithSize(0));
4151
}
4252
{
43-
message = "CEF:1|vendor|product|version|class|name|severity|someExtension=someValue";
53+
message = readCefMessageFile("cef_message_with_extension.txt");
4454
headers = CefParser.parseHeaders(message);
4555
extensions = CefParser.parseExtensions(headers.removeLast());
4656
assertThat(headers, equalTo(List.of("CEF:1", "vendor", "product", "version", "class", "name", "severity")));
4757
assertThat(extensions, equalTo(Map.of("someExtension", "someValue")));
4858
}
4959
{
50-
message = "CEF:1|vendor|product\\|pipe|version space|class\\\\slash|name|severity|ext1=some value ext2=pipe|value ";
60+
message = readCefMessageFile("cef_message_with_escaped_pipe.txt");
5161
headers = CefParser.parseHeaders(message);
5262
extensions = CefParser.parseExtensions(headers.removeLast());
5363
assertThat(headers, equalTo(List.of("CEF:1", "vendor", "product|pipe", "version space", "class\\slash", "name", "severity")));
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CEF:0|vendor|product|version|class|name|severity|
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CEF:1|vendor|product\|pipe|version space|class\\slash|name|severity|ext1=some value ext2=pipe|value
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CEF:1|vendor|product|version|class|name|severity|someExtension=someValue

0 commit comments

Comments
 (0)