Issue 1115 improve annotations for tests

FlowCrypt/src/androidTest/java/com/flowcrypt/email/DebugTestingTest.kt

@@ -7,6 +7,7 @@ package com.flowcrypt.email
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SmallTest
+import com.flowcrypt.email.junit.annotations.DebugTest
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -17,7 +18,7 @@ import org.junit.runner.RunWith
  *         E-mail: DenBond7@gmail.com
  */
 @SmallTest
-@DebugTestAnnotation
+@DebugTest
 @RunWith(AndroidJUnit4::class)
 class DebugTestingTest {
   @Test

FlowCrypt/src/androidTest/java/com/flowcrypt/email/database/MigrationTest.kt

@@ -11,8 +11,6 @@ import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SmallTest
 import androidx.test.platform.app.InstrumentationRegistry
-import com.flowcrypt.email.DoesNotNeedMailserver
-import com.flowcrypt.email.ReadyForCIAnnotation
 import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
@@ -46,8 +44,6 @@ class MigrationTest {
   )
 
   @Test
-  @DoesNotNeedMailserver
-  @ReadyForCIAnnotation
   @Throws(IOException::class)
   fun testAllMigrations() {
     // Create earliest version of the database.

FlowCrypt/src/androidTest/java/com/flowcrypt/email/DebugTestAnnotation.kt → FlowCrypt/src/androidTest/java/com/flowcrypt/email/junit/annotations/DebugTest.kt

@@ -3,7 +3,7 @@
  * Contributors: DenBond7
  */
 
-package com.flowcrypt.email
+package com.flowcrypt.email.junit.annotations
 
 /**
  * This annotation was created for debugging purposes
@@ -14,4 +14,4 @@ package com.flowcrypt.email
  *         E-mail: DenBond7@gmail.com
  */
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
-annotation class DebugTestAnnotation
+annotation class DebugTest

FlowCrypt/src/androidTest/java/com/flowcrypt/email/DoesNotNeedMailserver.kt → FlowCrypt/src/androidTest/java/com/flowcrypt/email/junit/annotations/DependsOnMailServer.kt

@@ -3,16 +3,16 @@
  * Contributors: DenBond7
  */
 
-package com.flowcrypt.email
+package com.flowcrypt.email.junit.annotations
 
 /**
- * This annotation indicates that a whole class or a single method doesn't need an email server for successful
- * completion.
+ * This annotation indicates that a whole class or a single method depends on an email server
+ * for successful completion.
  *
  * @author Denis Bondarenko
  *         Date: 7/11/19
  *         Time: 2:28 PM
  *         E-mail: DenBond7@gmail.com
  */
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
-annotation class DoesNotNeedMailserver
+annotation class DependsOnMailServer

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ReadyForCIAnnotation.kt → FlowCrypt/src/androidTest/java/com/flowcrypt/email/junit/annotations/NotReadyForCI.kt

@@ -3,10 +3,10 @@
  * Contributors: DenBond7
  */
 
-package com.flowcrypt.email
+package com.flowcrypt.email.junit.annotations
 
 /**
- * Via this annotation, we can mark a class or a method that can be run on CI.
+ * Via this annotation, we can mark a class or a method that can't be run on CI yet.
  * Thanks to this annotation we can run all such methods by one call via the command line to check them.
  *
  * @author Denis Bondarenko
@@ -15,4 +15,4 @@ package com.flowcrypt.email
  *         E-mail: DenBond7@gmail.com
  */
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
-annotation class ReadyForCIAnnotation
+annotation class NotReadyForCI

FlowCrypt/src/androidTest/java/com/flowcrypt/email/junit/filters/DependsOnMailServerFilter.kt

@@ -5,7 +5,7 @@
 
 package com.flowcrypt.email.junit.filters
 
-import com.flowcrypt.email.DoesNotNeedMailserver
+import com.flowcrypt.email.junit.annotations.DependsOnMailServer
 import org.junit.runner.Description
 
 /**
@@ -16,10 +16,10 @@ import org.junit.runner.Description
  */
 class DependsOnMailServerFilter : ReadyForCIFilter() {
   override fun evaluateTest(description: Description?): Boolean {
-    val annotationClass = DoesNotNeedMailserver::class.java
-    val hasClassAnnotation = description?.testClass?.isAnnotationPresent(annotationClass) == true
-    if (hasClassAnnotation) return false
-    return super.evaluateTest(description) && description?.getAnnotation(annotationClass) == null
+    val annotationClass = DependsOnMailServer::class.java
+    return super.evaluateTest(description)
+        && (description?.testClass?.isAnnotationPresent(annotationClass) == true
+        || description?.getAnnotation(annotationClass) != null)
   }
 
   override fun describe() = "Filter tests that depend on an email server"

FlowCrypt/src/androidTest/java/com/flowcrypt/email/junit/filters/DoesNotNeedMailServerFilter.kt

@@ -5,7 +5,7 @@
 
 package com.flowcrypt.email.junit.filters
 
-import com.flowcrypt.email.DoesNotNeedMailserver
+import com.flowcrypt.email.junit.annotations.DependsOnMailServer
 import org.junit.runner.Description
 
 /**
@@ -16,10 +16,10 @@ import org.junit.runner.Description
  */
 class DoesNotNeedMailServerFilter : ReadyForCIFilter() {
   override fun evaluateTest(description: Description?): Boolean {
-    val annotationClass = DoesNotNeedMailserver::class.java
-    return super.evaluateTest(description)
-        && (description?.testClass?.isAnnotationPresent(annotationClass) == true
-        || description?.getAnnotation(annotationClass) != null)
+    val annotationClass = DependsOnMailServer::class.java
+    val hasClassAnnotation = description?.testClass?.isAnnotationPresent(annotationClass) == true
+    if (hasClassAnnotation) return false
+    return super.evaluateTest(description) && description?.getAnnotation(annotationClass) == null
   }
 
   override fun describe() = "Filter tests that don't need an email server"

FlowCrypt/src/androidTest/java/com/flowcrypt/email/junit/filters/NotReadyForCIFilter.kt

@@ -0,0 +1,26 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: DenBond7
+ */
+
+package com.flowcrypt.email.junit.filters
+
+import androidx.test.internal.runner.filters.ParentFilter
+import com.flowcrypt.email.junit.annotations.NotReadyForCI
+import org.junit.runner.Description
+
+/**
+ * @author Denis Bondarenko
+ *         Date: 2/17/21
+ *         Time: 5:24 PM
+ *         E-mail: DenBond7@gmail.com
+ */
+open class NotReadyForCIFilter : ParentFilter() {
+  override fun evaluateTest(description: Description?): Boolean {
+    val annotationClass = NotReadyForCI::class.java
+    return (description?.testClass?.isAnnotationPresent(annotationClass) == true
+        || description?.getAnnotation(annotationClass) != null)
+  }
+
+  override fun describe() = "Filter tests that can't be run on CI yet"
+}

FlowCrypt/src/androidTest/java/com/flowcrypt/email/junit/filters/ReadyForCIFilter.kt

@@ -6,7 +6,7 @@
 package com.flowcrypt.email.junit.filters
 
 import androidx.test.internal.runner.filters.ParentFilter
-import com.flowcrypt.email.ReadyForCIAnnotation
+import com.flowcrypt.email.junit.annotations.NotReadyForCI
 import org.junit.runner.Description
 
 /**
@@ -17,8 +17,8 @@ import org.junit.runner.Description
  */
 open class ReadyForCIFilter : ParentFilter() {
   override fun evaluateTest(description: Description?): Boolean {
-    val annotationClass = ReadyForCIAnnotation::class.java
-    return (description?.testClass?.isAnnotationPresent(annotationClass) == true || description?.getAnnotation(annotationClass) != null)
+    val annotationClass = NotReadyForCI::class.java
+    return (description?.testClass?.isAnnotationPresent(annotationClass) == false && description.getAnnotation(annotationClass) == null)
   }
 
   override fun describe() = "Filter tests that are ready to be run on a CI server"

FlowCrypt/src/androidTest/java/com/flowcrypt/email/security/KeyStoreCryptoManagerTest.kt

@@ -11,8 +11,6 @@ import android.util.Base64OutputStream
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SmallTest
 import androidx.test.platform.app.InstrumentationRegistry
-import com.flowcrypt.email.DoesNotNeedMailserver
-import com.flowcrypt.email.ReadyForCIAnnotation
 import com.flowcrypt.email.api.email.MsgsCacheManager
 import com.flowcrypt.email.util.exception.SyncTaskTerminatedException
 import okio.buffer
@@ -53,8 +51,6 @@ class KeyStoreCryptoManagerTest {
   }
 
   @Test
-  @DoesNotNeedMailserver
-  @ReadyForCIAnnotation
   fun testDataAsString() {
     val encryptedData = KeyStoreCryptoManager.encrypt(originalData)
     println(encryptedData)
@@ -64,8 +60,6 @@ class KeyStoreCryptoManagerTest {
   }
 
   @Test
-  @DoesNotNeedMailserver
-  @ReadyForCIAnnotation
   fun testDataAsStream() {
     val msg = MimeMessage(Session.getInstance(Properties()), InstrumentationRegistry
         .getInstrumentation().context.assets.open("messages/mime/standard_msg_info_plain_text.txt"))
@@ -105,8 +99,6 @@ class KeyStoreCryptoManagerTest {
   }
 
   @Test
-  @DoesNotNeedMailserver
-  @ReadyForCIAnnotation
   fun testDataAsStreamFromCacheManager() {
     val msg = MimeMessage(Session.getInstance(Properties()), InstrumentationRegistry
         .getInstrumentation().context.assets.open("messages/mime/standard_msg_info_plain_text.txt"))