Merge pull request #31 from abema/hotfix-deprecated-error

Fix bugs related to EXPIRY_DATE_NOT_DEFINED.
abema · Jun 27, 2023 · f3e2de8 · f3e2de8
2 parents 1ec093e + 85e5479
commit f3e2de8
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/flagfit-lint/src/main/java/tv/abema/flagfit/FlagTypeExpiryDateIllegalParamDetector.kt b/flagfit-lint/src/main/java/tv/abema/flagfit/FlagTypeExpiryDateIllegalParamDetector.kt
@@ -49,6 +49,7 @@ class FlagTypeExpiryDateIllegalParamDetector : Detector(), SourceCodeScanner {
       reportInfiniteExpiryDateErrorIfNeeded(qualifiedName, context, element, location)
       return
     }
+    if (expiryDate == FlagType.EXPIRY_DATE_NOT_DEFINED) return
     if (!isDateFormatValid(expiryDate)) {
       val message = "The value of expireDate is not in the correct date format.\n" +
         "Please set the expiration date in the following format: \"yyyy-mm-dd\""

diff --git a/flagfit-lint/src/test/java/tv/abema/flagfit/FlagTypeExpiryDateIllegalParamDetectorText.kt b/flagfit-lint/src/test/java/tv/abema/flagfit/FlagTypeExpiryDateIllegalParamDetectorText.kt
@@ -197,6 +197,40 @@ class FlagTypeExpiryDateIllegalParamDetectorText : LintDetectorTest() {
       .expectClean()
   }
 
+  @Test
+  fun testDeprecatedFlagTypeNoWarning() {
+    lint()
+      .files(
+        stabBooleanFlag,
+        stabFlagType,
+        kotlin(
+          """
+          package foo
+          import tv.abema.flagfit.FlagType
+          import tv.abema.flagfit.annotation.BooleanFlag
+          import tv.abema.flagfit.FlagType.Companion.OWNER_NOT_DEFINED
+          import tv.abema.flagfit.FlagType.Companion.EXPIRY_DATE_NOT_DEFINED
+          
+          interface Example {
+              @BooleanFlag(
+                key = "new-awesome-feature",
+                defaultValue = false
+              )
+              @FlagType.Ops(
+                owner = OWNER_NOT_DEFINED,
+                expiryDate = EXPIRY_DATE_NOT_DEFINED,
+              )
+              fun awesomeOpsFeatureEnabled(): Boolean
+          }
+          """.trimIndent()
+        )
+      )
+      .issues(*issues.toTypedArray())
+      .allowMissingSdk()
+      .run()
+      .expectClean()
+  }
+
   override fun getDetector(): Detector = FlagTypeExpiryDateIllegalParamDetector()
 
   override fun getIssues(): MutableList<Issue> {