oppia-969: Fixed some tests and cleaned up code

jjoseba · Apr 20, 2023 · ce58af3 · ce58af3
1 parent b441e9c
commit ce58af3
Show file tree

Hide file tree

Showing 116 changed files with 56 additions and 269 deletions.
diff --git a/app/src/androidTest/java/androidTestFiles/activities/TagActivityUITest.java b/app/src/androidTest/java/androidTestFiles/activities/TagActivityUITest.java
@@ -30,7 +30,6 @@
 
 import java.util.ArrayList;
 
-import androidTestFiles.utils.parent.BaseTest;
 import androidTestFiles.utils.parent.MockedApiEndpointTest;
 
 @RunWith(AndroidJUnit4.class)

diff --git a/app/src/androidTest/java/androidTestFiles/database/BaseTestDB.java b/app/src/androidTest/java/androidTestFiles/database/BaseTestDB.java
@@ -1,26 +1,18 @@
 package androidTestFiles.database;
 
-import android.Manifest;
 import android.content.Context;
 import android.content.SharedPreferences;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;
 
-import org.digitalcampus.oppia.application.App;
 import org.digitalcampus.oppia.database.DbHelper;
-import org.digitalcampus.oppia.di.AppComponent;
-import org.digitalcampus.oppia.di.AppModule;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 
-import androidx.test.rule.GrantPermissionRule;
-
 import androidTestFiles.utils.parent.DaggerInjectMockUITest;
-import it.cosenonjaviste.daggermock.DaggerMockRule;
 
 import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Matchers.anyInt;

diff --git a/app/src/androidTest/java/androidTestFiles/database/QuizTest.java b/app/src/androidTest/java/androidTestFiles/database/QuizTest.java
@@ -6,12 +6,10 @@
 import androidx.test.rule.GrantPermissionRule;
 
 import org.digitalcampus.oppia.model.QuizAttempt;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;

diff --git a/app/src/androidTest/java/androidTestFiles/features/MetadataUtilsTest.java b/app/src/androidTest/java/androidTestFiles/features/MetadataUtilsTest.java
@@ -22,7 +22,6 @@
 import java.util.Map;
 
 import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 
 @RunWith(AndroidJUnit4.class)

diff --git a/app/src/androidTest/java/androidTestFiles/features/course/CourseInfoTaskTest.java b/app/src/androidTest/java/androidTestFiles/features/course/CourseInfoTaskTest.java
@@ -1,6 +1,5 @@
 package androidTestFiles.features.course;
 
-import android.Manifest;
 import android.content.Context;
 
 import androidx.test.platform.app.InstrumentationRegistry;
@@ -10,15 +9,13 @@
 import org.digitalcampus.oppia.task.CourseInfoTask;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 
 import java.util.concurrent.CountDownLatch;
 
 import androidTestFiles.utils.FileUtils;
 import androidTestFiles.utils.MockApiEndpoint;
 import androidTestFiles.utils.parent.MockedApiEndpointTaskTest;
-import androidx.test.rule.GrantPermissionRule;
 
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNull;

diff --git a/app/src/androidTest/java/androidTestFiles/features/course/UpdateCourseActivityTest.java b/app/src/androidTest/java/androidTestFiles/features/course/UpdateCourseActivityTest.java
@@ -1,7 +1,5 @@
 package androidTestFiles.features.course;
 
