-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into 25-geolocation-map
- Loading branch information
Showing
20 changed files
with
228 additions
and
466 deletions.
There are no files selected for viewing
176 changes: 21 additions & 155 deletions
176
app/src/androidTest/java/com/example/scanpal/AddEditEventFragmentTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,174 +1,40 @@ | ||
| package com.example.scanpal; | ||
|
|
||
| import static androidx.test.espresso.Espresso.onData; | ||
| import static androidx.test.espresso.Espresso.onView; | ||
| import static androidx.test.espresso.action.ViewActions.clearText; | ||
| import static androidx.test.espresso.action.ViewActions.click; | ||
| import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard; | ||
| import static androidx.test.espresso.action.ViewActions.typeText; | ||
| import static androidx.test.espresso.assertion.ViewAssertions.matches; | ||
| import static androidx.test.espresso.intent.Intents.init; | ||
| import static androidx.test.espresso.intent.Intents.release; | ||
| import static androidx.test.espresso.intent.matcher.IntentMatchers.hasAction; | ||
| import static androidx.test.espresso.matcher.ViewMatchers.withId; | ||
| import static androidx.test.espresso.matcher.ViewMatchers.withText; | ||
| import static org.hamcrest.CoreMatchers.anything; | ||
| import static org.hamcrest.CoreMatchers.instanceOf; | ||
| import static org.hamcrest.CoreMatchers.is; | ||
|
|
||
| import android.app.Activity; | ||
| import android.app.Instrumentation; | ||
| import android.content.Intent; | ||
| import android.net.Uri; | ||
|
|
||
| import androidx.test.espresso.intent.Intents; | ||
| import androidx.test.ext.junit.rules.ActivityScenarioRule; | ||
| import androidx.fragment.app.testing.FragmentScenario; | ||
| import androidx.lifecycle.Lifecycle; | ||
| import androidx.test.espresso.Espresso; | ||
| import androidx.test.espresso.assertion.ViewAssertions; | ||
| import androidx.test.espresso.matcher.ViewMatchers; | ||
| import androidx.test.ext.junit.runners.AndroidJUnit4; | ||
| import androidx.test.filters.LargeTest; | ||
|
|
||
| import com.google.firebase.firestore.DocumentReference; | ||
| import com.google.firebase.firestore.FirebaseFirestore; | ||
| import com.google.firebase.firestore.QueryDocumentSnapshot; | ||
|
|
||
| import org.junit.After; | ||
| import org.junit.Before; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
|
|
||
| @RunWith(AndroidJUnit4.class) | ||
| @LargeTest | ||
| public class AddEditEventFragmentTest { | ||
|
|
||
| private final User testUser = new User("test1", "Test1", "Testuser", "token"); | ||
| @Rule | ||
| public ActivityScenarioRule<MainActivity> scenario = new ActivityScenarioRule<>(MainActivity.class); | ||
|
|
||
| @Before | ||
| public void setUp() { | ||
| init(); | ||
|
|
||
| onView(withId(R.id.addUsername)).perform(typeText(testUser.getUsername()), closeSoftKeyboard()); | ||
| onView(withId(R.id.addFirstName)).perform(typeText(testUser.getFirstName()), closeSoftKeyboard()); | ||
| onView(withId(R.id.addLastName)).perform(typeText(testUser.getLastName()), closeSoftKeyboard()); | ||
| onView(withId(R.id.addUserContinue)).perform(click()); | ||
|
|
||
| try { | ||
| Thread.sleep(500); | ||
| } catch (InterruptedException e) { | ||
| e.printStackTrace(); | ||
| return; | ||
| } | ||
|
|
||
| onView(withId(R.id.createUserButton)).perform(click()); | ||
| try { | ||
| Thread.sleep(1000); | ||
| } catch (InterruptedException e) { | ||
| e.printStackTrace(); | ||
| } | ||
| } | ||
|
|
||
| @After | ||
| public void tearDown() { | ||
| FirebaseFirestore db = FirebaseFirestore.getInstance(); | ||
| db.collection("Users").document(testUser.getUsername()).delete(); | ||
| release(); | ||
| } | ||
|
|
||
| /** | ||
| * Test adding an event with valid inputs. | ||
| */ | ||
| @Test | ||
| public void testAddEvent() { | ||
| onView(withId(R.id.button_add_event)).perform(click()); | ||
|
|
||
| addEvent("Test Event 1", "Test Location", "Test Description", 100); | ||
| onData(is(instanceOf(String.class))).inAdapterView(withId(R.id.event_grid)).atPosition(0).check(matches(withText("Test Event 1"))); | ||
|
|
||
| cleanUp(); | ||
| FragmentScenario<AddEditEventFragment> scenario = FragmentScenario.launchInContainer(AddEditEventFragment.class); | ||
| scenario.moveToState(Lifecycle.State.STARTED); | ||
| } | ||
|
|
||
| /** | ||
| * Test editing an event with valid inputs. | ||
| * Tests the UI components' visibility in the AddEditEventFragment. | ||
| */ | ||
| @Test | ||
| public void testEditEvent() { | ||
| onView(withId(R.id.button_add_event)).perform(click()); | ||
|
|
||
| addEvent("Test Event 1", "Test Location", "Test Description", 100); | ||
| onData(anything()).inAdapterView(withId(R.id.event_grid)).atPosition(0).perform(click()); | ||
| onView(withId(R.id.event_editButton)).perform(click()); | ||
| editEvent("Test Event 2", "Updated test Location", "Updated test description", 200); | ||
| onView(withId(R.id.event_details_backButton)).perform(click()); | ||
| try { | ||
| Thread.sleep(1000); | ||
| } catch (InterruptedException e) { | ||
| e.printStackTrace(); | ||
| } | ||
| onData(is(instanceOf(String.class))).inAdapterView(withId(R.id.event_grid)).atPosition(0).check(matches(withText("Test Event 2"))); | ||
| cleanUp(); | ||
| } | ||
|
|
||
| private void addEvent(String name, String loc, String desc, int maxAttendee) { | ||
| Intent resultData = new Intent(); | ||
| resultData.setData(Uri.parse("android.resource://com.example.scanpal/" + R.raw.test_image)); | ||
| Instrumentation.ActivityResult result = new Instrumentation.ActivityResult(Activity.RESULT_OK, resultData); | ||
| Intents.intending(hasAction(Intent.ACTION_PICK)).respondWith(result); | ||
|
|
||
| onView(withId(R.id.add_edit_event_Name)).perform(typeText(name), closeSoftKeyboard()); | ||
| // TODO change the location data to valid one | ||
| onView(withId(R.id.add_edit_event_Location)).perform(typeText(loc), closeSoftKeyboard()); | ||
| onView(withId(R.id.add_edit_event_description)).perform(typeText(desc), closeSoftKeyboard()); | ||
| onView(withId(R.id.add_edit_event_Attendees)).perform(typeText(String.valueOf(maxAttendee)), closeSoftKeyboard()); | ||
| onView(withId(R.id.add_edit_event_imageButton)).perform(click()); | ||
|
|
||
| onView(withId(R.id.add_edit_save_button)).perform(click()); | ||
|
|
||
| try { | ||
| Thread.sleep(1000); | ||
| } catch (InterruptedException e) { | ||
| e.printStackTrace(); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| private void editEvent(String name, String loc, String desc, int maxAttendee) { | ||
| Intent resultData = new Intent(); | ||
| resultData.setData(Uri.parse("android.resource://com.example.scanpal/" + R.raw.test_image)); | ||
| Instrumentation.ActivityResult result = new Instrumentation.ActivityResult(Activity.RESULT_OK, resultData); | ||
| Intents.intending(hasAction(Intent.ACTION_PICK)).respondWith(result); | ||
|
|
||
| onView(withId(R.id.add_edit_event_Name)).perform(clearText(), typeText(name), closeSoftKeyboard()); | ||
| // TODO change the location data to valid one | ||
| onView(withId(R.id.add_edit_event_Location)).perform(clearText(), typeText(loc), closeSoftKeyboard()); | ||
| onView(withId(R.id.add_edit_event_description)).perform(clearText(), typeText(desc), closeSoftKeyboard()); | ||
| onView(withId(R.id.add_edit_event_Attendees)).perform(clearText(), typeText(String.valueOf(maxAttendee)), closeSoftKeyboard()); | ||
| onView(withId(R.id.add_edit_event_imageButton)).perform(click()); | ||
|
|
||
| onView(withId(R.id.add_edit_save_button)).perform(click()); | ||
|
|
||
| try { | ||
| Thread.sleep(1000); | ||
| } catch (InterruptedException e) { | ||
| e.printStackTrace(); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Delete all the events from db created by the test user. | ||
| */ | ||
| private void cleanUp() { | ||
| FirebaseFirestore db = FirebaseFirestore.getInstance(); | ||
| DocumentReference userRef = db.collection("Users").document(testUser.getUsername()); | ||
| db.collection("Events") | ||
| .whereEqualTo("organizer", userRef) | ||
| .get() | ||
| .addOnCompleteListener(task -> { | ||
| if (task.isComplete()) { | ||
| for (QueryDocumentSnapshot doc : task.getResult()) { | ||
| db.collection("Events").document(doc.getId()).delete(); | ||
| } | ||
| } | ||
| }); | ||
| public void testUIVisibility() { | ||
| Espresso.onView(ViewMatchers.withId(R.id.add_edit_backButton)).check(ViewAssertions.matches(ViewMatchers.isDisplayed())); | ||
| Espresso.onView(ViewMatchers.withId(R.id.add_edit_save_button)).check(ViewAssertions.matches(ViewMatchers.isDisplayed())); | ||
| Espresso.onView(ViewMatchers.withId(R.id.add_edit_event_ImageView)).check(ViewAssertions.matches(ViewMatchers.isDisplayed())); | ||
| Espresso.onView(ViewMatchers.withId(R.id.add_edit_event_imageButton)).check(ViewAssertions.matches(ViewMatchers.isDisplayed())); | ||
| Espresso.onView(ViewMatchers.withId(R.id.max_attendees)).check(ViewAssertions.matches(ViewMatchers.isDisplayed())); | ||
| Espresso.onView(ViewMatchers.withId(R.id.add_edit_event_Attendees)).check(ViewAssertions.matches(ViewMatchers.isDisplayed())); | ||
| Espresso.onView(ViewMatchers.withId(R.id.add_edit_event_Name)).check(ViewAssertions.matches(ViewMatchers.isDisplayed())); | ||
| Espresso.onView(ViewMatchers.withId(R.id.add_edit_event_Location)).check(ViewAssertions.matches(ViewMatchers.isDisplayed())); | ||
| Espresso.onView(ViewMatchers.withId(R.id.add_edit_event_description)).check(ViewAssertions.matches(ViewMatchers.isDisplayed())); | ||
| Espresso.onView(ViewMatchers.withId(R.id.add_edit_deleteButton)).check(ViewAssertions.matches(ViewMatchers.isDisplayed())); | ||
| Espresso.onView(ViewMatchers.withId(R.id.add_edit_save_button)).check(ViewAssertions.matches(ViewMatchers.isDisplayed())); | ||
| } | ||
| } | ||
| } |
112 changes: 21 additions & 91 deletions
112
app/src/androidTest/java/com/example/scanpal/EditProfileFragmentTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,110 +1,40 @@ | ||
| package com.example.scanpal; | ||
|
|
||
| import static androidx.test.espresso.Espresso.onView; | ||
| import static androidx.test.espresso.action.ViewActions.clearText; | ||
| import static androidx.test.espresso.action.ViewActions.click; | ||
| import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard; | ||
| import static androidx.test.espresso.action.ViewActions.typeText; | ||
| import static androidx.test.espresso.assertion.ViewAssertions.matches; | ||
| import static androidx.test.espresso.intent.Intents.init; | ||
| import static androidx.test.espresso.intent.Intents.release; | ||
| import static androidx.test.espresso.intent.matcher.IntentMatchers.hasAction; | ||
| import static androidx.test.espresso.matcher.ViewMatchers.withId; | ||
| import static androidx.test.espresso.matcher.ViewMatchers.withText; | ||
|
|
||
| import android.app.Activity; | ||
| import android.app.Instrumentation; | ||
| import android.content.Intent; | ||
| import android.net.Uri; | ||
|
|
||
| import androidx.test.espresso.intent.Intents; | ||
| import androidx.test.ext.junit.rules.ActivityScenarioRule; | ||
| import androidx.fragment.app.testing.FragmentScenario; | ||
| import androidx.lifecycle.Lifecycle; | ||
| import androidx.test.espresso.Espresso; | ||
| import androidx.test.espresso.assertion.ViewAssertions; | ||
| import androidx.test.espresso.matcher.ViewMatchers; | ||
| import androidx.test.ext.junit.runners.AndroidJUnit4; | ||
|
|
||
| import com.google.firebase.firestore.FirebaseFirestore; | ||
|
|
||
| import org.junit.After; | ||
| import org.junit.Before; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
|
|
||
| @RunWith(AndroidJUnit4.class) | ||
| public class EditProfileFragmentTest { | ||
| private final User testUser = new User("test1", "Test1", "Testuser", "token"); | ||
| @Rule | ||
| public ActivityScenarioRule<MainActivity> scenario = new ActivityScenarioRule<>(MainActivity.class); | ||
|
|
||
| @Before | ||
| public void setUp() { | ||
| init(); | ||
|
|
||
| onView(withId(R.id.addUsername)).perform(typeText(testUser.getUsername()), closeSoftKeyboard()); | ||
| onView(withId(R.id.addFirstName)).perform(typeText(testUser.getFirstName()), closeSoftKeyboard()); | ||
| onView(withId(R.id.addLastName)).perform(typeText(testUser.getLastName()), closeSoftKeyboard()); | ||
| onView(withId(R.id.addUserContinue)).perform(click()); | ||
|
|
||
| try { | ||
| Thread.sleep(500); | ||
| } catch (InterruptedException e) { | ||
| e.printStackTrace(); | ||
| return; | ||
| } | ||
|
|
||
| onView(withId(R.id.createUserButton)).perform(click()); | ||
| try { | ||
| Thread.sleep(1000); | ||
| } catch (InterruptedException e) { | ||
| e.printStackTrace(); | ||
| } | ||
| } | ||
|
|
||
| @After | ||
| public void tearDown() { | ||
| FirebaseFirestore db = FirebaseFirestore.getInstance(); | ||
| db.collection("Users").document(testUser.getUsername()).delete(); | ||
| release(); | ||
| FragmentScenario<EditProfileFragment> scenario = FragmentScenario.launchInContainer(EditProfileFragment.class); | ||
| scenario.moveToState(Lifecycle.State.STARTED); | ||
| } | ||
|
|
||
| /** | ||
| * Test editing profile with valid inputs. | ||
| * Tests the UI components' visibility in the EditProfileFragment. | ||
| */ | ||
| @Test | ||
| public void testEditProfile() { | ||
| onView(withId(R.id.button_profile)).perform(click()); | ||
| onView(withId(R.id.button_edit_profile)).perform(click()); | ||
|
|
||
| try { | ||
| Thread.sleep(500); | ||
| } catch (InterruptedException e) { | ||
| e.printStackTrace(); | ||
| } | ||
|
|
||
| Intent resultData = new Intent(); | ||
| resultData.setData(Uri.parse("android.resource://com.example.scanpal/" + R.raw.test_image)); | ||
| Instrumentation.ActivityResult result = new Instrumentation.ActivityResult(Activity.RESULT_OK, resultData); | ||
| Intents.intending(hasAction(Intent.ACTION_PICK)).respondWith(result); | ||
|
|
||
| String newFirstName = "Updated First Name"; | ||
| String newLastName = "Updated Last Name"; | ||
| String aboutMe = "Hi, I'm test user"; | ||
|
|
||
|
|
||
| onView(withId(R.id.upload_button)).perform(click()); | ||
| onView(withId(R.id.first_name_edittext)).perform(clearText(), typeText(newFirstName), closeSoftKeyboard()); | ||
| onView(withId(R.id.last_name_edittext)).perform(clearText(), typeText(newLastName), closeSoftKeyboard()); | ||
| onView(withId(R.id.about_me_edittext)).perform(clearText(), typeText(aboutMe), closeSoftKeyboard()); | ||
| onView(withId(R.id.save_button)).perform(click()); | ||
|
|
||
| try { | ||
| Thread.sleep(1000); | ||
| } catch (InterruptedException e) { | ||
| e.printStackTrace(); | ||
| } | ||
|
|
||
| onView(withId(R.id.addUsername)).check(matches(withText(testUser.getUsername()))); | ||
| onView(withId(R.id.first_name)).check(matches(withText(newFirstName))); | ||
| onView(withId(R.id.last_name)).check(matches(withText(newLastName))); | ||
| public void testUIVisibility() { | ||
| Espresso.onView(ViewMatchers.withId(R.id.button_go_back)).check(ViewAssertions.matches(ViewMatchers.isDisplayed())); | ||
| Espresso.onView(ViewMatchers.withId(R.id.reset_button)).check(ViewAssertions.matches(ViewMatchers.isDisplayed())); | ||
| Espresso.onView(ViewMatchers.withId(R.id.profile_page_image)).check(ViewAssertions.matches(ViewMatchers.isDisplayed())); | ||
| Espresso.onView(ViewMatchers.withId(R.id.delete_button)).check(ViewAssertions.matches(ViewMatchers.isDisplayed())); | ||
| Espresso.onView(ViewMatchers.withId(R.id.upload_button)).check(ViewAssertions.matches(ViewMatchers.isDisplayed())); | ||
| Espresso.onView(ViewMatchers.withId(R.id.username)).check(ViewAssertions.matches(ViewMatchers.isDisplayed())); | ||
| Espresso.onView(ViewMatchers.withId(R.id.first_name)).check(ViewAssertions.matches(ViewMatchers.isDisplayed())); | ||
| Espresso.onView(ViewMatchers.withId(R.id.last_name)).check(ViewAssertions.matches(ViewMatchers.isDisplayed())); | ||
| Espresso.onView(ViewMatchers.withId(R.id.about_me)).check(ViewAssertions.matches(ViewMatchers.isDisplayed())); | ||
| Espresso.onView(ViewMatchers.withId(R.id.geolocation)).check(ViewAssertions.matches(ViewMatchers.isDisplayed())); | ||
| Espresso.onView(ViewMatchers.withId(R.id.save_button)).check(ViewAssertions.matches(ViewMatchers.isDisplayed())); | ||
| } | ||
|
|
||
| } | ||
| } |
Oops, something went wrong.