From f36e5771b97e582ae57a6b415ee437b572c6286d Mon Sep 17 00:00:00 2001
From: Matthias Urhahn <matthias.urhahn@sap.com>
Date: Tue, 13 Apr 2021 12:28:38 +0200
Subject: [PATCH] Move test task to test package (DEV) (#2803)
Co-authored-by: Mohamed <mohamed.metwalli@sap.com>
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
---
.../java/de/rki/coronawarnapp/task/internal/TaskModule.kt | 7 +------
.../java/de/rki/coronawarnapp/task/TaskControllerTest.kt | 2 +-
.../de/rki/coronawarnapp/task/testtasks/SkippingTask.kt | 2 +-
.../coronawarnapp/task/testtasks/queue}/QueueingTask.kt | 2 +-
.../task/testtasks/queue}/QueueingTaskModule.kt | 2 +-
5 files changed, 5 insertions(+), 10 deletions(-)
rename Corona-Warn-App/src/{main/java/de/rki/coronawarnapp/task/example => test/java/de/rki/coronawarnapp/task/testtasks/queue}/QueueingTask.kt (98%)
rename Corona-Warn-App/src/{main/java/de/rki/coronawarnapp/task/example => test/java/de/rki/coronawarnapp/task/testtasks/queue}/QueueingTaskModule.kt (89%)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/task/internal/TaskModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/task/internal/TaskModule.kt
index bc815e304..179d8edbd 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/task/internal/TaskModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/task/internal/TaskModule.kt
@@ -3,15 +3,10 @@ package de.rki.coronawarnapp.task.internal
import dagger.Module
import dagger.Provides
import de.rki.coronawarnapp.task.TaskCoroutineScope
-import de.rki.coronawarnapp.task.example.QueueingTaskModule
import kotlinx.coroutines.CoroutineScope
import javax.inject.Singleton
-@Module(
- includes = [
- QueueingTaskModule::class
- ]
-)
+@Module
class TaskModule {
@Provides
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/TaskControllerTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/TaskControllerTest.kt
index 22595f0c3..71370335e 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/TaskControllerTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/TaskControllerTest.kt
@@ -3,10 +3,10 @@ package de.rki.coronawarnapp.task
import de.rki.coronawarnapp.bugreporting.reportProblem
import de.rki.coronawarnapp.exception.reporting.report
import de.rki.coronawarnapp.task.common.DefaultTaskRequest
-import de.rki.coronawarnapp.task.example.QueueingTask
import de.rki.coronawarnapp.task.testtasks.SkippingTask
import de.rki.coronawarnapp.task.testtasks.alerterror.AlertErrorTask
import de.rki.coronawarnapp.task.testtasks.precondition.PreconditionTask
+import de.rki.coronawarnapp.task.testtasks.queue.QueueingTask
import de.rki.coronawarnapp.task.testtasks.silenterror.SilentErrorTask
import de.rki.coronawarnapp.task.testtasks.timeout.TimeoutTask
import de.rki.coronawarnapp.task.testtasks.timeout.TimeoutTask2
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/testtasks/SkippingTask.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/testtasks/SkippingTask.kt
index cb0848c9f..1b0b3c944 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/testtasks/SkippingTask.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/testtasks/SkippingTask.kt
@@ -3,7 +3,7 @@ package de.rki.coronawarnapp.task.testtasks
import de.rki.coronawarnapp.task.Task
import de.rki.coronawarnapp.task.TaskFactory
import de.rki.coronawarnapp.task.common.DefaultProgress
-import de.rki.coronawarnapp.task.example.QueueingTask
+import de.rki.coronawarnapp.task.testtasks.queue.QueueingTask
import org.joda.time.Duration
import javax.inject.Inject
import javax.inject.Provider
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/task/example/QueueingTask.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/testtasks/queue/QueueingTask.kt
similarity index 98%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/task/example/QueueingTask.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/testtasks/queue/QueueingTask.kt
index d34f0e889..0c7d67d9d 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/task/example/QueueingTask.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/testtasks/queue/QueueingTask.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.task.example
+package de.rki.coronawarnapp.task.testtasks.queue
import de.rki.coronawarnapp.task.Task
import de.rki.coronawarnapp.task.TaskCancellationException
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/task/example/QueueingTaskModule.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/testtasks/queue/QueueingTaskModule.kt
similarity index 89%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/task/example/QueueingTaskModule.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/testtasks/queue/QueueingTaskModule.kt
index 3b15fdb8f..ff14228d2 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/task/example/QueueingTaskModule.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/testtasks/queue/QueueingTaskModule.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.task.example
+package de.rki.coronawarnapp.task.testtasks.queue
import dagger.Binds
import dagger.Module
--
GitLab