oppia · BenHenning · Apr 15, 2021 · Mar 23, 2021 · Mar 23, 2021 · Mar 23, 2021
@@ -125,6 +125,12 @@ bind(
     actual = "//tools/android:compiler_annotation_processor",
 )
 
+http_archive(
+    name = "protobuf_tools",
+    strip_prefix = "protobuf-%s" % HTTP_DEPENDENCY_VERSIONS["protobuf_tools"]["version"],
+    urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v{0}/protobuf-all-{0}.zip".format(HTTP_DEPENDENCY_VERSIONS["protobuf_tools"]["version"])],
+)
+
 load("@rules_jvm_external//:defs.bzl", "maven_install")
 
 # Note to developers: new dependencies should be added to //third_party:versions.bzl, not here.

@@ -12,7 +12,7 @@ import org.oppia.android.app.topic.TopicActivityPresenter
 import org.oppia.android.app.topic.TopicFragment
 import org.oppia.android.app.topic.questionplayer.QuestionPlayerActivity
 import org.oppia.android.app.topic.revisioncard.RevisionCardActivity
-import org.oppia.android.domain.topic.TEST_STORY_ID_1
+import org.oppia.android.domain.topic.TEST_STORY_ID_0
 import org.oppia.android.domain.topic.TEST_TOPIC_ID_0
 import javax.inject.Inject
 
@@ -33,7 +33,7 @@ class TopicTestActivityForStory :
     topicActivityPresenter.handleOnCreate(
       internalProfileId = 0,
       topicId = TEST_TOPIC_ID_0,
-      storyId = TEST_STORY_ID_1
+      storyId = TEST_STORY_ID_0
     )
   }
 

@@ -499,8 +499,8 @@ class HomeActivityTest {
    * # Logic for recommendation system
    *
    * We always recommend the next topic that all dependencies are completed for. If a topic with
-   * prerequisites is completed out-of-order (e.g. test topic 1 above) then we assume fractions is already done.
-   * In the same way, finishing test topic 2 means there's nothing else to recommend.
+   * prerequisites is completed out-of-order (e.g. test topic 1 above) then we assume fractions is
+   * already done. In the same way, finishing test topic 2 means there's nothing else to recommend.
    */
   @Test
   fun testHomeActivity_markStory0DonePlayStory1FirstTestTopic_playFractionsTopic_orderIsCorrect() {
@@ -513,7 +513,7 @@ class HomeActivityTest {
       profileId = profileId1,
       timestampOlderThanOneWeek = false
     )
-    storyProgressTestHelper.markRecentlyPlayedTestTopic0Story1Exp1(
+    storyProgressTestHelper.markRecentlyPlayedTestTopic1Story0(
       profileId = profileId1,
       timestampOlderThanOneWeek = false
     )
@@ -525,23 +525,23 @@ class HomeActivityTest {
         targetViewId = R.id.recently_played_stories_text_view,
         stringToMatch = context.getString(R.string.stories_for_you)
       )
-      scrollToPositionOfPromotedList(position = 1)
+      scrollToPositionOfPromotedList(position = 0)
       verifyTextOnPromotedListItemAtPosition(
         itemPosition = 0,
         targetViewId = R.id.topic_name_text_view,
-        stringToMatch = "Fractions"
+        stringToMatch = "Second Test Topic"
       )
       scrollToPositionOfPromotedList(position = 1)
       verifyTextOnPromotedListItemAtPosition(
         itemPosition = 1,
         targetViewId = R.id.topic_name_text_view,
-        stringToMatch = "Ratios and Proportional Reasoning"
+        stringToMatch = "Fractions"
       )
       scrollToPositionOfPromotedList(position = 2)
       verifyTextOnPromotedListItemAtPosition(
         itemPosition = 2,
         targetViewId = R.id.topic_name_text_view,
-        stringToMatch = "First Test Topic"
+        stringToMatch = "Ratios and Proportional Reasoning"
       )
     }
   }
@@ -825,7 +825,7 @@ class HomeActivityTest {
       verifyTextOnHomeListItemAtPosition(
         itemPosition = 3,
         targetViewId = R.id.lesson_count_text_view,
-        stringToMatch = "5 Lessons"
+        stringToMatch = "2 Lessons"
       )
     }
   }

@@ -54,8 +54,8 @@ import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerModule
 import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfigurationModule
 import org.oppia.android.domain.question.QuestionModule
 import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule
-import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_1
-import org.oppia.android.domain.topic.TEST_STORY_ID_1
+import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_2
+import org.oppia.android.domain.topic.TEST_STORY_ID_0
 import org.oppia.android.domain.topic.TEST_TOPIC_ID_0
 import org.oppia.android.testing.RobolectricModule
 import org.oppia.android.testing.TestCoroutineDispatchers
@@ -115,7 +115,7 @@ class StoryActivityTest {
       createStoryActivityIntent(
         internalProfileId = internalProfileId,
         topicId = TEST_TOPIC_ID_0,
-        storyId = TEST_STORY_ID_1
+        storyId = TEST_STORY_ID_0
       )
     )
     val title = activityTestRule.activity.title
