Skip to content

Commit 771d83e

Browse files
committed
Merge pull request androidannotations#954 from yDelouis/953_fixTestJava7
Make tests pass with java 7
2 parents 962d54d + 648f6c7 commit 771d83e

2 files changed

Lines changed: 6 additions & 8 deletions

File tree

‎AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/receiver/ReceiverRegistrationTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ public void activity_with_invalid_registerAt_not_compile() throws IOException {
4646
public void activity_with_two_method_with_same_name_not_compile() throws IOException {
4747
CompileResult result = compileFiles(ActivityWithTwoSameNameMethod.class);
4848
assertCompilationErrorOn(ActivityWithTwoSameNameMethod.class, "@Receiver", result);
49-
assertCompilationErrorCount(2, result);
5049
}
5150

5251
@Test

‎AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ormlite/OrmLiteActivityTest.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@
1515
*/
1616
package org.androidannotations.test15.ormlite;
1717

18-
import static org.fest.assertions.Assertions.assertThat;
19-
18+
import org.androidannotations.test15.AndroidAnnotationsTestRunner;
2019
import org.junit.Before;
2120
import org.junit.Test;
2221
import org.junit.runner.RunWith;
2322

24-
import org.androidannotations.test15.AndroidAnnotationsTestRunner;
23+
import static org.fest.assertions.Assertions.assertThat;
2524

2625
@RunWith(AndroidAnnotationsTestRunner.class)
2726
public class OrmLiteActivityTest {
@@ -36,21 +35,21 @@ public void setup() {
3635

3736
@Test
3837
public void custom_dao_is_injected() {
39-
assertThat(activity.userDao).isNotNull();
38+
assertThat((Object) activity.userDao).isNotNull();
4039
}
4140

4241
@Test
4342
public void dao_is_injected() {
44-
assertThat(activity.carDao).isNotNull();
43+
assertThat((Object) activity.carDao).isNotNull();
4544
}
4645

4746
@Test
4847
public void bean_is_injected() {
49-
assertThat(activity.ormLiteBean).isNotNull();
48+
assertThat((Object) activity.ormLiteBean).isNotNull();
5049
}
5150

5251
@Test
5352
public void dao_in_bean_is_injected() {
54-
assertThat(activity.ormLiteBean.userDao).isNotNull();
53+
assertThat((Object) activity.ormLiteBean.userDao).isNotNull();
5554
}
5655
}

0 commit comments

Comments
 (0)