#132 Moving protected field to superclass is no longer marked as bina…

…ry incompatible
siom79 · May 27, 2016 · dbd3ef4 · dbd3ef4
1 parent 713b8e5
commit dbd3ef4
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 1 deletion.
diff --git a/japicmp/src/main/java/japicmp/compat/CompatibilityChanges.java b/japicmp/src/main/java/japicmp/compat/CompatibilityChanges.java
@@ -69,7 +69,28 @@ private void checkIfFieldsHaveChangedIncompatible(JApiClass jApiClass, Map<Strin
 		for (final JApiField field : jApiClass.getFields()) {
 			// section 13.4.6 of "Java Language Specification" SE7
 			if (isNotPrivate(field) && field.getChangeStatus() == JApiChangeStatus.REMOVED) {
-				addCompatibilityChange(field, JApiCompatibilityChange.FIELD_REMOVED);
+				ArrayList<Integer> returnValues = new ArrayList<>();
+				forAllSuperclasses(jApiClass, classMap, returnValues, new OnSuperclassCallback<Integer>() {
+					@Override
+					public Integer callback(JApiClass superclass, Map<String, JApiClass> classMap, JApiChangeStatus changeStatusOfSuperclass) {
+						int movedToSuperclass = 0;
+						for (JApiField superclassField : superclass.getFields()) {
+							if (superclassField.getName().equals(field.getName()) && fieldTypeMatches(superclassField, field) && isNotPrivate(superclassField)) {
+								movedToSuperclass = 1;
+							}
+						}
+						return movedToSuperclass;
+					}
+				});
+				boolean movedToSuperclass = false;
+				for (Integer returnValue : returnValues) {
+					if (returnValue == 1) {
+						movedToSuperclass = true;
+					}
+				}
+				if (!movedToSuperclass) {
+					addCompatibilityChange(field, JApiCompatibilityChange.FIELD_REMOVED);
+				}
 			}
 			// section 13.4.7 of "Java Language Specification" SE7
 			if (hasModifierLevelDecreased(field)) {

diff --git a/japicmp/src/test/java/japicmp/compat/CompatibilityChangesTest.java b/japicmp/src/test/java/japicmp/compat/CompatibilityChangesTest.java
@@ -1088,4 +1088,29 @@ public List<CtClass> createNewClasses(ClassPool classPool) throws Exception {
 		assertThat(method.isSourceCompatible(), is(false));
 		assertThat(method.getCompatibilityChanges(), hasItem(JApiCompatibilityChange.METHOD_NOW_THROWS_CHECKED_EXCEPTION));
 	}
+
+	@Test
+	public void testMemberVariableMovedToSuperclass() throws Exception {
+		JarArchiveComparatorOptions options = new JarArchiveComparatorOptions();
+		List<JApiClass> jApiClasses = ClassesHelper.compareClasses(options, new ClassesHelper.ClassesGenerator() {
+			@Override
+			public List<CtClass> createOldClasses(ClassPool classPool) throws Exception {
+				CtClass superClass = CtClassBuilder.create().name("japicmp.Superclass").addToClassPool(classPool);
+				CtClass ctClass = CtClassBuilder.create().name("japicmp.Test").withSuperclass(superClass).addToClassPool(classPool);
+				CtFieldBuilder.create().protectedAccess().type(CtClass.intType).name("test").addToClass(ctClass);
+				return Arrays.asList(superClass, ctClass);
+			}
+
+			@Override
+			public List<CtClass> createNewClasses(ClassPool classPool) throws Exception {
+				CtClass superClass = CtClassBuilder.create().name("japicmp.Superclass").addToClassPool(classPool);
+				CtFieldBuilder.create().protectedAccess().type(CtClass.intType).name("test").addToClass(superClass);
+				CtClass ctClass = CtClassBuilder.create().name("japicmp.Test").withSuperclass(superClass).addToClassPool(classPool);
+				return Arrays.asList(superClass, ctClass);
+			}
+		});
+		JApiClass jApiClass = getJApiClass(jApiClasses, "japicmp.Test");
+		assertThat(jApiClass.isBinaryCompatible(), is(true));
+		assertThat(jApiClass.isSourceCompatible(), is(true));
+	}
 }
diff --git a/japicmp/src/test/java/japicmp/util/CtFieldBuilder.java b/japicmp/src/test/java/japicmp/util/CtFieldBuilder.java
@@ -87,6 +87,11 @@ public CtFieldBuilder packageProtectedAccess() {
 		return this;
 	}
 
+	public CtFieldBuilder protectedAccess() {
+		this.modifier = this.modifier & ~Modifier.PROTECTED;
+		return this;
+	}
+
 	public CtFieldBuilder finalAccess() {
 		this.modifier = this.modifier | Modifier.FINAL;
 		return this;