@@ -131,7 +131,7 @@ class StoryActivityTest {
       createStoryActivityIntent(
         internalProfileId = internalProfileId,
         topicId = TEST_TOPIC_ID_0,
-        storyId = TEST_STORY_ID_1
+        storyId = TEST_STORY_ID_0
       )
     ).use {
       testCoroutineDispatchers.runCurrent()
@@ -153,7 +153,7 @@ class StoryActivityTest {
         allOf(
           hasExtra(
             ExplorationActivity.EXPLORATION_ACTIVITY_EXPLORATION_ID_ARGUMENT_KEY,
-            TEST_EXPLORATION_ID_1
+            TEST_EXPLORATION_ID_2
           ),
           hasComponent(ExplorationActivity::class.java.name)
         )

@@ -87,8 +87,8 @@ import org.oppia.android.domain.question.QuestionModule
 import org.oppia.android.domain.topic.FRACTIONS_STORY_ID_0
 import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID
 import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule
-import org.oppia.android.domain.topic.TEST_STORY_ID_1
-import org.oppia.android.domain.topic.TEST_TOPIC_ID_1
+import org.oppia.android.domain.topic.TEST_STORY_ID_0
+import org.oppia.android.domain.topic.TEST_TOPIC_ID_0
 import org.oppia.android.testing.RobolectricModule
 import org.oppia.android.testing.TestCoroutineDispatchers
 import org.oppia.android.testing.TestDispatcherModule
@@ -303,9 +303,9 @@ class StoryFragmentTest {
       ).check(
         matches(
           withText(
-            "This is outline/summary for Second Exploration. It is very long but " +
-              "it has to be fully visible. You wil be learning about oppia app in Second Story. " +
-              "Learn about oppia app via testing in second exploration."
+            "This is the outline/summary for the first exploration of the story. It is very long " +
+              "but it has to be fully visible. You wil be learning about Oppia interactions. " +
+              "There is no second story to follow-up, but there is a second chapter."
           )
         )
       )
@@ -331,9 +331,9 @@ class StoryFragmentTest {
       ).check(
         matches(
           withText(
-            "This is outline/summary for Second Exploration. It is very long but " +
-              "it has to be fully visible. You wil be learning about oppia app in Second Story. " +
-              "Learn about oppia app via testing in second exploration."
+            "This is the outline/summary for the first exploration of the story. It is very long " +
+              "but it has to be fully visible. You wil be learning about Oppia interactions. " +
+              "There is no second story to follow-up, but there is a second chapter."
           )
         )
       )
@@ -600,8 +600,8 @@ class StoryFragmentTest {
     return StoryActivity.createStoryActivityIntent(
       ApplicationProvider.getApplicationContext(),
       internalProfileId,
-      TEST_TOPIC_ID_1,
-      TEST_STORY_ID_1
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0
     )
   }
 

@@ -131,10 +131,11 @@ class TopicTestActivityForStoryTest {
   fun testTopicTestActivityForStory_playTopicTab_storyItemIsExpanded() {
     launch(TopicTestActivityForStory::class.java).use {
       testCoroutineDispatchers.runCurrent()
+      // Story 0 of the topic should be expanded.
       onView(
         atPositionOnView(
           recyclerViewId = R.id.story_summary_recycler_view,
-          position = 2,
+          position = 1,
           targetViewId = R.id.chapter_recycler_view
         )
       ).check(matches(isDisplayed()))

@@ -5,15 +5,61 @@ This library contains the frontend controller and business service logic for the
 
 load("@dagger//:workspace_defs.bzl", "dagger_rules")
 load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library")
+load("//domain:domain_assets.bzl", "generate_assets_list_from_text_protos")
 load("//domain:domain_test.bzl", "domain_test")
 
+DOMAIN_ASSETS = generate_assets_list_from_text_protos(
+    name = "domain_assets",
+    exploration_file_names = [
+        "test_exp_id_2",
+        "13",
+        "test_exp_id_4",
+        "umPkwp0L1M0-",
+        "MjZzEVOG47_1",
+        "2mzzFVDLuAj8",
+        "5NWuolNcwH6e",
+        "k2bQ7z5XHNbK",
+        "tIoSb3HZFN6e",
+    ],
+    skills_file_names = [
+        "skills",
+    ],
+    story_file_names = [
+        "test_story_id_0",
+        "test_story_id_2",
+        "wANbh4oOClga",
+        "wAMdg4oOClga",
+        "xBSdg4oOClga",
+    ],
+    subtopic_file_names = [
+        "GJ2rLXRKD5hw_1",
+        "GJ2rLXRKD5hw_2",
+        "GJ2rLXRKD5hw_3",
+        "GJ2rLXRKD5hw_4",
+        "omzF4oqgeTXd_1",
+    ],
+    topic_file_names = [
+        "test_topic_id_0",
+        "test_topic_id_1",
+        "test_topic_id_2",
+        "GJ2rLXRKD5hw",
+        "omzF4oqgeTXd",
+    ],
+    topic_list_file_names = [
+        "topics",
+    ],
+)
+
 kt_android_library(
     name = "domain",
     srcs = glob(
         ["src/main/java/org/oppia/android/domain/**/*.kt"],
         exclude = ["src/main/java/org/oppia/android/domain/testing/**/*.kt"],
     ),
-    assets = glob(["src/main/assets/**"]),
+    assets = glob(
+        ["src/main/assets/**"],
+        exclude = ["src/main/assets/**/*.textproto"],
+    ) + DOMAIN_ASSETS,
     assets_dir = "src/main/assets/",
     custom_package = "org.oppia.android.domain",
     manifest = "src/main/AndroidManifest.xml",