-import static org.junit.Assert.assertTrue;
-
 /**
 @RunWith(AndroidJUnit4.class)
 public class UpdateCourseActivityTest {

diff --git a/app/src/androidTest/java/androidTestFiles/features/courseMedia/CourseMediaBaseTest.java b/app/src/androidTest/java/androidTestFiles/features/courseMedia/CourseMediaBaseTest.java
@@ -1,6 +1,5 @@
 package androidTestFiles.features.courseMedia;
 
-import android.Manifest;
 import android.content.Context;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -9,7 +8,6 @@
 import org.digitalcampus.oppia.utils.storage.Storage;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.runner.RunWith;
 
 import java.io.File;
@@ -19,7 +17,6 @@
 import androidTestFiles.utils.CourseUtils;
 import androidTestFiles.utils.FileUtils;
 import androidTestFiles.database.TestDBHelper;
-import androidx.test.rule.GrantPermissionRule;
 
 @RunWith(AndroidJUnit4.class)
 public abstract class CourseMediaBaseTest extends DaggerInjectMockUITest {

diff --git a/...rc/androidTest/java/androidTestFiles/features/passwordProtected/AdminProtectedUITest.java b/...rc/androidTest/java/androidTestFiles/features/passwordProtected/AdminProtectedUITest.java
@@ -27,7 +27,6 @@
 
 import androidx.preference.PreferenceManager;
 import androidx.test.core.app.ActivityScenario;
-import androidx.test.espresso.Espresso;
 import androidx.test.espresso.contrib.RecyclerViewActions;
 import androidx.test.espresso.matcher.ViewMatchers;
 import androidx.test.platform.app.InstrumentationRegistry;

diff --git a/...oidTest/java/androidTestFiles/features/passwordProtected/TopicsPasswordProtectedTest.java b/...oidTest/java/androidTestFiles/features/passwordProtected/TopicsPasswordProtectedTest.java
@@ -1,6 +1,5 @@
 package androidTestFiles.features.passwordProtected;
 
-import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.Espresso.pressBack;
 import static androidx.test.espresso.action.ViewActions.click;
 import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard;
@@ -34,7 +33,6 @@
 import android.content.SharedPreferences;
 
 import androidx.test.core.app.ActivityScenario;
-import androidx.test.espresso.contrib.DrawerActions;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;
 

diff --git a/app/src/androidTest/java/androidTestFiles/fragments/LeaderboardFragmentTest.java b/app/src/androidTest/java/androidTestFiles/fragments/LeaderboardFragmentTest.java
@@ -17,10 +17,6 @@
 import androidx.test.rule.GrantPermissionRule;
 
 import static androidx.fragment.app.testing.FragmentScenario.launchInContainer;
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
 
 @RunWith(AndroidJUnit4.class)
 public class LeaderboardFragmentTest extends MockedApiEndpointTest {

diff --git a/app/src/androidTest/java/androidTestFiles/services/CoursesChecksWorkerTest.java b/app/src/androidTest/java/androidTestFiles/services/CoursesChecksWorkerTest.java
@@ -1,12 +1,10 @@
 package androidTestFiles.services;
 
-import android.Manifest;
 import android.content.Context;
 import android.util.Log;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.rule.GrantPermissionRule;
 import androidx.test.uiautomator.By;
 import androidx.test.uiautomator.UiDevice;
 import androidx.test.uiautomator.Until;
@@ -18,17 +16,13 @@
 
 import org.digitalcampus.mobile.learning.BuildConfig;
 import org.digitalcampus.mobile.learning.R;
-import org.digitalcampus.oppia.application.App;
-import org.digitalcampus.oppia.di.AppComponent;
-import org.digitalcampus.oppia.di.AppModule;
 import org.digitalcampus.oppia.model.Course;
 import org.digitalcampus.oppia.model.CoursesRepository;
 import org.digitalcampus.oppia.model.User;
 import org.digitalcampus.oppia.service.CoursesChecksWorkerManager;
 import org.digitalcampus.oppia.service.CoursesChecksWorker;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -38,7 +32,6 @@
 
 import androidTestFiles.utils.CourseUtils;
 import androidTestFiles.utils.parent.NotificationsUiTest;
-import it.cosenonjaviste.daggermock.DaggerMockRule;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;

diff --git a/app/src/androidTest/java/androidTestFiles/utils/CourseUtils.java b/app/src/androidTest/java/androidTestFiles/utils/CourseUtils.java
@@ -28,7 +28,6 @@
 import java.util.ArrayList;
 import java.util.concurrent.CountDownLatch;
 
-import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyLong;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

diff --git a/app/src/androidTest/java/androidTestFiles/utils/UITestActionsUtils.java b/app/src/androidTest/java/androidTestFiles/utils/UITestActionsUtils.java
@@ -24,7 +24,6 @@
 import com.google.android.material.tabs.TabLayout;
 
 import org.hamcrest.Matcher;
-import org.hamcrest.Matchers;
 
 public class UITestActionsUtils {
 

diff --git a/app/src/androidTest/java/androidTestFiles/utils/matchers/SpinnerMatcher.java b/app/src/androidTest/java/androidTestFiles/utils/matchers/SpinnerMatcher.java
@@ -3,8 +3,6 @@
 import android.view.View;
 import android.widget.Spinner;
 
-import com.google.android.apps.common.testing.accessibility.framework.replacements.TextUtils;
-
 import org.digitalcampus.oppia.utils.TextUtilsJava;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;

diff --git a/app/src/androidTest/java/androidTestFiles/utils/parent/NotificationsUiTest.java b/app/src/androidTest/java/androidTestFiles/utils/parent/NotificationsUiTest.java
@@ -1,13 +1,10 @@
 package androidTestFiles.utils.parent;
 
-import android.Manifest;
 import android.content.Intent;
 
 import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.rule.GrantPermissionRule;
 
 import org.junit.After;
-import org.junit.Rule;
 
 public class NotificationsUiTest extends DaggerInjectMockUITest {
 

diff --git a/app/src/main/assets/custom_fields.json b/app/src/main/assets/custom_fields.json
@@ -1,7 +1,58 @@
 {
-  "fields": [],
+  "fields": [
+    {
+      "name":"gender",
+      "label":"Gender",
+      "order":8,
+      "required":false,
+      "helper_text":"",
+      "collection":"genders",
+      "type":"choices"
+    },
+    {
+      "name":"age",
+      "label":"Age",
+      "order":8,
+      "required":false,
+      "helper_text":"",
+      "type":"int"
+    },
+    {
+      "name":"pr1",
+      "label":"Profile field 1",
+      "order":11,
+      "required":false,
+      "helper_text":"",
+      "type":"boolean"
+    },
+    {
+      "name":"pr2",
+      "label":"Profile field 2",
+      "order":12,
+      "required":false,
+      "helper_text":"Helper hepling you",
+      "type":"str"
+    },
+    {
+      "name":"pr3",
+      "label":"Profile field 3",
+      "order":12,
+      "required":false,
+      "helper_text":"Helper hepling you",
+      "type":"str"
+    }
+  ],
   "required_fields": ["email"],
-  "collections": [],
+  "collections": [
+    {
+      "collection_name": "genders",
+      "items": [
+        {"id": "female", "value":"Female"},
+        {"id": "male", "value":"Male"},
+        {"id": "prefer_not_to_say", "value":"Prefer not to say"}
+      ]
+    }
+  ],
   "register_steps": [
     {
       "order": 1,
@@ -30,6 +81,8 @@
         "email",
         "phoneno",
         "organisation",
+        "gender",
+        "age",
         "jobtitle"
       ]
     }

diff --git a/app/src/main/java/org/digitalcampus/mobile/quiz/model/questiontypes/MultiSelect.java b/app/src/main/java/org/digitalcampus/mobile/quiz/model/questiontypes/MultiSelect.java
@@ -24,7 +24,6 @@
 import org.digitalcampus.mobile.quiz.Quiz;
 import org.digitalcampus.mobile.quiz.model.QuizQuestion;
 import org.digitalcampus.mobile.quiz.model.Response;
-import org.digitalcampus.oppia.utils.UIUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
 

diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/ActivityLogActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/ActivityLogActivity.java
@@ -1,7 +1,6 @@
 package org.digitalcampus.oppia.activity;
 
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/AnalyticsOptinActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/AnalyticsOptinActivity.java
@@ -1,6 +1,5 @@
 package org.digitalcampus.oppia.activity;
 
-import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 

diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/ChangePasswordActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/ChangePasswordActivity.java
@@ -2,15 +2,13 @@
 
 import android.app.AlertDialog;
 import android.os.Bundle;
-import android.text.TextUtils;
 
 import org.digitalcampus.mobile.learning.R;
 import org.digitalcampus.mobile.learning.databinding.ActivityChangePasswordBinding;
 import org.digitalcampus.oppia.api.ApiEndpoint;
 import org.digitalcampus.oppia.application.App;
 import org.digitalcampus.oppia.model.User;
 import org.digitalcampus.oppia.task.ChangePasswordTask;
-import org.digitalcampus.oppia.task.UpdateProfileTask;
 import org.digitalcampus.oppia.utils.TextUtilsJava;
 
 import javax.inject.Inject;

diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/CourseQuizAttemptsActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/CourseQuizAttemptsActivity.java
@@ -4,12 +4,9 @@
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
 
 import org.digitalcampus.mobile.learning.R;
 import org.digitalcampus.mobile.learning.databinding.ActivityCourseQuizAttemptsBinding;
-import org.digitalcampus.mobile.learning.databinding.ActivityQuizAttemptBinding;
 import org.digitalcampus.oppia.adapter.QuizAttemptAdapter;
 import org.digitalcampus.oppia.model.QuizAttempt;
 import org.digitalcampus.oppia.model.QuizAttemptRepository;
@@ -20,8 +17,6 @@
 
 import javax.inject.Inject;
 
-import androidx.recyclerview.widget.RecyclerView;
-
 public class CourseQuizAttemptsActivity extends AppActivity {
 
     public static final String SHOW_ATTEMPT_BUTTON = "show_attempt_button";

diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/DeviceListActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/DeviceListActivity.java
@@ -18,7 +18,6 @@
 package org.digitalcampus.oppia.activity;
 
 
-import android.Manifest;
 import android.app.Activity;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
@@ -31,11 +30,9 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.Window;
-import android.widget.Button;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
 
 import org.digitalcampus.mobile.learning.R;
 import org.digitalcampus.mobile.learning.databinding.ActivityDeviceListBinding;
@@ -47,7 +44,6 @@
 import org.digitalcampus.oppia.utils.UIUtils;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 

diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/DownloadActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/DownloadActivity.java
@@ -21,7 +21,6 @@
 import android.content.IntentFilter;
 import android.os.Bundle;
 
-import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -57,7 +56,6 @@
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.Callable;