conflict resolved

snuhcs-course · Dec 1, 2023 · 629e1f9 · 629e1f9
2 parents 25fc468 + 82c789b
commit 629e1f9
Show file tree

Hide file tree

Showing 57 changed files with 2,740 additions and 587 deletions.
diff --git a/android/.idea/deploymentTargetDropDown.xml b/android/.idea/deploymentTargetDropDown.xml
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
@@ -27,6 +27,7 @@ android {
         vectorDrawables {
             useSupportLibrary = true
         }
+        // testFunctionalTest = true
 
         // get properties from `local.properties`
         buildConfigField("String", "API_BASE_URL", getProperty("API_BASE_URL"))
@@ -42,30 +43,37 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-
-    kotlinOptions {
-        jvmTarget = "17"
-    }
-
     buildFeatures {
         compose = true
         buildConfig = true
     }
 
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
     composeOptions {
         kotlinCompilerExtensionVersion = "1.4.3"
     }
 
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+
     packaging {
         resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+            excludes += "/META-INF/{AL2.0,LGPL2.1,LICENSE.md,LICENSE-notice.md}"
         }
     }
 
+    testOptions {
+        unitTests {
+            isReturnDefaultValues = true
+        }
+        animationsDisabled = true
+    }
+
     // hilt
     hilt {
         enableAggregatingTask = true
@@ -76,6 +84,7 @@ dependencies {
 
     implementation("androidx.core:core-ktx:1.9.0")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2")
 
     // jetpack compose
     implementation("androidx.activity:activity-compose:1.8.0")
@@ -96,18 +105,23 @@ dependencies {
     implementation("io.coil-kt:coil-compose:2.5.0")
 
     // test tools
-    testImplementation("junit:junit:4.13.2")
     testImplementation("androidx.test.ext:junit:1.1.5")
+    testImplementation("androidx.paging:paging-testing:3.2.1")
+    testImplementation("io.mockk:mockk:1.13.5")
+    testImplementation("junit:junit:4.13.2")
+    testImplementation ("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
     androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00"))
     androidTestImplementation("androidx.compose.ui:ui-test-junit4")
+    androidTestImplementation("io.mockk:mockk-android:1.13.5")
     debugImplementation("androidx.compose.ui:ui-tooling")
     debugImplementation("androidx.compose.ui:ui-test-manifest")
 
     // hilt
     implementation("com.google.dagger:hilt-android:2.44")
     kapt("com.google.dagger:hilt-android-compiler:2.44")
+    kaptAndroidTest("com.google.dagger:hilt-android-compiler:2.44")
 
     // navigation
     implementation("androidx.navigation:navigation-compose:2.5.3")

diff --git a/android/app/src/androidTest/java/com/goliath/emojihub/X3dDataSourceAndRepositoryImplTest.kt b/android/app/src/androidTest/java/com/goliath/emojihub/X3dDataSourceAndRepositoryImplTest.kt