From 2e91246a45bfd0bec87902cdbbf255e8bd8e6cd3 Mon Sep 17 00:00:00 2001 From: cpfeiffer Date: Sun, 4 Sep 2016 22:52:55 +0200 Subject: [PATCH] Make sure that every Test class has at least one @Test method, or is abstract --- .../gadgetbridge/service/btle/BtLEQueueTest.java | 5 ++++- .../freeyourgadget/gadgetbridge/test/TestBase.java | 11 +++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueueTest.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueueTest.java index b8dd409b..1585cb7d 100644 --- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueueTest.java +++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueueTest.java @@ -1,5 +1,7 @@ package nodomain.freeyourgadget.gadgetbridge.service.btle; +import org.junit.Test; + import nodomain.freeyourgadget.gadgetbridge.test.TestBase; public class BtLEQueueTest extends TestBase { @@ -14,7 +16,8 @@ public class BtLEQueueTest extends TestBase { } + @Test public void testIsConnected() throws Exception { - + // TODO } } \ No newline at end of file diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/TestBase.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/TestBase.java index b70cf6e1..4f788f53 100644 --- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/TestBase.java +++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/TestBase.java @@ -4,6 +4,7 @@ import android.database.sqlite.SQLiteDatabase; import org.junit.After; import org.junit.Before; +import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; @@ -11,17 +12,18 @@ import org.robolectric.annotation.Config; import nodomain.freeyourgadget.gadgetbridge.BuildConfig; import nodomain.freeyourgadget.gadgetbridge.GBApplication; -import nodomain.freeyourgadget.gadgetbridge.GBException; import nodomain.freeyourgadget.gadgetbridge.database.DBHandler; import nodomain.freeyourgadget.gadgetbridge.entities.DaoMaster; import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; +import static org.junit.Assert.assertNotNull; + @RunWith(RobolectricTestRunner.class) @Config(constants = BuildConfig.class, sdk = 19) // need sdk 19 because "WITHOUT ROWID" is not supported in robolectric/sqlite4java -public class TestBase { +public abstract class TestBase { protected GBApplication app = (GBApplication) RuntimeEnvironment.application; protected DaoSession daoSession; protected DBHandler dbHandler; @@ -29,12 +31,15 @@ public class TestBase { @Before public void setUp() throws Exception { + assertNotNull(app); + // doesn't work with Robolectric yet // dbHandler = GBApplication.acquireDB(); // daoSession = dbHandler.getDaoSession(); DaoMaster.DevOpenHelper openHelper = new DaoMaster.DevOpenHelper(app, null, null); SQLiteDatabase db = openHelper.getWritableDatabase(); daoSession = new DaoMaster(db).newSession(); + assertNotNull(daoSession); } @After @@ -49,6 +54,4 @@ public class TestBase { return dummyGBDevice; } - - }