Ldong/syslog4j-graylog2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove TestNG in favor of JUnit

Browse Source
This commit is contained in:
Jochen Schalanda 2015-03-31 18:10:32 +02:00
parent 29f6a8c3f6
commit d521ccea60
3 changed files with 125 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pom.xml
View File

@ -95,12 +95,6 @@
<version>3.0.9</version> <version>3.0.9</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.8.21</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
@ -184,19 +178,6 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version> <version>2.18.1</version>
<!-- For running both, junit and testng tests. -->
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit4</artifactId>
<version>2.18.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-testng</artifactId>
<version>2.18.1</version>
</dependency>
</dependencies>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>

94
src/test/java/org/graylog2/syslog4j/server/impl/event/SyslogServerEventTest.java
View File

@ -1,12 +1,12 @@
package org.graylog2.syslog4j.server.impl.event; package org.graylog2.syslog4j.server.impl.event;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.testng.annotations.Test; import org.junit.Test;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import static org.testng.Assert.assertEquals; import static org.junit.Assert.assertEquals;
public class SyslogServerEventTest { public class SyslogServerEventTest {
private final InetAddress INET_ADDR = new InetSocketAddress(514).getAddress(); private final InetAddress INET_ADDR = new InetSocketAddress(514).getAddress();
@ -22,11 +22,11 @@ public class SyslogServerEventTest {
final SyslogServerEvent event = buildEvent(message); final SyslogServerEvent event = buildEvent(message);
assertEquals(event.getDate(), new DateTime(new DateTime().getYear() + "-10-11T22:14:15").toDate()); assertEquals(new DateTime(new DateTime().getYear() + "-10-11T22:14:15").toDate(), event.getDate());
assertEquals(event.getFacility(), 4); assertEquals(4, event.getFacility());
assertEquals(event.getHost(), "mymachine"); assertEquals("mymachine", event.getHost());
assertEquals(event.getLevel(), 2); assertEquals(2, event.getLevel());
assertEquals(event.getMessage(), "mymachine su: 'su root' failed for lonvick on /dev/pts/8"); assertEquals("mymachine su: 'su root' failed for lonvick on /dev/pts/8", event.getMessage());
} }
@Test @Test
@ -36,11 +36,11 @@ public class SyslogServerEventTest {
final SyslogServerEvent event = buildEvent(message); final SyslogServerEvent event = buildEvent(message);
assertEquals(event.getDate(), new DateTime(new DateTime().getYear() + "-02-05T17:32:18").toDate()); assertEquals(new DateTime(new DateTime().getYear() + "-02-05T17:32:18").toDate(), event.getDate());
assertEquals(event.getFacility(), 1); assertEquals(1, event.getFacility());
assertEquals(event.getHost(), "10.0.0.99"); assertEquals("10.0.0.99", event.getHost());
assertEquals(event.getLevel(), 5); assertEquals(5, event.getLevel());
assertEquals(event.getMessage(), "10.0.0.99 Use the BFG!"); assertEquals("10.0.0.99 Use the BFG!", event.getMessage());
} }
@Test @Test
@ -51,11 +51,11 @@ public class SyslogServerEventTest {
final SyslogServerEvent event = buildEvent(message); final SyslogServerEvent event = buildEvent(message);
assertEquals(event.getDate(), new DateTime(new DateTime().getYear() + "-10-05T12:23:34").toDate()); assertEquals(new DateTime(new DateTime().getYear() + "-10-05T12:23:34").toDate(), event.getDate());
assertEquals(event.getFacility(), 1); assertEquals(1, event.getFacility());
assertEquals(event.getHost(), "hostname"); assertEquals("hostname", event.getHost());
assertEquals(event.getLevel(), 3); assertEquals(3, event.getLevel());
assertEquals(event.getMessage(), "hostname tag: hello world"); assertEquals("hostname tag: hello world", event.getMessage());
} }
@Test @Test
@ -66,11 +66,11 @@ public class SyslogServerEventTest {
final SyslogServerEvent event = buildEvent(message); final SyslogServerEvent event = buildEvent(message);
assertEquals(event.getDate(), new DateTime(new DateTime().getYear() + "-10-11T22:14:15").toDate()); assertEquals(new DateTime(new DateTime().getYear() + "-10-11T22:14:15").toDate(), event.getDate());
assertEquals(event.getFacility(), 4); assertEquals(4, event.getFacility());
assertEquals(event.getHost(), "mymachine"); assertEquals("mymachine", event.getHost());
assertEquals(event.getLevel(), 2); assertEquals(2, event.getLevel());
assertEquals(event.getMessage(), "mymachine su[123]: 'su root' failed for lonvick on /dev/pts/8"); assertEquals("mymachine su[123]: 'su root' failed for lonvick on /dev/pts/8", event.getMessage());
} }
@Test @Test
@ -94,11 +94,11 @@ public class SyslogServerEventTest {
final SyslogServerEvent event = buildEvent(message); final SyslogServerEvent event = buildEvent(message);
assertEquals(event.getDate(), new DateTime(new DateTime().getYear() + "-02-05T17:32:18").toDate()); assertEquals(new DateTime(new DateTime().getYear() + "-02-05T17:32:18").toDate(), event.getDate());
assertEquals(event.getFacility(), 1); assertEquals(1, event.getFacility());
assertEquals(event.getHost(), "10.0.0.99"); assertEquals("10.0.0.99", event.getHost());
assertEquals(event.getLevel(), 5); assertEquals(5, event.getLevel());
assertEquals(event.getMessage(), "10.0.0.99 Use the BFG!"); assertEquals("10.0.0.99 Use the BFG!", event.getMessage());
} }
@Test @Test
@ -110,11 +110,11 @@ public class SyslogServerEventTest {
final SyslogServerEvent event = buildEvent(message); final SyslogServerEvent event = buildEvent(message);
assertEquals(event.getDate(), new DateTime(new DateTime().getYear() + "-10-11T22:14:15").toDate()); assertEquals(new DateTime(new DateTime().getYear() + "-10-11T22:14:15").toDate(), event.getDate());
assertEquals(event.getFacility(), 12); assertEquals(12, event.getFacility());
assertEquals(event.getHost(), "mymachine"); assertEquals("mymachine", event.getHost());
assertEquals(event.getLevel(), 2); assertEquals(2, event.getLevel());
assertEquals(event.getMessage(), "mymachine su[123]: 'su root' failed for lonvick on /dev/pts/8"); assertEquals("mymachine su[123]: 'su root' failed for lonvick on /dev/pts/8", event.getMessage());
} }
@Test @Test
@ -126,11 +126,11 @@ public class SyslogServerEventTest {
final SyslogServerEvent event = buildEvent(message); final SyslogServerEvent event = buildEvent(message);
assertEquals(event.getDate(), new DateTime(new DateTime().getYear() + "-10-11T22:14:15").toDate()); assertEquals(new DateTime(new DateTime().getYear() + "-10-11T22:14:15").toDate(), event.getDate());
assertEquals(event.getFacility(), 13); assertEquals(13, event.getFacility());
assertEquals(event.getHost(), "mymachine"); assertEquals("mymachine", event.getHost());
assertEquals(event.getLevel(), 2); assertEquals(2, event.getLevel());
assertEquals(event.getMessage(), "mymachine su[123]: 'su root' failed for lonvick on /dev/pts/8"); assertEquals("mymachine su[123]: 'su root' failed for lonvick on /dev/pts/8", event.getMessage());
} }
@Test @Test
@ -142,11 +142,11 @@ public class SyslogServerEventTest {
final SyslogServerEvent event = buildEvent(message); final SyslogServerEvent event = buildEvent(message);
assertEquals(event.getDate(), new DateTime(new DateTime().getYear() + "-10-11T22:14:15").toDate()); assertEquals(new DateTime(new DateTime().getYear() + "-10-11T22:14:15").toDate(), event.getDate());
assertEquals(event.getFacility(), 14); assertEquals(14, event.getFacility());
assertEquals(event.getHost(), "mymachine"); assertEquals("mymachine", event.getHost());
assertEquals(event.getLevel(), 2); assertEquals(2, event.getLevel());
assertEquals(event.getMessage(), "mymachine su[123]: 'su root' failed for lonvick on /dev/pts/8"); assertEquals("mymachine su[123]: 'su root' failed for lonvick on /dev/pts/8", event.getMessage());
} }
@Test @Test
@ -158,11 +158,11 @@ public class SyslogServerEventTest {
final SyslogServerEvent event = buildEvent(message); final SyslogServerEvent event = buildEvent(message);
assertEquals(event.getDate(), new DateTime(new DateTime().getYear() + "-10-11T22:14:15").toDate()); assertEquals(new DateTime(new DateTime().getYear() + "-10-11T22:14:15").toDate(), event.getDate());
assertEquals(event.getFacility(), 15); assertEquals(15, event.getFacility());
assertEquals(event.getHost(), "mymachine"); assertEquals("mymachine", event.getHost());
assertEquals(event.getLevel(), 2); assertEquals(2, event.getLevel());
assertEquals(event.getMessage(), "mymachine su[123]: 'su root' failed for lonvick on /dev/pts/8"); assertEquals("mymachine su[123]: 'su root' failed for lonvick on /dev/pts/8", event.getMessage());
} }
} }

