Skip to content

Commit

Permalink
fix broken TokenizerFilter tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Lennart Koopmann committed May 16, 2012
1 parent 409df6d commit c5f11e9
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions src/test/java/org/graylog2/filters/TokenizerFilterTest.java
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@


package org.graylog2.filters; package org.graylog2.filters;


import org.graylog2.GraylogServerStub;
import org.graylog2.logmessage.LogMessage; import org.graylog2.logmessage.LogMessage;
import org.junit.Test; import org.junit.Test;
import static org.junit.Assert.*; import static org.junit.Assert.*;
Expand All @@ -35,7 +36,7 @@ public void testFilter() {
LogMessage msg = new LogMessage(); LogMessage msg = new LogMessage();
msg.setShortMessage("Ohai I am a message k1=v1 k2=v2 Awesome!"); msg.setShortMessage("Ohai I am a message k1=v1 k2=v2 Awesome!");
TokenizerFilter f = new TokenizerFilter(); TokenizerFilter f = new TokenizerFilter();
f.filter(msg, null); f.filter(msg, new GraylogServerStub());


assertEquals(2, msg.getAdditionalData().size()); assertEquals(2, msg.getAdditionalData().size());
assertEquals("v1", msg.getAdditionalData().get("_k1")); assertEquals("v1", msg.getAdditionalData().get("_k1"));
Expand All @@ -47,7 +48,7 @@ public void testFilterWithKVAtBeginning() {
LogMessage msg = new LogMessage(); LogMessage msg = new LogMessage();
msg.setShortMessage("k1=v1 k2=v2 Awesome!"); msg.setShortMessage("k1=v1 k2=v2 Awesome!");
TokenizerFilter f = new TokenizerFilter(); TokenizerFilter f = new TokenizerFilter();
f.filter(msg, null); f.filter(msg, new GraylogServerStub());


assertEquals(2, msg.getAdditionalData().size()); assertEquals(2, msg.getAdditionalData().size());
assertEquals("v1", msg.getAdditionalData().get("_k1")); assertEquals("v1", msg.getAdditionalData().get("_k1"));
Expand All @@ -59,7 +60,7 @@ public void testFilterWithKVAtEnd() {
LogMessage msg = new LogMessage(); LogMessage msg = new LogMessage();
msg.setShortMessage("lolwat Awesome! k1=v1"); msg.setShortMessage("lolwat Awesome! k1=v1");
TokenizerFilter f = new TokenizerFilter(); TokenizerFilter f = new TokenizerFilter();
f.filter(msg, null); f.filter(msg, new GraylogServerStub());


assertEquals(1, msg.getAdditionalData().size()); assertEquals(1, msg.getAdditionalData().size());
assertEquals("v1", msg.getAdditionalData().get("_k1")); assertEquals("v1", msg.getAdditionalData().get("_k1"));
Expand All @@ -70,7 +71,7 @@ public void testFilterWithStringInBetween() {
LogMessage msg = new LogMessage(); LogMessage msg = new LogMessage();
msg.setShortMessage("foo k2=v2 lolwat Awesome! k1=v1"); msg.setShortMessage("foo k2=v2 lolwat Awesome! k1=v1");
TokenizerFilter f = new TokenizerFilter(); TokenizerFilter f = new TokenizerFilter();
f.filter(msg, null); f.filter(msg, new GraylogServerStub());


assertEquals(2, msg.getAdditionalData().size()); assertEquals(2, msg.getAdditionalData().size());
assertEquals("v1", msg.getAdditionalData().get("_k1")); assertEquals("v1", msg.getAdditionalData().get("_k1"));
Expand All @@ -82,7 +83,7 @@ public void testFilterWithKVOnly() {
LogMessage msg = new LogMessage(); LogMessage msg = new LogMessage();
msg.setShortMessage("k1=v1"); msg.setShortMessage("k1=v1");
TokenizerFilter f = new TokenizerFilter(); TokenizerFilter f = new TokenizerFilter();
f.filter(msg, null); f.filter(msg, new GraylogServerStub());


assertEquals(1, msg.getAdditionalData().size()); assertEquals(1, msg.getAdditionalData().size());
assertEquals("v1", msg.getAdditionalData().get("_k1")); assertEquals("v1", msg.getAdditionalData().get("_k1"));
Expand All @@ -93,7 +94,7 @@ public void testFilterWithInvalidKVPairs() {
LogMessage msg = new LogMessage(); LogMessage msg = new LogMessage();
msg.setShortMessage("Ohai I am a message and this is a URL: index.php?foo=bar&baz=bar"); msg.setShortMessage("Ohai I am a message and this is a URL: index.php?foo=bar&baz=bar");
TokenizerFilter f = new TokenizerFilter(); TokenizerFilter f = new TokenizerFilter();
f.filter(msg, null); f.filter(msg, new GraylogServerStub());


assertEquals(0, msg.getAdditionalData().size()); assertEquals(0, msg.getAdditionalData().size());
} }
Expand All @@ -103,7 +104,7 @@ public void testFilterWithoutKVPairs() {
LogMessage msg = new LogMessage(); LogMessage msg = new LogMessage();
msg.setShortMessage("trolololololol"); msg.setShortMessage("trolololololol");
TokenizerFilter f = new TokenizerFilter(); TokenizerFilter f = new TokenizerFilter();
f.filter(msg, null); f.filter(msg, new GraylogServerStub());


assertEquals(0, msg.getAdditionalData().size()); assertEquals(0, msg.getAdditionalData().size());
} }
Expand All @@ -113,7 +114,7 @@ public void testFilterWithOneInvalidKVPair() {
LogMessage msg = new LogMessage(); LogMessage msg = new LogMessage();
msg.setShortMessage("Ohai I am a message and this is a URL: index.php?foo=bar"); msg.setShortMessage("Ohai I am a message and this is a URL: index.php?foo=bar");
TokenizerFilter f = new TokenizerFilter(); TokenizerFilter f = new TokenizerFilter();
f.filter(msg, null); f.filter(msg, new GraylogServerStub());


assertEquals(0, msg.getAdditionalData().size()); assertEquals(0, msg.getAdditionalData().size());
} }
Expand All @@ -124,7 +125,7 @@ public void testFilterWillNotOverwriteExistingAdditionalFields() {
msg.addAdditionalData("_k1", "YOU BETTER NOT OVERWRITE"); msg.addAdditionalData("_k1", "YOU BETTER NOT OVERWRITE");
msg.setShortMessage("Ohai I am a message k1=v1 k2=v2 Awesome!"); msg.setShortMessage("Ohai I am a message k1=v1 k2=v2 Awesome!");
TokenizerFilter f = new TokenizerFilter(); TokenizerFilter f = new TokenizerFilter();
f.filter(msg, null); f.filter(msg, new GraylogServerStub());


assertEquals(2, msg.getAdditionalData().size()); assertEquals(2, msg.getAdditionalData().size());
assertEquals("YOU BETTER NOT OVERWRITE", msg.getAdditionalData().get("_k1")); assertEquals("YOU BETTER NOT OVERWRITE", msg.getAdditionalData().get("_k1"));
Expand Down

0 comments on commit c5f11e9

Please sign in to comment.