From 2bf5e9efde28cce8186b2cdf75d8fafb6c9125ad Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sun, 9 Jul 2017 00:46:24 -0700 Subject: Clean up and optimize --- colorpicker/build.gradle | 10 +-------- .../kau/colorpicker/ExampleInstrumentedTest.java | 26 ---------------------- .../allanwang/kau/colorpicker/ExampleUnitTest.java | 17 -------------- 3 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 colorpicker/src/androidTest/java/ca/allanwang/kau/colorpicker/ExampleInstrumentedTest.java delete mode 100644 colorpicker/src/test/java/ca/allanwang/kau/colorpicker/ExampleUnitTest.java (limited to 'colorpicker') diff --git a/colorpicker/build.gradle b/colorpicker/build.gradle index 5972ea3..c522e9f 100644 --- a/colorpicker/build.gradle +++ b/colorpicker/build.gradle @@ -1,20 +1,12 @@ -apply from: '../android.gradle' +apply from: '../android-lib.gradle' android { resourcePrefix "kau_color_" } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { - exclude group: 'com.android.support', module: 'support-annotations' - }) - testCompile 'junit:junit:4.12' compile project(':core') - compile "org.jetbrains.kotlin:kotlin-stdlib:${KOTLIN}" - testCompile "org.jetbrains.kotlin:kotlin-test-junit:${KOTLIN}" - compile "com.afollestad.material-dialogs:commons:${MATERIAL_DIALOG}" } diff --git a/colorpicker/src/androidTest/java/ca/allanwang/kau/colorpicker/ExampleInstrumentedTest.java b/colorpicker/src/androidTest/java/ca/allanwang/kau/colorpicker/ExampleInstrumentedTest.java deleted file mode 100644 index 2b22d0f..0000000 --- a/colorpicker/src/androidTest/java/ca/allanwang/kau/colorpicker/ExampleInstrumentedTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package ca.allanwang.kau.colorpicker; - -import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumentation test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() throws Exception { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getTargetContext(); - - assertEquals("ca.allanwang.kau.colorpicker.test", appContext.getPackageName()); - } -} diff --git a/colorpicker/src/test/java/ca/allanwang/kau/colorpicker/ExampleUnitTest.java b/colorpicker/src/test/java/ca/allanwang/kau/colorpicker/ExampleUnitTest.java deleted file mode 100644 index f974ff7..0000000 --- a/colorpicker/src/test/java/ca/allanwang/kau/colorpicker/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package ca.allanwang.kau.colorpicker; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() throws Exception { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file -- cgit v1.2.3