155
src/test/java/org/graylog2/syslog4j/server/impl/event/structured/StructuredSyslogServerEventTest.java
View File

@ -1,14 +1,15 @@
package org.graylog2.syslog4j.server.impl.event.structured; package org.graylog2.syslog4j.server.impl.event.structured;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.testng.annotations.Test; import org.junit.Test;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import static org.testng.Assert.assertEquals; import static org.junit.Assert.assertEquals;
public class StructuredSyslogServerEventTest { public class StructuredSyslogServerEventTest {
private final InetAddress INET_ADDR = new InetSocketAddress(514).getAddress(); private final InetAddress INET_ADDR = new InetSocketAddress(514).getAddress();
@ -24,7 +25,7 @@ public class StructuredSyslogServerEventTest {
final StructuredSyslogServerEvent event = buildEvent(message); final StructuredSyslogServerEvent event = buildEvent(message);
Map<String, Object> structuredData = new HashMap<String, Object>() { Map<String, Map<String, String>> structuredData = new HashMap<String, Map<String, String>>() {
{ {
put("exampleSDID@32473", new HashMap<String, String>() { put("exampleSDID@32473", new HashMap<String, String>() {
{ {
@ -36,17 +37,17 @@ public class StructuredSyslogServerEventTest {
} }
}; };
assertEquals(event.getApplicationName(), "evntslog"); assertEquals("evntslog", event.getApplicationName());
assertEquals(event.getDateTime(), new DateTime("2012-12-25T22:14:15.003Z")); assertEquals(new DateTime("2012-12-25T22:14:15.003Z"), event.getDateTime());
assertEquals(event.getFacility(), 20); assertEquals(20, event.getFacility());
assertEquals(event.getHost(), "mymachine.example.com"); assertEquals("mymachine.example.com", event.getHost());
assertEquals(event.getLevel(), 5); assertEquals(5, event.getLevel());
assertEquals(event.getMessage(), "ID47 [exampleSDID@32473 iut=\"3\" eventSource=\"Application\" eventID=\"1011\"] BOMAn application event log entry"); assertEquals("ID47 [exampleSDID@32473 iut=\"3\" eventSource=\"Application\" eventID=\"1011\"] BOMAn application event log entry", event.getMessage());
assertEquals(event.getProcessId(), null); assertEquals(null, event.getProcessId());
assertEquals(event.getStructuredMessage().getStructuredData(), structuredData); assertEquals(structuredData, event.getStructuredMessage().getStructuredData());
assertEquals(event.getStructuredMessage().getMessageId(), "ID47"); assertEquals("ID47", event.getStructuredMessage().getMessageId());
assertEquals(event.getStructuredMessage().getMessage(), "BOMAn application event log entry"); assertEquals("BOMAn application event log entry", event.getStructuredMessage().getMessage());
} }
@Test @Test
@ -56,7 +57,7 @@ public class StructuredSyslogServerEventTest {
final StructuredSyslogServerEvent event = buildEvent(message); final StructuredSyslogServerEvent event = buildEvent(message);
Map<String, Object> structuredData = new HashMap<String, Object>() { Map<String, Map<String, String>> structuredData = new HashMap<String, Map<String, String>>() {
{ {
put("mdc@18060", new HashMap<String, String>() { put("mdc@18060", new HashMap<String, String>() {
{ {
@ -70,17 +71,17 @@ public class StructuredSyslogServerEventTest {
} }
}; };
assertEquals(event.getApplicationName(), "app"); assertEquals("app", event.getApplicationName());
assertEquals(event.getDateTime(), new DateTime("2015-01-06T20:56:33.287Z")); assertEquals(new DateTime("2015-01-06T20:56:33.287Z"), event.getDateTime());
assertEquals(event.getFacility(), 23); assertEquals(23, event.getFacility());
assertEquals(event.getHost(), "app-1"); assertEquals("app-1", event.getHost());
assertEquals(event.getLevel(), 6); assertEquals(6, event.getLevel());
assertEquals(event.getMessage(), "- [mdc@18060 ip=\"::ffff:132.213.51.30\" logger=\"{c.corp.Handler}\" session=\"4ot7\" user=\"user@example.com\" user-agent=\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_5) AppleWebKit/600.2.5 (KHTML, like Gecko) Version/7.1.2 Safari/537.85.11\"] User page 13 requested"); assertEquals("- [mdc@18060 ip=\"::ffff:132.213.51.30\" logger=\"{c.corp.Handler}\" session=\"4ot7\" user=\"user@example.com\" user-agent=\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_5) AppleWebKit/600.2.5 (KHTML, like Gecko) Version/7.1.2 Safari/537.85.11\"] User page 13 requested", event.getMessage());
assertEquals(event.getProcessId(), null); assertEquals(null, event.getProcessId());
assertEquals(event.getStructuredMessage().getStructuredData(), structuredData); assertEquals(structuredData, event.getStructuredMessage().getStructuredData());
assertEquals(event.getStructuredMessage().getMessageId(), null); assertEquals(null, event.getStructuredMessage().getMessageId());
assertEquals(event.getStructuredMessage().getMessage(), "User page 13 requested"); assertEquals("User page 13 requested", event.getStructuredMessage().getMessage());
} }
@Test @Test
@ -90,17 +91,17 @@ public class StructuredSyslogServerEventTest {
final StructuredSyslogServerEvent event = buildEvent(message); final StructuredSyslogServerEvent event = buildEvent(message);
assertEquals(event.getApplicationName(), null); assertEquals(null, event.getApplicationName());
assertEquals(event.getDateTime(), new DateTime("2015-01-11T15:35:21.335797Z")); assertEquals(new DateTime("2015-01-11T15:35:21.335797Z"), event.getDateTime());
assertEquals(event.getFacility(), 16); assertEquals(16, event.getFacility());
assertEquals(event.getHost(), "s000000.example.com"); assertEquals("s000000.example.com", event.getHost());
assertEquals(event.getLevel(), 0); assertEquals(0, event.getLevel());
assertEquals(event.getMessage(), "- - tralala"); assertEquals("- - tralala", event.getMessage());
assertEquals(event.getProcessId(), null); assertEquals(null, event.getProcessId());
assertEquals(event.getStructuredMessage().getStructuredData(), null); assertEquals(null, event.getStructuredMessage().getStructuredData());
assertEquals(event.getStructuredMessage().getMessageId(), null); assertEquals(null, event.getStructuredMessage().getMessageId());
assertEquals(event.getStructuredMessage().getMessage(), "- - tralala"); assertEquals("- - tralala", event.getStructuredMessage().getMessage());
} }
@Test @Test
@ -110,7 +111,7 @@ public class StructuredSyslogServerEventTest {
final StructuredSyslogServerEvent event = buildEvent(message); final StructuredSyslogServerEvent event = buildEvent(message);
Map<String, Object> structuredData = new HashMap<String, Object>() { Map<String, Map<String, String>> structuredData = new HashMap<String, Map<String, String>>() {
{ {
put("exampleSDID@32473", new HashMap<String, String>() { put("exampleSDID@32473", new HashMap<String, String>() {
{ {
@ -128,17 +129,17 @@ public class StructuredSyslogServerEventTest {
} }
}; };
assertEquals(event.getApplicationName(), "evntslog"); assertEquals("evntslog", event.getApplicationName());
assertEquals(event.getDateTime(), new DateTime("2003-10-11T22:14:15.003Z")); assertEquals(new DateTime("2003-10-11T22:14:15.003Z"), event.getDateTime());
assertEquals(event.getFacility(), 20); assertEquals(20, event.getFacility());
assertEquals(event.getHost(), "mymachine.example.com"); assertEquals("mymachine.example.com", event.getHost());
assertEquals(event.getLevel(), 5); assertEquals(5, event.getLevel());
assertEquals(event.getMessage(), "ID47 [exampleSDID@32473 iut=\"3\" eventSource=\"Application\" eventID=\"1011\"][examplePriority@32473 class=\"high\"]"); assertEquals("ID47 [exampleSDID@32473 iut=\"3\" eventSource=\"Application\" eventID=\"1011\"][examplePriority@32473 class=\"high\"]", event.getMessage());
assertEquals(event.getProcessId(), null); assertEquals(null, event.getProcessId());
assertEquals(event.getStructuredMessage().getStructuredData(), structuredData); assertEquals(structuredData, event.getStructuredMessage().getStructuredData());
assertEquals(event.getStructuredMessage().getMessageId(), "ID47"); assertEquals("ID47", event.getStructuredMessage().getMessageId());
assertEquals(event.getStructuredMessage().getMessage(), ""); assertEquals("", event.getStructuredMessage().getMessage());
} }
@ -149,17 +150,17 @@ public class StructuredSyslogServerEventTest {
final StructuredSyslogServerEvent event = buildEvent(message); final StructuredSyslogServerEvent event = buildEvent(message);
assertEquals(event.getApplicationName(), "myproc"); assertEquals("myproc", event.getApplicationName());
assertEquals(event.getDateTime(), new DateTime("2003-08-24T05:14:15.000003-07:00")); assertEquals(new DateTime("2003-08-24T05:14:15.000003-07:00"), event.getDateTime());
assertEquals(event.getFacility(), 20); assertEquals(20, event.getFacility());
assertEquals(event.getHost(), "192.0.2.1"); assertEquals("192.0.2.1", event.getHost());
assertEquals(event.getLevel(), 5); assertEquals(5, event.getLevel());
assertEquals(event.getMessage(), "- - %% It's time to make the do-nuts."); assertEquals("- - %% It's time to make the do-nuts.", event.getMessage());
assertEquals(event.getProcessId(), "8710"); assertEquals("8710", event.getProcessId());
assertEquals(event.getStructuredMessage().getStructuredData(), null); assertEquals(null, event.getStructuredMessage().getStructuredData());
assertEquals(event.getStructuredMessage().getMessageId(), null); assertEquals(null, event.getStructuredMessage().getMessageId());
assertEquals(event.getStructuredMessage().getMessage(), "- - %% It's time to make the do-nuts."); assertEquals("- - %% It's time to make the do-nuts.", event.getStructuredMessage().getMessage());
} }
@Test @Test
@ -170,7 +171,7 @@ public class StructuredSyslogServerEventTest {
final StructuredSyslogServerEvent event = buildEvent(message); final StructuredSyslogServerEvent event = buildEvent(message);
Map<String, Object> structuredData = new HashMap<String, Object>() { Map<String, Map<String, String>> structuredData = new HashMap<String, Map<String, String>>() {
{ {
put("meta", new HashMap<String, String>() { put("meta", new HashMap<String, String>() {
{ {
@ -180,17 +181,17 @@ public class StructuredSyslogServerEventTest {
} }
}; };
assertEquals(event.getApplicationName(), "syslog-ng"); assertEquals("syslog-ng", event.getApplicationName());
assertEquals(event.getDateTime(), new DateTime("2014-10-21T10:21:09.000Z")); assertEquals(new DateTime("2014-10-21T10:21:09.000Z"), event.getDateTime());
assertEquals(event.getFacility(), 5); assertEquals(5, event.getFacility());
assertEquals(event.getHost(), "c4dc57ba1ebb"); assertEquals("c4dc57ba1ebb", event.getHost());
assertEquals(event.getLevel(), 5); assertEquals(5, event.getLevel());
assertEquals(event.getMessage(), "- [meta sequenceId=\"1\"] syslog-ng starting up; version='3.5.3'"); assertEquals("- [meta sequenceId=\"1\"] syslog-ng starting up; version='3.5.3'", event.getMessage());
assertEquals(event.getProcessId(), "7120"); assertEquals("7120", event.getProcessId());
assertEquals(event.getStructuredMessage().getStructuredData(), structuredData); assertEquals(structuredData, event.getStructuredMessage().getStructuredData());
assertEquals(event.getStructuredMessage().getMessageId(), null); assertEquals(null, event.getStructuredMessage().getMessageId());
assertEquals(event.getStructuredMessage().getMessage(), "syslog-ng starting up; version='3.5.3'"); assertEquals("syslog-ng starting up; version='3.5.3'", event.getStructuredMessage().getMessage());
} }
@Test @Test
@ -200,7 +201,7 @@ public class StructuredSyslogServerEventTest {
final StructuredSyslogServerEvent event = buildEvent(message); final StructuredSyslogServerEvent event = buildEvent(message);
Map<String, Object> structuredData = new HashMap<String, Object>() { Map<String, Map<String, String>> structuredData = new HashMap<String, Map<String, String>>() {
{ {
put("meta", new HashMap<String, String>() { put("meta", new HashMap<String, String>() {
{ {
@ -210,16 +211,16 @@ public class StructuredSyslogServerEventTest {
} }
}; };
assertEquals(event.getApplicationName(), "syslog-ng"); assertEquals("syslog-ng", event.getApplicationName());
assertEquals(event.getDateTime(), new DateTime("2014-10-21T10:21:09.000Z")); assertEquals(new DateTime("2014-10-21T10:21:09.000Z"), event.getDateTime());
assertEquals(event.getFacility(), 5); assertEquals(5, event.getFacility());
assertEquals(event.getHost(), "c4dc57ba1ebb"); assertEquals("c4dc57ba1ebb", event.getHost());
assertEquals(event.getLevel(), 5); assertEquals(5, event.getLevel());
assertEquals(event.getMessage(), "- [meta sequenceId=\"1\"] syslog-ng starting up; version='3.5.3'"); assertEquals("- [meta sequenceId=\"1\"] syslog-ng starting up; version='3.5.3'", event.getMessage());
assertEquals(event.getProcessId(), "7120"); assertEquals("7120", event.getProcessId());
assertEquals(event.getStructuredMessage().getStructuredData(), structuredData); assertEquals(structuredData, event.getStructuredMessage().getStructuredData());
assertEquals(event.getStructuredMessage().getMessageId(), null); assertEquals(null, event.getStructuredMessage().getMessageId());
assertEquals(event.getStructuredMessage().getMessage(), "syslog-ng starting up; version='3.5.3'"); assertEquals("syslog-ng starting up; version='3.5.3'", event.getStructuredMessage().getMessage());
} }
} }