Fixes SchemaDiff Bug where unchanged deprecated enum marked DEPRECATION_ADDED (graphql-java#2826)

cynthiaqian · Cynthia Qian · web-flow · commit cbd919b54223 · 2022-05-20T09:21:40.000+10:00
* Fixes SchemaDiff Bug where an unchanged deprecated enum is marked DEPRECATION_ADDED

* Update SchemaDiffTest.groovy

Co-authored-by: Cynthia Qian &lt;cynthiaq@twitter.com&gt;
diff --git a/src/main/java/graphql/schema/diff/SchemaDiff.java b/src/main/java/graphql/schema/diff/SchemaDiff.java
@@ -477,7 +477,7 @@ private void checkEnumType(DiffCtx ctx, EnumTypeDefinition oldDef, EnumTypeDefin
                         .components(enumName)
                         .reasonMsg("The new API has added a new enum value '%s'", enumName)
                         .build());
-            } else if (isDeprecated(newDefinitionMap.get(enumName))) {
+            } else if (isDeprecated(newDefinitionMap.get(enumName)) && !isDeprecated(oldEnum)) {
                 ctx.report(DiffEvent.apiDanger()
                         .category(DiffCategory.DEPRECATION_ADDED)
                         .typeName(oldDef.getName())
@@ -917,4 +917,4 @@ private static String capitalize(String name) {
     private String mkDotName(String... objectNames) {
         return String.join(".", objectNames);
     }
-}
+}
diff --git a/src/test/groovy/graphql/schema/diff/SchemaDiffTest.groovy b/src/test/groovy/graphql/schema/diff/SchemaDiffTest.groovy
@@ -485,6 +485,18 @@ class SchemaDiffTest extends Specification {
 
     }
 
+    def "deprecated fields are unchanged"() {
+        def schema = TestUtil.schemaFile("diff/" + "schema_deprecated_fields_new.graphqls", wireWithNoFetching())
+        DiffSet diffSet = DiffSet.diffSet(schema, schema)
+
+        def diff = new SchemaDiff()
+        diff.diffSchema(diffSet, chainedReporter)
+
+        expect:
+        reporter.dangerCount == 0
+        reporter.breakageCount == 0
+    }
+
     def "field was deprecated"() {
         DiffSet diffSet = diffSet("schema_deprecated_fields_new.graphqls")
 
