Fix #2967 Refactor packages for services (#2970)

* Move mocks and api util to testing module

* Remove completed explorations from data class

* Update fake JSON

* Add data objects for entry point

* Fix packages for services

* Fix JSON & data class to match

* Fix test package names & imports

* Revert "Remove completed explorations from data class"

This reverts commit 9c1b800.

* Revert "Update fake JSON"

This reverts commit ea0847a.

* Revert "Add data objects for entry point"

This reverts commit 445e320.

* Revert "Fix JSON & data class to match"

This reverts commit c9c0752.

* Remove extra data object changes

* Remove entry point data object

* Undo persistent cache store test change

* Move api utils to testing/network package

data/src/test/assets/api_mocks/feedback_reporting.json

@@ -1,36 +1,44 @@
 {
-  "api_key": "",
   "app_context": {
     "entry_point": "navigation_drawer",
+    "completed_exploration_ids": [
+      0,
+      1
+    ],
     "topic_progress": {},
     "text_size": "large",
     "text_lang": "EN",
     "audio_lang": "EN",
     "download_and_update_only_on_wifi": true,
     "automatically_update_topics": false,
-    "is_admin": false
+    "is_admin": false,
+    "event_logs": [
+      "example",
+      "event"
+    ],
+    "logcat_logs": [
+      "example",
+      "log"
+    ]
   },
   "device_context": {
     "device_model": "example_model",
     "sdk_version": 23,
     "device_brand": "example_brand",
     "build_fingerprint": "example_fingerprint_id",
-    "phone_type": "telephony_network_type",
-    "network_type": "wifi",
-    "device_lang": "EN"
+    "network_type": "wifi"
   },
-  "report_creation_timestamp": 1610519337000,
+  "report_creation_timestamp_ms": 1610519337000,
   "system_context": {
-    "package_name": "example.package.name",
-    "package_code": "example_version_code",
+    "version_name": "0.1-alpha-abcdef1234",
+    "package_version_code": 1,
     "country_locale": "IN",
     "language_locale": "EN"
   },
-  "user_feedback": {
+  "user_supplied_feedback": {
     "report_type": "suggestion",
     "category": "language_suggestion",
     "feedback_list": [],
     "user_input": "french"
   }
-
 }

data/src/test/java/org/oppia/android/data/backends/test/NetworkInterceptorTest.kt → data/src/test/java/org/oppia/android/data/backends/gae/NetworkInterceptorTest.kt

@@ -1,4 +1,4 @@
-package org.oppia.android.data.backends.test
+package org.oppia.android.data.backends.gae
 
 import android.app.Application
 import androidx.test.core.app.ApplicationProvider
@@ -11,10 +11,8 @@ import dagger.Provides
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.oppia.android.data.backends.ApiUtils
-import org.oppia.android.data.backends.api.MockTopicService
-import org.oppia.android.data.backends.gae.NetworkInterceptor
-import org.oppia.android.data.backends.gae.NetworkModule
+import org.oppia.android.testing.network.ApiUtils
+import org.oppia.android.testing.network.MockTopicService
 import org.robolectric.annotation.LooperMode
 import retrofit2.Retrofit
 import javax.inject.Inject

data/src/test/java/org/oppia/android/data/backends/test/MockClassroomTest.kt → data/src/test/java/org/oppia/android/data/backends/gae/api/ClassroomServiceTest.kt

@@ -1,15 +1,14 @@
-package org.oppia.android.data.backends.test
+package org.oppia.android.data.backends.gae.api
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import okhttp3.OkHttpClient
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.oppia.android.data.backends.api.MockClassroomService
 import org.oppia.android.data.backends.gae.NetworkInterceptor
 import org.oppia.android.data.backends.gae.NetworkSettings
-import org.oppia.android.data.backends.gae.api.ClassroomService
+import org.oppia.android.testing.network.MockClassroomService
 import org.robolectric.annotation.LooperMode
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
@@ -21,7 +20,7 @@ import retrofit2.mock.NetworkBehavior
  */
 @RunWith(AndroidJUnit4::class)
 @LooperMode(LooperMode.Mode.PAUSED)
-class MockClassroomTest {
+class ClassroomServiceTest {
   private lateinit var mockRetrofit: MockRetrofit
   private lateinit var retrofit: Retrofit
 

data/src/test/java/org/oppia/android/data/backends/test/MockConceptCardTest.kt → data/src/test/java/org/oppia/android/data/backends/gae/api/ConceptCardServiceTest.kt

@@ -1,15 +1,14 @@
-package org.oppia.android.data.backends.test
+package org.oppia.android.data.backends.gae.api
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import okhttp3.OkHttpClient
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.oppia.android.data.backends.api.MockConceptCardService
 import org.oppia.android.data.backends.gae.NetworkInterceptor
 import org.oppia.android.data.backends.gae.NetworkSettings
-import org.oppia.android.data.backends.gae.api.ConceptCardService
+import org.oppia.android.testing.network.MockConceptCardService
 import org.robolectric.annotation.LooperMode
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
@@ -21,7 +20,7 @@ import retrofit2.mock.NetworkBehavior
  */
 @RunWith(AndroidJUnit4::class)
 @LooperMode(LooperMode.Mode.PAUSED)
-class MockConceptCardTest {
+class ConceptCardServiceTest {
   private lateinit var mockRetrofit: MockRetrofit
   private lateinit var retrofit: Retrofit
 

data/src/test/java/org/oppia/android/data/backends/test/MockExplorationTest.kt → data/src/test/java/org/oppia/android/data/backends/gae/api/ExplorationServiceTest.kt

@@ -1,15 +1,14 @@
-package org.oppia.android.data.backends.test
+package org.oppia.android.data.backends.gae.api
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import okhttp3.OkHttpClient
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.oppia.android.data.backends.api.MockExplorationService
 import org.oppia.android.data.backends.gae.NetworkInterceptor
 import org.oppia.android.data.backends.gae.NetworkSettings
-import org.oppia.android.data.backends.gae.api.ExplorationService
+import org.oppia.android.testing.network.MockExplorationService
 import org.robolectric.annotation.LooperMode
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
@@ -21,7 +20,7 @@ import retrofit2.mock.NetworkBehavior
  */
 @RunWith(AndroidJUnit4::class)
 @LooperMode(LooperMode.Mode.PAUSED)
-class MockExplorationTest {
+class ExplorationServiceTest {
   private lateinit var mockRetrofit: MockRetrofit
   private lateinit var retrofit: Retrofit
 

data/src/test/java/org/oppia/android/data/backends/test/MockFeedbackReportingTest.kt → data/src/test/java/org/oppia/android/data/backends/gae/api/FeedbackReportingServiceTest.kt

@@ -1,4 +1,4 @@
-package org.oppia.android.data.backends.test
+package org.oppia.android.data.backends.gae.api
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
@@ -8,12 +8,11 @@ import okhttp3.OkHttpClient
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.oppia.android.data.backends.ApiUtils
-import org.oppia.android.data.backends.api.MockFeedbackReportingService
 import org.oppia.android.data.backends.gae.NetworkInterceptor
 import org.oppia.android.data.backends.gae.NetworkSettings
-import org.oppia.android.data.backends.gae.api.FeedbackReportingService
 import org.oppia.android.data.backends.gae.model.GaeFeedbackReport
+import org.oppia.android.testing.network.ApiUtils
+import org.oppia.android.testing.network.MockFeedbackReportingService
 import org.robolectric.annotation.LooperMode
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
@@ -23,7 +22,7 @@ import retrofit2.mock.NetworkBehavior
 /** Test for [FeedbackReportingService] retrofit instance using a [MockFeedbackReportingService]. */
 @RunWith(AndroidJUnit4::class)
 @LooperMode(LooperMode.Mode.PAUSED)
-class MockFeedbackReportingTest {
+class FeedbackReportingServiceTest {
   private lateinit var mockRetrofit: MockRetrofit
   private lateinit var retrofit: Retrofit
 

data/src/test/java/org/oppia/android/data/backends/test/MockQuestionPlayerTest.kt → data/src/test/java/org/oppia/android/data/backends/gae/api/QuestionPlayerServiceTest.kt

@@ -1,15 +1,14 @@
-package org.oppia.android.data.backends.test
+package org.oppia.android.data.backends.gae.api
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import okhttp3.OkHttpClient
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.oppia.android.data.backends.api.MockQuestionPlayerService
 import org.oppia.android.data.backends.gae.NetworkInterceptor
 import org.oppia.android.data.backends.gae.NetworkSettings
-import org.oppia.android.data.backends.gae.api.QuestionPlayerService
+import org.oppia.android.testing.network.MockQuestionPlayerService
 import org.robolectric.annotation.LooperMode
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
@@ -21,7 +20,7 @@ import retrofit2.mock.NetworkBehavior
  */
 @RunWith(AndroidJUnit4::class)
 @LooperMode(LooperMode.Mode.PAUSED)
-class MockQuestionPlayerTest {
+class QuestionPlayerServiceTest {
   private lateinit var mockRetrofit: MockRetrofit
   private lateinit var retrofit: Retrofit
 

data/src/test/java/org/oppia/android/data/backends/test/MockStoryTest.kt → data/src/test/java/org/oppia/android/data/backends/gae/api/StoryServiceTest.kt

@@ -1,15 +1,14 @@
-package org.oppia.android.data.backends.test
+package org.oppia.android.data.backends.gae.api
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import okhttp3.OkHttpClient
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.oppia.android.data.backends.api.MockStoryService
 import org.oppia.android.data.backends.gae.NetworkInterceptor
 import org.oppia.android.data.backends.gae.NetworkSettings
-import org.oppia.android.data.backends.gae.api.StoryService
+import org.oppia.android.testing.network.MockStoryService
 import org.robolectric.annotation.LooperMode
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
@@ -21,7 +20,7 @@ import retrofit2.mock.NetworkBehavior
  */
 @RunWith(AndroidJUnit4::class)
 @LooperMode(LooperMode.Mode.PAUSED)
-class MockStoryTest {
+class StoryServiceTest {
   private lateinit var mockRetrofit: MockRetrofit
   private lateinit var retrofit: Retrofit
 

data/src/test/java/org/oppia/android/data/backends/test/MockSubtopicTest.kt → data/src/test/java/org/oppia/android/data/backends/gae/api/SubtopicServiceTest.kt

@@ -1,15 +1,14 @@
-package org.oppia.android.data.backends.test
+package org.oppia.android.data.backends.gae.api
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import okhttp3.OkHttpClient
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.oppia.android.data.backends.api.MockSubtopicService
 import org.oppia.android.data.backends.gae.NetworkInterceptor
 import org.oppia.android.data.backends.gae.NetworkSettings
-import org.oppia.android.data.backends.gae.api.SubtopicService
+import org.oppia.android.testing.network.MockSubtopicService
 import org.robolectric.annotation.LooperMode
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
@@ -21,7 +20,7 @@ import retrofit2.mock.NetworkBehavior
  */
 @RunWith(AndroidJUnit4::class)
 @LooperMode(LooperMode.Mode.PAUSED)
-class MockSubtopicTest {
+class SubtopicServiceTest {
   private lateinit var mockRetrofit: MockRetrofit
   private lateinit var retrofit: Retrofit
 

data/src/test/java/org/oppia/android/data/backends/test/MockTopicTest.kt → data/src/test/java/org/oppia/android/data/backends/gae/api/TopicServiceTest.kt

@@ -1,15 +1,14 @@
-package org.oppia.android.data.backends.test
+package org.oppia.android.data.backends.gae.api
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import okhttp3.OkHttpClient
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.oppia.android.data.backends.api.MockTopicService
 import org.oppia.android.data.backends.gae.NetworkInterceptor
 import org.oppia.android.data.backends.gae.NetworkSettings
-import org.oppia.android.data.backends.gae.api.TopicService
+import org.oppia.android.testing.network.MockTopicService
 import org.robolectric.annotation.LooperMode
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
@@ -21,7 +20,7 @@ import retrofit2.mock.NetworkBehavior
  */
 @RunWith(AndroidJUnit4::class)
 @LooperMode(LooperMode.Mode.PAUSED)
-class MockTopicTest {
+class TopicServiceTest {
   private lateinit var mockRetrofit: MockRetrofit
   private lateinit var retrofit: Retrofit
 

data/src/test/java/org/oppia/android/data/backends/ApiUtils.kt → testing/src/main/java/org/oppia/android/testing/network/ApiUtils.kt

@@ -1,4 +1,4 @@
-package org.oppia.android.data.backends
+package org.oppia.android.testing.network
 
 import org.json.JSONException
 import org.json.JSONObject

data/src/test/java/org/oppia/android/data/backends/api/MockClassroomService.kt → testing/src/main/java/org/oppia/android/testing/network/MockClassroomService.kt

@@ -1,8 +1,7 @@
-package org.oppia.android.data.backends.api
+package org.oppia.android.testing.network
 
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
-import org.oppia.android.data.backends.ApiUtils
 import org.oppia.android.data.backends.gae.NetworkInterceptor
 import org.oppia.android.data.backends.gae.NetworkSettings
 import org.oppia.android.data.backends.gae.api.ClassroomService

data/src/test/java/org/oppia/android/data/backends/api/MockConceptCardService.kt → testing/src/main/java/org/oppia/android/testing/network/MockConceptCardService.kt

@@ -1,8 +1,7 @@
-package org.oppia.android.data.backends.api
+package org.oppia.android.testing.network
 
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
-import org.oppia.android.data.backends.ApiUtils
 import org.oppia.android.data.backends.gae.NetworkInterceptor
 import org.oppia.android.data.backends.gae.NetworkSettings
 import org.oppia.android.data.backends.gae.api.ConceptCardService

data/src/test/java/org/oppia/android/data/backends/api/MockExplorationService.kt → testing/src/main/java/org/oppia/android/testing/network/MockExplorationService.kt

@@ -1,8 +1,7 @@
-package org.oppia.android.data.backends.api
+package org.oppia.android.testing.network
 
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
-import org.oppia.android.data.backends.ApiUtils
 import org.oppia.android.data.backends.gae.NetworkInterceptor
 import org.oppia.android.data.backends.gae.NetworkSettings
 import org.oppia.android.data.backends.gae.api.ExplorationService

data/src/test/java/org/oppia/android/data/backends/api/MockFeedbackReportingService.kt → testing/src/main/java/org/oppia/android/testing/network/MockFeedbackReportingService.kt

@@ -1,11 +1,11 @@
-package org.oppia.android.data.backends.api
+package org.oppia.android.testing.network
 
 import org.oppia.android.data.backends.gae.api.FeedbackReportingService
 import org.oppia.android.data.backends.gae.model.GaeFeedbackReport
 import retrofit2.Call
 import retrofit2.mock.BehaviorDelegate
 
-/** Mock FeedbackReportingService to check that the service is properly requested. */
+/** Mock [FeedbackReportingService] to check that the service is properly requested. */
 class MockFeedbackReportingService(
   private val delegate: BehaviorDelegate<FeedbackReportingService>
 ) : FeedbackReportingService {

data/src/test/java/org/oppia/android/data/backends/api/MockQuestionPlayerService.kt → testing/src/main/java/org/oppia/android/testing/network/MockQuestionPlayerService.kt

@@ -1,8 +1,7 @@
-package org.oppia.android.data.backends.api
+package org.oppia.android.testing.network
 
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
-import org.oppia.android.data.backends.ApiUtils
 import org.oppia.android.data.backends.gae.NetworkInterceptor
 import org.oppia.android.data.backends.gae.NetworkSettings
 import org.oppia.android.data.backends.gae.api.QuestionPlayerService

data/src/test/java/org/oppia/android/data/backends/api/MockStoryService.kt → testing/src/main/java/org/oppia/android/testing/network/MockStoryService.kt

@@ -1,8 +1,7 @@
-package org.oppia.android.data.backends.api
+package org.oppia.android.testing.network
 
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
-import org.oppia.android.data.backends.ApiUtils
 import org.oppia.android.data.backends.gae.NetworkInterceptor
 import org.oppia.android.data.backends.gae.NetworkSettings
 import org.oppia.android.data.backends.gae.api.StoryService

data/src/test/java/org/oppia/android/data/backends/api/MockSubtopicService.kt → testing/src/main/java/org/oppia/android/testing/network/MockSubtopicService.kt

@@ -1,8 +1,7 @@
-package org.oppia.android.data.backends.api
+package org.oppia.android.testing.network
 
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
-import org.oppia.android.data.backends.ApiUtils
 import org.oppia.android.data.backends.gae.NetworkInterceptor
 import org.oppia.android.data.backends.gae.NetworkSettings
 import org.oppia.android.data.backends.gae.api.SubtopicService

data/src/test/java/org/oppia/android/data/backends/api/MockTopicService.kt → testing/src/main/java/org/oppia/android/testing/network/MockTopicService.kt

@@ -1,8 +1,7 @@
-package org.oppia.android.data.backends.api
+package org.oppia.android.testing.network
 
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
-import org.oppia.android.data.backends.ApiUtils
 import org.oppia.android.data.backends.gae.NetworkInterceptor
 import org.oppia.android.data.backends.gae.NetworkSettings
 import org.oppia.android.data.backends.gae.api.TopicService