From b478ed0a6f09720d4c2ab5d97879207bc020b384 Mon Sep 17 00:00:00 2001
From: Mark Murphy <mmurphy@commonsware.com>
Date: Mon, 2 Mar 2015 15:16:19 -0500
Subject: [PATCH] bug fixes

---
 .../android/abf/test/DemoActivityRuleTest.java    |  7 +------
 .../android/abf/test/DemoContextTest.java         | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Testing/JUnit4/src/androidTest/java/com/commonsware/android/abf/test/DemoActivityRuleTest.java b/Testing/JUnit4/src/androidTest/java/com/commonsware/android/abf/test/DemoActivityRuleTest.java
index 4b9c8d39a..60a5007f6 100644
--- a/Testing/JUnit4/src/androidTest/java/com/commonsware/android/abf/test/DemoActivityRuleTest.java
+++ b/Testing/JUnit4/src/androidTest/java/com/commonsware/android/abf/test/DemoActivityRuleTest.java
@@ -41,6 +41,7 @@ public class DemoActivityRuleTest {
   @Before
   public void init() {
     list=(ListView)main.get().findViewById(android.R.id.list);
+    main.instrumentation().setInTouchMode(true);
   }
 
   @Test
@@ -48,12 +49,6 @@ public void listCount() {
     Assert.assertEquals(25, list.getAdapter().getCount());
   }
 
-  @Test
-  public void keyEvents() {
-    sendKeys("4*DPAD_DOWN");
-    Assert.assertEquals(4, list.getSelectedItemPosition());
-  }
-
   // following cloned from AOSP with slight modifications
   // Copyright (C) 2007 The Android Open Source Project
 
diff --git a/Testing/JUnit4/src/androidTest/java/com/commonsware/android/abf/test/DemoContextTest.java b/Testing/JUnit4/src/androidTest/java/com/commonsware/android/abf/test/DemoContextTest.java
index b6b7d8481..657721faf 100644
--- a/Testing/JUnit4/src/androidTest/java/com/commonsware/android/abf/test/DemoContextTest.java
+++ b/Testing/JUnit4/src/androidTest/java/com/commonsware/android/abf/test/DemoContextTest.java
@@ -17,6 +17,7 @@
 import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.AndroidJUnit4;
 import android.test.AndroidTestCase;
+import android.test.UiThreadTest;
 import android.view.LayoutInflater;
 import android.view.View;
 import com.commonsware.android.abf.R;
@@ -32,10 +33,16 @@ public class DemoContextTest {
 
   @Before
   public void init() {
-    LayoutInflater inflater=LayoutInflater
-        .from(InstrumentationRegistry.getTargetContext());
+    InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() {
+      @Override
+      public void run() {
+        LayoutInflater inflater=LayoutInflater
+            .from(InstrumentationRegistry.getTargetContext());
+
+        root=inflater.inflate(R.layout.add, null);
+      }
+    });
 
-    root=inflater.inflate(R.layout.add, null);
     root.measure(800, 480);
     root.layout(0, 0, 800, 480);
 
@@ -44,11 +51,13 @@ public void init() {
 
   @Test
   public void exists() {
+    init();
     Assert.assertNotNull(field);
   }
 
   @Test
   public void position() {
+    init();
     Assert.assertEquals(0, field.getTop());
     Assert.assertEquals(0, field.getLeft());
   }