Fix incorrect handling of getPackageName in ClassModel

`getPackageName` is available only from java version 9, thus it has a dedicated test. It seems tests on a specific java version are not executed in the CI pipeline, thus we didn't spot the mistake
Guardsquare · Jan 13, 2025 · 71ef057 · 71ef057
1 parent 8339ae6
commit 71ef057
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/base/src/main/java/proguard/evaluation/value/object/model/ClassModel.java b/base/src/main/java/proguard/evaluation/value/object/model/ClassModel.java
@@ -84,7 +84,7 @@ MethodResult getCanonicalName(ModelHelper.MethodExecutionContext context) {
   MethodResult getPackageName(ModelHelper.MethodExecutionContext context) {
     if (clazz == null) return MethodResult.invalidResult();
     return ModelHelper.createDefaultReturnResult(
-        context, ClassUtil.externalPackageName(clazz.getName()));
+        context, ClassUtil.externalPackageName(ClassUtil.externalClassName(clazz.getName())));
   }
 
   /** Models {@link Class#getTypeName()}. */

diff --git a/base/src/test/kotlin/proguard/evaluation/executor/Java9ReflectionApiExecutorTest.kt b/base/src/test/kotlin/proguard/evaluation/executor/Java9ReflectionApiExecutorTest.kt
@@ -19,6 +19,7 @@ import proguard.classfile.visitor.NamedMethodVisitor
 import proguard.evaluation.ExecutingInvocationUnit
 import proguard.evaluation.PartialEvaluator
 import proguard.evaluation.ParticularReferenceValueFactory
+import proguard.evaluation.executor.model.ClassModelExecutor
 import proguard.evaluation.value.ArrayReferenceValueFactory
 import proguard.evaluation.value.ParticularValueFactory
 import proguard.evaluation.value.`object`.model.ClassModel
@@ -59,6 +60,7 @@ class Java9ReflectionApiExecutorTest : BehaviorSpec({
                         .setEnableSameInstanceIdApproximation(true)
                         .useDefaultStringReflectionExecutor(true)
                         .addExecutor(JavaReflectionApiExecutor.Builder(programClassPool, libraryClassPool))
+                        .addExecutor(ClassModelExecutor.Builder(programClassPool, libraryClassPool))
                         .build(particularValueFactory),
                 )
                 .setEvaluateAllCode(true)