From 44450eeb85d2072296ef3f6394e9d19998ac567a Mon Sep 17 00:00:00 2001
From: Mohamed Metwalli <mohamed.metwalli@sap.com>
Date: Tue, 8 Jun 2021 14:09:26 +0200
Subject: [PATCH] =?UTF-8?q?Clean=20testing=20package=20(=F0=9F=91=A8?=
=?UTF-8?q?=E2=80=8D=F0=9F=92=BB)=20(#3371)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Clean testing package
* Delete actions
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
---
.../GreenCertificateTestFragment.kt | 34 -----------
.../GreenCertificateTestFragmentModule.kt | 18 ------
.../GreenCertificateTestFragmentViewModel.kt | 15 -----
.../test/menu/ui/TestMenuFragmentViewModel.kt | 4 --
.../ui/main/MainActivityTestModule.kt | 10 ----
.../vaccination/ui/VaccinationTestFragment.kt | 54 ------------------
.../ui/VaccinationTestFragmentModule.kt | 18 ------
.../ui/VaccinationTestFragmentViewModel.kt | 15 -----
.../fragment_test_green_certificate.xml | 21 -------
.../res/layout/fragment_test_vaccination.xml | 57 -------------------
.../res/navigation/test_nav_graph.xml | 33 -----------
11 files changed, 279 deletions(-)
delete mode 100644 Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/greencertificate/GreenCertificateTestFragment.kt
delete mode 100644 Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/greencertificate/GreenCertificateTestFragmentModule.kt
delete mode 100644 Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/greencertificate/GreenCertificateTestFragmentViewModel.kt
delete mode 100644 Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/vaccination/ui/VaccinationTestFragment.kt
delete mode 100644 Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/vaccination/ui/VaccinationTestFragmentModule.kt
delete mode 100644 Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/vaccination/ui/VaccinationTestFragmentViewModel.kt
delete mode 100644 Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_green_certificate.xml
delete mode 100644 Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_vaccination.xml
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/greencertificate/GreenCertificateTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/greencertificate/GreenCertificateTestFragment.kt
deleted file mode 100644
index 4667f7a03..000000000
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/greencertificate/GreenCertificateTestFragment.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package de.rki.coronawarnapp.test.greencertificate
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.view.View
-import androidx.fragment.app.Fragment
-import de.rki.coronawarnapp.R
-import de.rki.coronawarnapp.databinding.FragmentTestGreenCertificateBinding
-import de.rki.coronawarnapp.test.menu.ui.TestMenuItem
-import de.rki.coronawarnapp.util.di.AutoInject
-import de.rki.coronawarnapp.util.ui.viewBinding
-import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
-import de.rki.coronawarnapp.util.viewmodel.cwaViewModels
-import javax.inject.Inject
-
-@SuppressLint("SetTextI18n")
-class GreenCertificateTestFragment : Fragment(R.layout.fragment_test_green_certificate), AutoInject {
-
- @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory
- private val viewModel: GreenCertificateTestFragmentViewModel by cwaViewModels { viewModelFactory }
- private val binding by viewBinding<FragmentTestGreenCertificateBinding>()
-
- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
- super.onViewCreated(view, savedInstanceState)
- }
-
- companion object {
- val MENU_ITEM = TestMenuItem(
- title = "Green Certificate",
- description = "View & Control green certificate related features.",
- targetId = R.id.greenCertificateTestFragment
- )
- }
-}
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/greencertificate/GreenCertificateTestFragmentModule.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/greencertificate/GreenCertificateTestFragmentModule.kt
deleted file mode 100644
index c7bfa9d62..000000000
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/greencertificate/GreenCertificateTestFragmentModule.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package de.rki.coronawarnapp.test.greencertificate
-
-import dagger.Binds
-import dagger.Module
-import dagger.multibindings.IntoMap
-import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
-import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactory
-import de.rki.coronawarnapp.util.viewmodel.CWAViewModelKey
-
-@Module
-abstract class GreenCertificateTestFragmentModule {
- @Binds
- @IntoMap
- @CWAViewModelKey(GreenCertificateTestFragmentViewModel::class)
- abstract fun testVaccinationFragment(
- factory: GreenCertificateTestFragmentViewModel.Factory
- ): CWAViewModelFactory<out CWAViewModel>
-}
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/greencertificate/GreenCertificateTestFragmentViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/greencertificate/GreenCertificateTestFragmentViewModel.kt
deleted file mode 100644
index 274a2af66..000000000
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/greencertificate/GreenCertificateTestFragmentViewModel.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package de.rki.coronawarnapp.test.greencertificate
-
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
-import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
-import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
-import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
-
-class GreenCertificateTestFragmentViewModel @AssistedInject constructor(
- dispatcherProvider: DispatcherProvider,
-) : CWAViewModel(dispatcherProvider = dispatcherProvider) {
-
- @AssistedFactory
- interface Factory : SimpleCWAViewModelFactory<GreenCertificateTestFragmentViewModel>
-}
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuFragmentViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuFragmentViewModel.kt
index 915453e16..5481b8257 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuFragmentViewModel.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuFragmentViewModel.kt
@@ -11,7 +11,6 @@ import de.rki.coronawarnapp.test.crash.ui.SettingsCrashReportFragment
import de.rki.coronawarnapp.test.datadonation.ui.DataDonationTestFragment
import de.rki.coronawarnapp.test.debugoptions.ui.DebugOptionsFragment
import de.rki.coronawarnapp.test.deltaonboarding.ui.DeltaonboardingFragment
-import de.rki.coronawarnapp.test.greencertificate.GreenCertificateTestFragment
import de.rki.coronawarnapp.test.hometestcards.ui.HomeTestCardsFragment
import de.rki.coronawarnapp.test.keydownload.ui.KeyDownloadTestFragment
import de.rki.coronawarnapp.test.playground.ui.PlaygroundFragment
@@ -22,7 +21,6 @@ import de.rki.coronawarnapp.test.tasks.ui.TestTaskControllerFragment
import de.rki.coronawarnapp.util.ui.SingleLiveEvent
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
-import de.rki.coronawarnapp.vaccination.ui.VaccinationTestFragment
class TestMenuFragmentViewModel @AssistedInject constructor() : CWAViewModel() {
@@ -43,8 +41,6 @@ class TestMenuFragmentViewModel @AssistedInject constructor() : CWAViewModel() {
PresenceTracingTestFragment.MENU_ITEM,
HomeTestCardsFragment.MENU_ITEM,
CoronaTestTestFragment.MENU_ITEM,
- VaccinationTestFragment.MENU_ITEM,
- GreenCertificateTestFragment.MENU_ITEM,
).let { MutableLiveData(it) }
}
val showTestScreenEvent = SingleLiveEvent<TestMenuItem>()
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt
index 7827f307a..65aa2e652 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt
@@ -16,8 +16,6 @@ import de.rki.coronawarnapp.test.debugoptions.ui.DebugOptionsFragment
import de.rki.coronawarnapp.test.debugoptions.ui.DebugOptionsFragmentModule
import de.rki.coronawarnapp.test.deltaonboarding.ui.DeltaOnboardingFragmentModule
import de.rki.coronawarnapp.test.deltaonboarding.ui.DeltaonboardingFragment
-import de.rki.coronawarnapp.test.greencertificate.GreenCertificateTestFragment
-import de.rki.coronawarnapp.test.greencertificate.GreenCertificateTestFragmentModule
import de.rki.coronawarnapp.test.hometestcards.ui.HomeTestCardsFragment
import de.rki.coronawarnapp.test.hometestcards.ui.HomeTestCardsFragmentModule
import de.rki.coronawarnapp.test.keydownload.ui.KeyDownloadTestFragment
@@ -36,8 +34,6 @@ import de.rki.coronawarnapp.test.submission.ui.SubmissionTestFragment
import de.rki.coronawarnapp.test.submission.ui.SubmissionTestFragmentModule
import de.rki.coronawarnapp.test.tasks.ui.TestTaskControllerFragment
import de.rki.coronawarnapp.test.tasks.ui.TestTaskControllerFragmentModule
-import de.rki.coronawarnapp.vaccination.ui.VaccinationTestFragment
-import de.rki.coronawarnapp.vaccination.ui.VaccinationTestFragmentModule
@Module
abstract class MainActivityTestModule {
@@ -89,10 +85,4 @@ abstract class MainActivityTestModule {
@ContributesAndroidInjector(modules = [CoronaTestTestFragmentModule::class])
abstract fun coronaTest(): CoronaTestTestFragment
-
- @ContributesAndroidInjector(modules = [VaccinationTestFragmentModule::class])
- abstract fun vaccinationTest(): VaccinationTestFragment
-
- @ContributesAndroidInjector(modules = [GreenCertificateTestFragmentModule::class])
- abstract fun greenCertificateTestFragment(): GreenCertificateTestFragment
}
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/vaccination/ui/VaccinationTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/vaccination/ui/VaccinationTestFragment.kt
deleted file mode 100644
index 97cc21c5f..000000000
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/vaccination/ui/VaccinationTestFragment.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package de.rki.coronawarnapp.vaccination.ui
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.view.View
-import androidx.fragment.app.Fragment
-import de.rki.coronawarnapp.R
-import de.rki.coronawarnapp.databinding.FragmentTestVaccinationBinding
-import de.rki.coronawarnapp.test.menu.ui.TestMenuItem
-import de.rki.coronawarnapp.util.di.AutoInject
-import de.rki.coronawarnapp.util.ui.doNavigate
-import de.rki.coronawarnapp.util.ui.viewBinding
-import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
-import de.rki.coronawarnapp.util.viewmodel.cwaViewModels
-import javax.inject.Inject
-
-@SuppressLint("SetTextI18n")
-class VaccinationTestFragment : Fragment(R.layout.fragment_test_vaccination), AutoInject {
-
- @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory
- private val vm: VaccinationTestFragmentViewModel by cwaViewModels { viewModelFactory }
-
- private val binding: FragmentTestVaccinationBinding by viewBinding()
-
- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
- super.onViewCreated(view, savedInstanceState)
-
- binding.openVaccinationDetailsIncomplete.setOnClickListener {
- doNavigate(
- VaccinationTestFragmentDirections
- .actionVaccinationTestFragmentToVaccinationDetailsFragment(
- "05930482748454836478695764787840"
- )
- )
- }
-
- binding.openVaccinationDetailsComplete.setOnClickListener {
- doNavigate(
- VaccinationTestFragmentDirections
- .actionVaccinationTestFragmentToVaccinationDetailsFragment(
- "05930482748454836478695764787841"
- )
- )
- }
- }
-
- companion object {
- val MENU_ITEM = TestMenuItem(
- title = "Vaccination",
- description = "View & Control vaccination related features.",
- targetId = R.id.vaccinationTestFragment
- )
- }
-}
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/vaccination/ui/VaccinationTestFragmentModule.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/vaccination/ui/VaccinationTestFragmentModule.kt
deleted file mode 100644
index fb24039c6..000000000
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/vaccination/ui/VaccinationTestFragmentModule.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package de.rki.coronawarnapp.vaccination.ui
-
-import dagger.Binds
-import dagger.Module
-import dagger.multibindings.IntoMap
-import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
-import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactory
-import de.rki.coronawarnapp.util.viewmodel.CWAViewModelKey
-
-@Module
-abstract class VaccinationTestFragmentModule {
- @Binds
- @IntoMap
- @CWAViewModelKey(VaccinationTestFragmentViewModel::class)
- abstract fun testVaccinationFragment(
- factory: VaccinationTestFragmentViewModel.Factory
- ): CWAViewModelFactory<out CWAViewModel>
-}
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/vaccination/ui/VaccinationTestFragmentViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/vaccination/ui/VaccinationTestFragmentViewModel.kt
deleted file mode 100644
index b9e4d4498..000000000
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/vaccination/ui/VaccinationTestFragmentViewModel.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package de.rki.coronawarnapp.vaccination.ui
-
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
-import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
-import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
-import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
-
-class VaccinationTestFragmentViewModel @AssistedInject constructor(
- dispatcherProvider: DispatcherProvider,
-) : CWAViewModel(dispatcherProvider = dispatcherProvider) {
-
- @AssistedFactory
- interface Factory : SimpleCWAViewModelFactory<VaccinationTestFragmentViewModel>
-}
diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_green_certificate.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_green_certificate.xml
deleted file mode 100644
index 5e07771e4..000000000
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_green_certificate.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- tools:ignore="HardcodedText">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_margin="8dp"
- android:orientation="vertical"
- android:paddingBottom="32dp">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Request DCC screen" />
-
- </LinearLayout>
-</androidx.core.widget.NestedScrollView>
diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_vaccination.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_vaccination.xml
deleted file mode 100644
index 36066d516..000000000
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_vaccination.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- tools:ignore="HardcodedText">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_margin="8dp"
- android:orientation="vertical"
- android:paddingBottom="32dp">
-
- <androidx.constraintlayout.widget.ConstraintLayout
- style="@style/Card"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_margin="@dimen/spacing_tiny"
- android:layout_marginStart="8dp"
- android:layout_marginEnd="8dp"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/textView2"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Vaccinations"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-
- <com.google.android.material.button.MaterialButton
- android:id="@+id/open_vaccination_details_complete"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="10dp"
- android:text="Vaccination details - complete"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/textView2" />
-
- <com.google.android.material.button.MaterialButton
- android:id="@+id/open_vaccination_details_incomplete"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="10dp"
- android:text="Vaccination details - incomplete"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/open_vaccination_details_complete" />
-
- </androidx.constraintlayout.widget.ConstraintLayout>
-
- </LinearLayout>
-</androidx.core.widget.NestedScrollView>
diff --git a/Corona-Warn-App/src/deviceForTesters/res/navigation/test_nav_graph.xml b/Corona-Warn-App/src/deviceForTesters/res/navigation/test_nav_graph.xml
index 25b660b5b..e8d813f07 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/navigation/test_nav_graph.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/navigation/test_nav_graph.xml
@@ -55,12 +55,6 @@
<action
android:id="@+id/action_test_menu_fragment_to_coronaTestTestFragment"
app:destination="@id/coronaTestTestFragment" />
- <action
- android:id="@+id/action_test_menu_fragment_to_vaccinationTestFragment"
- app:destination="@id/vaccinationTestFragment" />
- <action
- android:id="@+id/action_test_menu_fragment_to_greenCertificateTestFragment"
- app:destination="@id/greenCertificateTestFragment" />
</fragment>
<fragment
@@ -168,32 +162,5 @@
android:name="de.rki.coronawarnapp.test.coronatest.ui.CoronaTestTestFragment"
android:label="CoronaTestTestFragment"
tools:layout="@layout/fragment_test_coronatest" />
- <fragment
- android:id="@+id/vaccinationTestFragment"
- android:name="de.rki.coronawarnapp.vaccination.ui.VaccinationTestFragment"
- android:label="VaccinationTestFragment"
- tools:layout="@layout/fragment_test_vaccination">
-
- <action
- android:id="@+id/action_vaccinationTestFragment_to_vaccinationDetailsFragment"
- app:destination="@id/vaccinationDetailsFragment" />
-
- </fragment>
-
- <fragment
- android:id="@+id/vaccinationDetailsFragment"
- android:name="de.rki.coronawarnapp.vaccination.ui.details.VaccinationDetailsFragment"
- android:label="fragment_vaccination_details"
- tools:layout="@layout/fragment_vaccination_details">
- <argument
- android:name="vaccinationCertificateId"
- app:argType="string" />
- </fragment>
- <fragment
- android:id="@+id/greenCertificateTestFragment"
- android:name="de.rki.coronawarnapp.test.greencertificate.GreenCertificateTestFragment"
- android:label="GreenCertificateTestFragment"
- tools:layout="@layout/fragment_test_green_certificate" >
- </fragment>
</navigation>
--
GitLab