summaryrefslogtreecommitdiffstats
path: root/src/test
diff options
context:
space:
mode:
authorShevek <[email protected]>2014-12-03 00:01:47 -0800
committerShevek <[email protected]>2014-12-03 00:01:47 -0800
commita3306f269ec75a617f7bf4ee6a292a961ba2c1f5 (patch)
tree59b477b295579dfd60d4de301ff475ce999c1744 /src/test
parent28c3704abb4f98989d6aa57dc1395df99a77f7d2 (diff)
SourceChangeEvent now uses an enum.
-> gradle 2.2.1
Diffstat (limited to 'src/test')
-rw-r--r--src/test/java/org/anarres/cpp/LexerSourceTest.java6
-rw-r--r--src/test/java/org/anarres/cpp/PreprocessorTest.java8
2 files changed, 7 insertions, 7 deletions
diff --git a/src/test/java/org/anarres/cpp/LexerSourceTest.java b/src/test/java/org/anarres/cpp/LexerSourceTest.java
index e21aa01..96ec4a3 100644
--- a/src/test/java/org/anarres/cpp/LexerSourceTest.java
+++ b/src/test/java/org/anarres/cpp/LexerSourceTest.java
@@ -1,16 +1,16 @@
package org.anarres.cpp;
import java.util.Arrays;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.anarres.cpp.PreprocessorTest.assertType;
import static org.anarres.cpp.Token.*;
import static org.junit.Assert.*;
public class LexerSourceTest {
- private static final Log LOG = LogFactory.getLog(LexerSourceTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LexerSourceTest.class);
public static void testLexerSource(String in, boolean textmatch, int... out)
throws Exception {
diff --git a/src/test/java/org/anarres/cpp/PreprocessorTest.java b/src/test/java/org/anarres/cpp/PreprocessorTest.java
index 84e7e31..e55b568 100644
--- a/src/test/java/org/anarres/cpp/PreprocessorTest.java
+++ b/src/test/java/org/anarres/cpp/PreprocessorTest.java
@@ -4,16 +4,16 @@ import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.anarres.cpp.Token.*;
import static org.junit.Assert.*;
public class PreprocessorTest {
- private static final Log LOG = LogFactory.getLog(PreprocessorTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PreprocessorTest.class);
private OutputStreamWriter writer;
private Preprocessor p;
@@ -193,7 +193,7 @@ public class PreprocessorTest {
writer.flush();
for (Object v : out) {
Token t = p.token();
- LOG.info(t);
+ LOG.info(String.valueOf(t));
if (v instanceof String) {
if (t.getType() != STRING)
fail("Expected STRING, but got " + t);