* Fixes build fail due to an update of Robolectric, which seems to create services the wrong way

pyricau · pyricau · commit 311fa519b4e9 · 2012-08-16T15:58:36.000+02:00
* Catching Throwable when trying to load classes, to prevent exceptions in static blocks
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EBeansHolder.java b/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/EBeansHolder.java
@@ -169,7 +169,7 @@ public JClass refClass(String fullyQualifiedClassName) {
 		if (refClass == null) {
 			try {
 				refClass = codeModel.ref(fullyQualifiedClassName);
-			} catch (NoClassDefFoundError ignored) {
+			} catch (Throwable ignored) {
 				refClass = codeModel.directClass(fullyQualifiedClassName);
 			}
 			loadedClasses.put(fullyQualifiedClassName, refClass);
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/FakeClipboardManager.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/FakeClipboardManager.java
@@ -0,0 +1,26 @@
+package com.googlecode.androidannotations.test15;
+
+import android.text.ClipboardManager;
+
+import com.xtremelabs.robolectric.internal.Implementation;
+import com.xtremelabs.robolectric.internal.Implements;
+
+public class FakeClipboardManager extends ClipboardManager {
+
+	private CharSequence text;
+
+	@Override
+	public CharSequence getText() {
+		return text;
+	}
+
+	@Override
+	public void setText(CharSequence text) {
+		this.text = text;
+	}
+
+	@Override
+	public boolean hasText() {
+		return text != null;
+	}
+}
diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ServiceInjectionTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/com/googlecode/androidannotations/test15/ServiceInjectionTest.java
@@ -17,12 +17,30 @@
 
 import static org.fest.assertions.Assertions.assertThat;
 
+import java.lang.reflect.Field;
+import java.util.Map;
+
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import android.content.Context;
+
+import com.xtremelabs.robolectric.shadows.ShadowApplication;
+
 @RunWith(AndroidAnnotationsTestRunner.class)
 public class ServiceInjectionTest {
 
+	@Before
+	public void setup() throws Exception {
+		Field serviceMapField = ShadowApplication.class.getDeclaredField("SYSTEM_SERVICE_MAP");
+		serviceMapField.setAccessible(true);
+		@SuppressWarnings("unchecked")
+		Map<String, String> SYSTEM_SERVICE_MAP = (Map<String, String>) serviceMapField.get(null);
+
+		SYSTEM_SERVICE_MAP.put(Context.CLIPBOARD_SERVICE, "com.googlecode.androidannotations.test15.FakeClipboardManager");
+	}
+
 	@Test
 	public void servicesAreInjected() {
 		ActivityWithServices_ activity = new ActivityWithServices_();

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ public JClass refClass(String fullyQualifiedClassName) {`
`169`	`169`	`if (refClass == null) {`
`170`	`170`	`try {`
`171`	`171`	`refClass = codeModel.ref(fullyQualifiedClassName);`
`172`		`- } catch (NoClassDefFoundError ignored) {`
	`172`	`+ } catch (Throwable ignored) {`
`173`	`173`	`refClass = codeModel.directClass(fullyQualifiedClassName);`
`174`	`174`	`}`
`175`	`175`	`loadedClasses.put(fullyQualifiedClassName, refClass);`