update dependencies and updated tests to work with new robolectric

Author: hameno

CHANGELOG.md

@@ -1,7 +1,13 @@
 Change Log
 ==========
 
+
+Version 1.0.1 *(2013-04-01)*
+----------------------------
+
+* Updated dependencies
+
 Version 1.0.0 *(2013-04-01)*
 ----------------------------
 
-Initial release.
+* Initial release.

README.md

@@ -33,7 +33,7 @@ Download [the latest JAR][1] or grab via Maven:
 <dependency>
   <groupId>de.psdev.slf4j-android-logger</groupId>
   <artifactId>slf4j-android-logger</artifactId>
-  <version>1.0.0</version>
+  <version>1.0.1</version>
 </dependency>
 ```
 

pom.xml

@@ -63,15 +63,15 @@
 
         <!-- Dependency Versions -->
         <android.version>4.1.1.4</android.version>
-        <slf4j-api.version>1.7.4</slf4j-api.version>
-        <junit.version>4.10</junit.version>
-        <robolectric.version>1.2</robolectric.version>
+        <slf4j-api.version>1.7.5</slf4j-api.version>
+        <junit.version>4.11</junit.version>
+        <robolectric.version>2.1.1</robolectric.version>
 
         <!-- Plugin Versions -->
-        <maven-compiler-plugin.version>3.0</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
         <maven-source-plugin.version>2.2.1</maven-source-plugin.version>
-        <maven-javadoc-plugin.version>2.9</maven-javadoc-plugin.version>
-        <maven-release-plugin.version>2.4</maven-release-plugin.version>
+        <maven-javadoc-plugin.version>2.9.1</maven-javadoc-plugin.version>
+        <maven-release-plugin.version>2.4.1</maven-release-plugin.version>
         <maven-gpg-plugin.version>1.4</maven-gpg-plugin.version>
     </properties>
 
@@ -99,7 +99,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.pivotallabs</groupId>
+            <groupId>org.robolectric</groupId>
             <artifactId>robolectric</artifactId>
             <version>${robolectric.version}</version>
             <scope>test</scope>

src/test/android/AndroidManifest.xml

@@ -17,34 +17,34 @@
 package de.psdev.slf4j.android.logger;
 
 import android.util.Log;
-import com.xtremelabs.robolectric.Robolectric;
+import org.hamcrest.CoreMatchers;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.matchers.JUnitMatchers.containsString;
+import static org.junit.Assert.*;
 
-@RunWith(CustomRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE, shadows = {EnhancedShadowLog.class})
 public class AndroidLoggerAdapterTest {
 
     private Logger mLogger;
 
     @Before
     public void setUp() throws Exception {
-        Robolectric.bindShadowClass(EnhancedShadowLog.class);
         mLogger = LoggerFactory.getLogger(AndroidLoggerAdapterTest.class);
         EnhancedShadowLog.stream = System.out;
     }
 
     @Test
     public void testInitialization() throws Exception {
-        assertEquals("should have read correct log tag from properties", "TestLogTag", AndroidLoggerAdapter.getLogTag());
+        assertEquals("should have read correct log tag from properties", "TestLogTag",
+                AndroidLoggerAdapter.getLogTag());
         assertEquals("should have correct name", AndroidLoggerAdapterTest.class.getName(), mLogger.getName());
         assertEquals("should have correct log level", Log.VERBOSE, AndroidLoggerAdapter.getLogLevel());
     }
@@ -269,7 +269,8 @@ public void testInnerclassMatching() throws Exception {
         final InnerClassTest innerClassTest = new InnerClassTest();
         innerClassTest.doSomething();
         assertLog(Log.INFO, "inner class match");
-        assertThat("should contain correct class name", EnhancedShadowLog.getLogs().get(0).msg, containsString("InnerClassTest"));
+        assertThat("should contain correct class name", EnhancedShadowLog.getLogs().get(0).msg,
+                CoreMatchers.containsString("InnerClassTest"));
     }
 
     @After
@@ -283,12 +284,14 @@ private static void assertLog(final int expectedLogLevel, final String expectedC
         assertLog(expectedLogLevel, expectedContainedText, null);
     }
 
-    private static void assertLog(final int expectedLogLevel, final String expectedContainedText, final Throwable expectedThrowable) {
+    private static void assertLog(final int expectedLogLevel, final String expectedContainedText,
+                                  final Throwable expectedThrowable) {
         assertEquals("should have logged 1 message", 1L, EnhancedShadowLog.getLogs().size());
         final EnhancedShadowLog.LogItem logItem = EnhancedShadowLog.getLogs().get(0);
         assertEquals("should have correct type", expectedLogLevel, logItem.type);
-        assertThat("should contain message", logItem.msg, containsString(expectedContainedText));
-        assertThat("should contain class", logItem.msg, containsString(AndroidLoggerAdapterTest.class.getSimpleName()));
+        assertThat("should contain message", logItem.msg, CoreMatchers.containsString(expectedContainedText));
+        assertThat("should contain class", logItem.msg, CoreMatchers.containsString(
+                AndroidLoggerAdapterTest.class.getSimpleName()));
         assertEquals("should have correct log tag", "TestLogTag", logItem.tag);
         if (expectedThrowable != null) {
             assertEquals("should have logged the correct throwable", expectedThrowable, logItem.throwable);

src/test/android/project.properties

@@ -40,8 +40,8 @@
 package de.psdev.slf4j.android.logger;
 
 import android.util.Log;
-import com.xtremelabs.robolectric.internal.Implementation;
-import com.xtremelabs.robolectric.internal.Implements;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
 
 import java.io.PrintStream;
 import java.io.PrintWriter;