Update actionbarsherlock from 4.2 to 4.4

2 files changed, 23 insertions, 37 deletions

diff --git a/libraries/ActionBarSherlock/test/com/actionbarsherlock/internal/ManifestParsingTest.java b/libraries/ActionBarSherlock/test/com/actionbarsherlock/internal/ManifestParsingTest.java
deleted file mode 100644
index 47475c574..000000000
--- a/libraries/ActionBarSherlock/test/com/actionbarsherlock/internal/ManifestParsingTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.actionbarsherlock.internal;
-
-import org.junit.Test;
-
-import static com.actionbarsherlock.internal.ActionBarSherlockCompat.cleanActivityName;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-
-public class ManifestParsingTest {
-    @Test
-    public void testFullyQualifiedClassName() {
-        String expected = "com.other.package.SomeClass";
-        String actual = cleanActivityName("com.jakewharton.test", "com.other.package.SomeClass");
-        assertThat(expected, equalTo(actual));
-    }
-
-    @Test
-    public void testFullyQualifiedClassNameSamePackage() {
-        String expected = "com.jakewharton.test.SomeClass";
-        String actual = cleanActivityName("com.jakewharton.test", "com.jakewharton.test.SomeClass");
-        assertThat(expected, equalTo(actual));
-    }
-
-    @Test
-    public void testUnqualifiedClassName() {
-        String expected = "com.jakewharton.test.SomeClass";
-        String actual = cleanActivityName("com.jakewharton.test", "SomeClass");
-        assertThat(expected, equalTo(actual));
-    }
-
-    @Test
-    public void testRelativeClassName() {
-        String expected = "com.jakewharton.test.ui.SomeClass";
-        String actual = cleanActivityName("com.jakewharton.test", ".ui.SomeClass");
-        assertThat(expected, equalTo(actual));
-    }
-}
\ No newline at end of file
diff --git a/libraries/ActionBarSherlock/test/com/actionbarsherlock/internal/ResourcesCompatTest.java b/libraries/ActionBarSherlock/test/com/actionbarsherlock/internal/ResourcesCompatTest.java
new file mode 100644
index 000000000..f621d3a96
--- /dev/null
+++ b/libraries/ActionBarSherlock/test/com/actionbarsherlock/internal/ResourcesCompatTest.java
@@ -0,0 +1,23 @@
+package com.actionbarsherlock.internal;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+import static com.actionbarsherlock.internal.ActionBarSherlockCompat.cleanActivityName;
+import static org.fest.assertions.api.Assertions.assertThat;
+
+@RunWith(RobolectricTestRunner.class)
+public class ResourcesCompatTest {
+    @Test
+    public void testCleanActivityName() {
+        assertThat(cleanActivityName("com.jakewharton.test", "com.other.package.SomeClass")) //
+            .isEqualTo("com.other.package.SomeClass");
+        assertThat(cleanActivityName("com.jakewharton.test", "com.jakewharton.test.SomeClass")) //
+            .isEqualTo("com.jakewharton.test.SomeClass");
+        assertThat(cleanActivityName("com.jakewharton.test", "SomeClass")) //
+            .isEqualTo("com.jakewharton.test.SomeClass");
+        assertThat(cleanActivityName("com.jakewharton.test", ".ui.SomeClass")) //
+            .isEqualTo("com.jakewharton.test.ui.SomeClass");
+    }
+}
\ No newline at end of file