From 4d5935e323cb267c5250dd7a3a522e719cb378d3 Mon Sep 17 00:00:00 2001 From: vinodsama Date: Wed, 4 Nov 2020 11:56:34 -0500 Subject: [PATCH 1/5] Added unit for datasources and recording --- .../ui/DataSourcesRecodingPagesUITests.java | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 enabler/src/androidTest/java/com/openxc/ui/DataSourcesRecodingPagesUITests.java diff --git a/enabler/src/androidTest/java/com/openxc/ui/DataSourcesRecodingPagesUITests.java b/enabler/src/androidTest/java/com/openxc/ui/DataSourcesRecodingPagesUITests.java new file mode 100644 index 000000000..5fa34b596 --- /dev/null +++ b/enabler/src/androidTest/java/com/openxc/ui/DataSourcesRecodingPagesUITests.java @@ -0,0 +1,60 @@ +package com.openxc.ui; + +import android.preference.PreferenceManager; +import android.test.suitebuilder.annotation.LargeTest; + +import com.openxc.enabler.OpenXcEnablerActivity; +import com.openxcplatform.enabler.R; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner; +import androidx.test.rule.ActivityTestRule; + +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +@LargeTest +@RunWith(AndroidJUnit4ClassRunner.class) +public class DataSourcesRecodingPagesUITests { + + @Rule + public ActivityTestRule mActivityTestRule = new ActivityTestRule<>(OpenXcEnablerActivity.class); + + @Test + public void check_for_datasources_preference(){ + assertNotNull(onView(withId(R.xml.data_source_preferences))); + assertTrue(isShown(R.string.vehicle_interface_key)); + assertTrue(isShown(R.string.data_format_key)); + assertTrue(isShown(R.string.native_gps_checkbox_key)); + assertTrue(isShown(R.string.bluetooth_polling_key)); + assertFalse(isShown(R.string.network_host_key)); + assertFalse(isShown(R.string.network_port_key)); + assertFalse(isShown(R.string.trace_source_file_key)); + assertTrue(isShown(R.string.trace_source_playing_checkbox_key)); + assertTrue(isShown(R.string.phone_source_polling_checkbox_key)); + } + + @Test + public void check_for_recording_preference(){ + assertNotNull(onView(withId(R.xml.recording_preferences))); + assertTrue(isShown(R.string.recording_directory_key)); + assertTrue(isShown(R.string.uploading_checkbox_key)); + assertTrue(isShown(R.string.uploading_path_key)); + assertTrue(isShown(R.string.uploading_source_name_key)); + assertTrue(isShown(R.string.dweeting_checkbox_key)); + assertTrue(isShown(R.string.dweeting_thingname_key)); + + } + + public boolean isShown(int id){ + return PreferenceManager.getDefaultSharedPreferences(mActivityTestRule.getActivity().getApplicationContext()).contains( + mActivityTestRule.getActivity().getString(id)); + } + +} From a2d33973da9b8ee983b5b1a03bc1c16473a5dbff Mon Sep 17 00:00:00 2001 From: vinodsama Date: Wed, 4 Nov 2020 13:03:47 -0500 Subject: [PATCH 2/5] Resolving the test case with junit version --- library/build.gradle.local | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/build.gradle.local b/library/build.gradle.local index fc9529581..a9849f0cc 100644 --- a/library/build.gradle.local +++ b/library/build.gradle.local @@ -27,7 +27,7 @@ dependencies { implementation 'commons-io:commons-io:2.6' implementation 'androidx.legacy:legacy-support-v4:1.0.0-beta01' - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.8.1' testImplementation 'org.hamcrest:hamcrest-all:1.3' testImplementation 'org.mockito:mockito-core:2.23.0' testImplementation 'org.robolectric:robolectric:3.8' From adb6d38f70398030732aec9a4ee2be689c43d654 Mon Sep 17 00:00:00 2001 From: vinodsama Date: Wed, 4 Nov 2020 13:20:24 -0500 Subject: [PATCH 3/5] readded the version --- library/build.gradle.local | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/build.gradle.local b/library/build.gradle.local index a9849f0cc..fc9529581 100644 --- a/library/build.gradle.local +++ b/library/build.gradle.local @@ -27,7 +27,7 @@ dependencies { implementation 'commons-io:commons-io:2.6' implementation 'androidx.legacy:legacy-support-v4:1.0.0-beta01' - testImplementation 'junit:junit:4.8.1' + testImplementation 'junit:junit:4.12' testImplementation 'org.hamcrest:hamcrest-all:1.3' testImplementation 'org.mockito:mockito-core:2.23.0' testImplementation 'org.robolectric:robolectric:3.8' From 0cb792b4de76061d5014d688eb930acfacd6cd87 Mon Sep 17 00:00:00 2001 From: vinodsama Date: Thu, 5 Nov 2020 10:56:20 -0500 Subject: [PATCH 4/5] added import statement --- .../java/com/openxc/ui/DataSourcesRecodingPagesUITests.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/enabler/src/androidTest/java/com/openxc/ui/DataSourcesRecodingPagesUITests.java b/enabler/src/androidTest/java/com/openxc/ui/DataSourcesRecodingPagesUITests.java index 5fa34b596..5473ae997 100644 --- a/enabler/src/androidTest/java/com/openxc/ui/DataSourcesRecodingPagesUITests.java +++ b/enabler/src/androidTest/java/com/openxc/ui/DataSourcesRecodingPagesUITests.java @@ -15,9 +15,9 @@ import static androidx.test.espresso.Espresso.onView; import static androidx.test.espresso.matcher.ViewMatchers.withId; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static junit.framework.TestCase.assertFalse; +import static junit.framework.TestCase.assertNotNull; +import static junit.framework.TestCase.assertTrue; @LargeTest @RunWith(AndroidJUnit4ClassRunner.class) From 97044ccd57213036d0bf18d88b99428ad92367f0 Mon Sep 17 00:00:00 2001 From: vinodsama Date: Mon, 14 Dec 2020 12:10:11 -0500 Subject: [PATCH 5/5] updated testcases --- .../ui/DataSourcesRecodingPagesUITests.java | 54 +++++++++++++------ 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/enabler/src/androidTest/java/com/openxc/ui/DataSourcesRecodingPagesUITests.java b/enabler/src/androidTest/java/com/openxc/ui/DataSourcesRecodingPagesUITests.java index 5473ae997..4d8052ada 100644 --- a/enabler/src/androidTest/java/com/openxc/ui/DataSourcesRecodingPagesUITests.java +++ b/enabler/src/androidTest/java/com/openxc/ui/DataSourcesRecodingPagesUITests.java @@ -1,5 +1,7 @@ package com.openxc.ui; +import android.os.Handler; +import android.os.Looper; import android.preference.PreferenceManager; import android.test.suitebuilder.annotation.LargeTest; @@ -28,27 +30,45 @@ public class DataSourcesRecodingPagesUITests { @Test public void check_for_datasources_preference(){ - assertNotNull(onView(withId(R.xml.data_source_preferences))); - assertTrue(isShown(R.string.vehicle_interface_key)); - assertTrue(isShown(R.string.data_format_key)); - assertTrue(isShown(R.string.native_gps_checkbox_key)); - assertTrue(isShown(R.string.bluetooth_polling_key)); - assertFalse(isShown(R.string.network_host_key)); - assertFalse(isShown(R.string.network_port_key)); - assertFalse(isShown(R.string.trace_source_file_key)); - assertTrue(isShown(R.string.trace_source_playing_checkbox_key)); - assertTrue(isShown(R.string.phone_source_polling_checkbox_key)); + Handler handler = new Handler(Looper.getMainLooper()); + + handler.postDelayed(new Runnable() { + @Override + public void run() { + if (mActivityTestRule.getActivity() != null) { + assertNotNull(onView(withId(R.xml.data_source_preferences))); + assertTrue(isShown(R.string.vehicle_interface_key)); + assertTrue(isShown(R.string.data_format_key)); + assertTrue(isShown(R.string.native_gps_checkbox_key)); + assertTrue(isShown(R.string.bluetooth_polling_key)); + assertFalse(isShown(R.string.network_host_key)); + assertFalse(isShown(R.string.network_port_key)); + assertFalse(isShown(R.string.trace_source_file_key)); + assertTrue(isShown(R.string.trace_source_playing_checkbox_key)); + assertTrue(isShown(R.string.phone_source_polling_checkbox_key)); + } + } + }, 1000 ); + } @Test public void check_for_recording_preference(){ - assertNotNull(onView(withId(R.xml.recording_preferences))); - assertTrue(isShown(R.string.recording_directory_key)); - assertTrue(isShown(R.string.uploading_checkbox_key)); - assertTrue(isShown(R.string.uploading_path_key)); - assertTrue(isShown(R.string.uploading_source_name_key)); - assertTrue(isShown(R.string.dweeting_checkbox_key)); - assertTrue(isShown(R.string.dweeting_thingname_key)); + Handler handler = new Handler(Looper.getMainLooper()); + handler.postDelayed(new Runnable() { + @Override + public void run() { + if (mActivityTestRule.getActivity() != null) { + assertNotNull(onView(withId(R.xml.recording_preferences))); + assertTrue(isShown(R.string.recording_directory_key)); + assertTrue(isShown(R.string.uploading_checkbox_key)); + assertTrue(isShown(R.string.uploading_path_key)); + assertTrue(isShown(R.string.uploading_source_name_key)); + assertTrue(isShown(R.string.dweeting_checkbox_key)); + assertTrue(isShown(R.string.dweeting_thingname_key)); + } + } + }, 1000 ); }