#365: correct name of package_protected in documentation, added new t…

…est case for this issue
siom79 · Oct 18, 2023 · fa5f391 · fa5f391
1 parent 2536bc2
commit fa5f391
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 45 deletions.
diff --git a/japicmp/src/main/java/japicmp/compat/Test.java b/japicmp/src/main/java/japicmp/compat/Test.java
diff --git a/japicmp/src/test/java/japicmp/compat/CompatibilityChangesTest.java b/japicmp/src/test/java/japicmp/compat/CompatibilityChangesTest.java
@@ -2196,4 +2196,32 @@ public List<CtClass> createNewClasses(ClassPool classPool) throws Exception {
 		jApiMethod = getJApiMethod(jApiClass.getMethods(), "method");
 		assertThat(jApiMethod.getChangeStatus(), is(JApiChangeStatus.REMOVED));
 	}
+
+	@Test
+	public void testPackagePrivateClassChangesToPublicClassWithMethodReturnTypeChangeIssue365() throws Exception {
+		JarArchiveComparatorOptions jarArchiveComparatorOptions = new JarArchiveComparatorOptions();
+		jarArchiveComparatorOptions.setAccessModifier(AccessModifier.PRIVATE);
+		List<JApiClass> jApiClasses = ClassesHelper.compareClasses(jarArchiveComparatorOptions, new ClassesHelper.ClassesGenerator() {
+			@Override
+			public List<CtClass> createOldClasses(ClassPool classPool) throws Exception {
+				CtClass ctInterfaceF = CtInterfaceBuilder.create().name("F").addToClassPool(classPool);
+				CtClass ctClassC = CtClassBuilder.create().name("C").protectedModifier().addToClassPool(classPool);
+				CtMethodBuilder.create().publicAccess().staticAccess().name("M").returnType(ctInterfaceF).addToClass(ctClassC);
+				return Arrays.asList(ctInterfaceF, ctClassC);
+			}
+
+			@Override
+			public List<CtClass> createNewClasses(ClassPool classPool) throws Exception {
+				CtClass ctInterfaceF = CtInterfaceBuilder.create().name("F").addToClassPool(classPool);
+				CtClass ctClassFImpl = CtClassBuilder.create().name("FImpl").implementsInterface(ctInterfaceF).addToClassPool(classPool);
+				CtClass ctClassC = CtClassBuilder.create().name("C").protectedModifier().addToClassPool(classPool);
+				CtMethodBuilder.create().publicAccess().staticAccess().name("M").returnType(ctClassFImpl).addToClass(ctClassC);
+				return Arrays.asList(ctInterfaceF, ctClassC);
+			}
+		});
+		JApiClass jApiClass = getJApiClass(jApiClasses, "C");
+		JApiMethod jApiMethod = getJApiMethod(jApiClass.getMethods(), "M");
+		assertThat(jApiMethod.getChangeStatus(), is(JApiChangeStatus.MODIFIED));
+		assertThat(jApiMethod.getCompatibilityChanges(), hasItem(JApiCompatibilityChange.METHOD_RETURN_TYPE_CHANGED));
+	}
 }
diff --git a/japicmp/src/test/java/japicmp/util/CtClassBuilder.java b/japicmp/src/test/java/japicmp/util/CtClassBuilder.java
@@ -52,6 +52,13 @@ public CtClassBuilder privateModifier() {
 		return this;
 	}
 
+	public CtClassBuilder protectedModifier() {
+		this.modifier = this.modifier & ~Modifier.PUBLIC;
+		this.modifier = this.modifier & ~Modifier.PRIVATE;
+		this.modifier |= Modifier.PROTECTED;
+		return this;
+	}
+
 	public CtClassBuilder enumModifier() {
 		this.modifier = this.modifier | Modifier.ENUM;
 		return this;