implement and write tests for GeneralSkillsRepo

gradle.properties

@@ -15,7 +15,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # Android operating system, and which are packaged with your app"s APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official

testomania/build.gradle

@@ -47,6 +47,11 @@ android {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
         }
     }
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+        }
+    }
 }
 
 dependencies {
@@ -58,11 +63,10 @@ dependencies {
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
     implementation 'androidx.activity:activity-compose:1.4.0'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
-    debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
+
+    // Serialization
+    implementation("com.squareup.moshi:moshi-kotlin:1.13.0")
+    kapt("com.squareup.moshi:moshi-kotlin-codegen:1.13.0")
 
     // Compose dependencies
     implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.4.1"
@@ -75,14 +79,24 @@ dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2'
 
     //Dagger - Hilt
-    implementation "com.google.dagger:hilt-android:2.38.1"
-    kapt "com.google.dagger:hilt-android-compiler:2.37"
+    implementation "com.google.dagger:hilt-android:2.41"
+    kapt "com.google.dagger:hilt-android-compiler:2.41"
     kapt "androidx.hilt:hilt-compiler:1.0.0"
 
     // Room
     implementation "androidx.room:room-runtime:2.4.2"
     implementation "androidx.room:room-ktx:2.4.2"
     kapt "androidx.room:room-compiler:2.4.2"
 
+    // Testing
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.robolectric:robolectric:4.6'
+    testImplementation group: 'com.google.dagger', name: 'hilt-android-testing', version: '2.41'
+    kaptTest 'com.google.dagger:hilt-android-compiler:2.41'
+    testImplementation "com.google.truth:truth:1.1.3"
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
+    debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.8.1'
 }

testomania/proguard-rules.pro

@@ -18,4 +18,44 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+# Keep `Companion` object fields of serializable classes.
+# This avoids serializer lookup through `getDeclaredClasses` as done for named companion objects.
+-if @kotlinx.serialization.Serializable class **
+-keepclassmembers class <1> {
+    static <1>$Companion Companion;
+}
+
+# Keep `serializer()` on companion objects (both default and named) of serializable classes.
+-if @kotlinx.serialization.Serializable class ** {
+    static **$* *;
+}
+-keepclassmembers class <2>$<3> {
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+# Keep `INSTANCE.serializer()` of serializable objects.
+-if @kotlinx.serialization.Serializable class ** {
+    public static ** INSTANCE;
+}
+-keepclassmembers class <1> {
+    public static <1> INSTANCE;
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+# @Serializable and @Polymorphic are used at runtime for polymorphic serialization.
+-keepattributes RuntimeVisibleAnnotations,AnnotationDefault
+
+# Serializer for classes with named companion objects are retrieved using `getDeclaredClasses`.
+# If you have any, uncomment and replace classes with those containing named companion objects.
+#-keepattributes InnerClasses # Needed for `getDeclaredClasses`.
+#-if @kotlinx.serialization.Serializable class
+#com.example.myapplication.HasNamedCompanion, # <-- List serializable classes with named companions.
+#com.example.myapplication.HasNamedCompanion2
+#{
+#    static **$* *;
+#}
+#-keepnames class <1>$$serializer { # -keepnames suffices; class is kept when serializer() is kept.
+#    static <1>$$serializer INSTANCE;
+#}

testomania/src/main/java/com/earth/testomania/di/AppModule.kt

@@ -1,13 +1,24 @@
 package com.earth.testomania.di
 
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import dagger.Module
+import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 object AppModule {
 
     //TODO provide DB instance and so on
+    @Provides
+    @Singleton
+    fun jsonSerializer(): Moshi {
+        return Moshi.Builder()
+            .addLast(KotlinJsonAdapterFactory())
+            .build()
+    }
 
 }

testomania/src/main/java/com/earth/testomania/domain/Test.kt

@@ -0,0 +1,4 @@
+package com.earth.testomania.domain
+
+class Test {
+}

testomania/src/main/java/com/earth/testomania/tests/general/GeneralSkillsMathematicalRepo.kt

@@ -0,0 +1,35 @@
+package com.earth.testomania.tests.general
+
+import android.content.Context
+import com.earth.testomania.R
+import com.earth.testomania.tests.general.dto.GeneralTestItemDTO
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.adapter
+import dagger.hilt.android.qualifiers.ApplicationContext
+import okio.buffer
+import okio.source
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GeneralSkillsMathematicalRepo @Inject constructor(
+    @ApplicationContext private val appContext: Context,
+    private val moshi: Moshi,
+) {
+
+    @OptIn(ExperimentalStdlibApi::class)
+    private val tests by lazy {
+        val rawJson = appContext.resources.openRawResource(R.raw.general_ability_test_data)
+        val adapter: JsonAdapter<List<GeneralTestItemDTO>> = moshi.adapter()
+        adapter.fromJson(rawJson.source().buffer()) ?: emptyList()
+    }
+
+    fun getAllTests(): List<GeneralTestItemDTO> {
+        return tests
+    }
+
+    fun getRandomTests(count: Int): List<GeneralTestItemDTO> {
+        return List(count) { tests.random() }
+    }
+}

testomania/src/main/java/com/earth/testomania/tests/general/dto/GeneralTestItemDTO.kt

@@ -0,0 +1,20 @@
+package com.earth.testomania.tests.general.dto
+
+import com.squareup.moshi.JsonClass
+
+
+@JsonClass(generateAdapter = true)
+data class GeneralTestItemDTO(
+//    val active: Int,
+//    val creator_id: Any,
+//    val description: Any,
+//    val grade: Any,
+    val id: Int,
+    val options: List<OptionDTO>,
+    val ordering: Int,
+    val question: String,
+//    val subject_id: Any,
+    val test_id: Int,
+//    val text_id: Any,
+//    val type_id: Int
+)

testomania/src/main/java/com/earth/testomania/tests/general/dto/OptionDTO.kt

@@ -0,0 +1,12 @@
+package com.earth.testomania.tests.general.dto
+
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class OptionDTO(
+    val correct: Int,
+    val id: Int,
+    val option: String,
+    val question_id: Int,
+//    val timeline: Any // what is this
+)