Search menu functionality and film grading refractor

app/src/androidTest/java/com/github/sdp/mediato/AuthenticationActivityTest.java

@@ -133,19 +133,22 @@ public void startTests() {
     public void testSignInWorks() {
 
         login();
-        ViewInteraction loginButton = onView(withId(R.id.google_sign_in));
-        loginButton.perform(click());
+        Database.deleteUser(databaseUser.getUsername()).thenAccept(u -> {
 
-        // select the account if google account selector pops up
-        try {
-            device.findObject(By.textContains("@")).click();
-        } catch (NullPointerException e) {
-            System.out.println("Object wasn't found");
-        }
+            ViewInteraction loginButton = onView(withId(R.id.google_sign_in));
+            loginButton.perform(click());
 
-        Intents.intended(hasComponent(NewProfileActivity.class.getName()));
+            // select the account if google account selector pops up
+            try {
+                device.findObject(By.textContains("@")).click();
+            } catch (NullPointerException e) {
+                System.out.println("Object wasn't found");
+            }
 
-        logout();
+            Intents.intended(hasComponent(NewProfileActivity.class.getName()));
+
+            logout();
+        });
     }
 
     /**

app/src/androidTest/java/com/github/sdp/mediato/CreateProfileFragmentTest.java

@@ -14,6 +14,7 @@
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.TextView;
+
 import androidx.annotation.IntDef;
 import androidx.fragment.app.FragmentManager;
 import androidx.test.core.app.ActivityScenario;
@@ -23,16 +24,19 @@
 import androidx.test.espresso.matcher.BoundedMatcher;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;
+
 import com.google.android.material.textfield.TextInputLayout;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
+
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
 /**
  * Instrumented test, which will execute on an Android device.
  *
@@ -146,7 +150,7 @@ public void testUsernameTextInputRemoveErrorWhenUsernameValid() {
 
   private interface viewFunction {
 
-    public CharSequence getText(View view);
+    CharSequence getText(View view);
   }
 
   private static Matcher<View> hasText(final String expectedErrorText, viewFunction fct) {

app/src/androidTest/java/com/github/sdp/mediato/DatabaseTests/CollectionsTests.java

@@ -5,21 +5,24 @@
 import static org.junit.Assert.assertTrue;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+
 import com.github.sdp.mediato.data.Database;
 import com.github.sdp.mediato.model.Location;
 import com.github.sdp.mediato.model.Review;
 import com.github.sdp.mediato.model.User;
 import com.github.sdp.mediato.model.media.Collection;
 import com.github.sdp.mediato.model.media.Movie;
+
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
 
 
 @RunWith(AndroidJUnit4.class)
@@ -29,7 +32,7 @@
  */
 public class CollectionsTests {
     private final static int STANDARD_COLLECTION_TIMEOUT = 10;
-    private User user1 = new User.UserBuilder("uniqueId1")
+    private final User user1 = new User.UserBuilder("uniqueId1")
         .setUsername("user_test_1")
         .setEmail("email_test_1")
         .setRegisterDate("09/03/2023")
@@ -39,18 +42,18 @@ public class CollectionsTests {
     private Collection collection1;
     private Collection collection2;
 
-    private Review review1 = new Review(user1.getUsername(),
+    private final Review review1 = new Review(user1.getUsername(),
         new Movie("Harry Potter 1", "the chosen one", "url", 1));
-    private Review review2 = new Review(user1.getUsername(),
+    private final Review review2 = new Review(user1.getUsername(),
         new Movie("Harry Potter 2", "the chosen two", "url", 2), 9);
-    private Review review3 = new Review(user1.getUsername(),
+    private final Review review3 = new Review(user1.getUsername(),
         new Movie("Harry Potter 3", "the chosen three", "url", 3), 2, "meh");
 
-    private Map<String, Review> reviews1 = new HashMap<>() {
+    private final Map<String, Review> reviews1 = new HashMap<>() {
     };
-    private Map<String, Review> reviews2 = new HashMap<>() {
+    private final Map<String, Review> reviews2 = new HashMap<>() {
     };
-    private Map<String, Review> reviews3 = new HashMap<>() {
+    private final Map<String, Review> reviews3 = new HashMap<>() {
     };