Bugs in migration

This commit is contained in:
Chen Liang 2026-01-23 15:01:54 -06:00
parent 72e0b3a9c9
commit 0fd824dabe
4 changed files with 38 additions and 8 deletions

View File

@ -290,7 +290,8 @@ public class ClassDescTest extends SymbolicDescTest {
String descWith255ArrayDims = "[".repeat(255);
assertThrows(IllegalArgumentException.class, () -> ClassDesc.ofDescriptor(descWith255ArrayDims + "[Ljava/lang/String;"),
"can't create an array type descriptor with more than 255 dimensions");
assertThrows(IllegalArgumentException.class, () -> ClassDesc.ofDescriptor(descWith255ArrayDims + "Ljava/lang/String;"),
ClassDesc arrWith255Dims = ClassDesc.ofDescriptor(descWith255ArrayDims + "Ljava/lang/String;");
assertThrows(IllegalArgumentException.class, () -> arrWith255Dims.arrayType(1),
"can't create an array type descriptor with more than 255 dimensions");
}

View File

@ -21,17 +21,19 @@
* questions.
*/
package jdk.internal.constant;
import java.lang.constant.*;
import java.util.*;
import static org.junit.jupiter.api.Assertions.*;
import jdk.internal.constant.ConstantAccess;
import jdk.internal.constant.ConstantUtils;
import org.junit.jupiter.api.Test;
/*
* @test
* @bug 8303930
* @build java.base/jdk.internal.constant.*
* @compile ConstantUtilsTest.java
* @modules java.base/jdk.internal.constant
* @run junit ConstantUtilsTest
@ -43,7 +45,7 @@ public class ConstantUtilsTest {
@Test
public void testValidateMemberName() {
assertThrows(NullPointerException.class, () -> ConstantUtils.validateMemberName(null, false));
assertThrows(NullPointerException.class, () -> ConstantUtils.validateMemberName("", false));
assertThrows(IllegalArgumentException.class, () -> ConstantUtils.validateMemberName("", false));
List<String> badNames = List.of(".", ";", "[", "/", "<", ">");
for (String n : badNames) {
@ -53,7 +55,7 @@ public class ConstantUtilsTest {
@Test
public void testSkipOverFieldSignatureVoid() {
int ret = ConstantUtils.skipOverFieldSignature("(V)V", 1, 4);
int ret = ConstantAccess.skipOverFieldSignature("(V)V", 1, 4);
assertEquals(0, ret, "Descriptor of (V)V starting at index 1, void disallowed");
}
}

View File

@ -1,3 +0,0 @@
# This file identifies root(s) of the test-ng hierarchy.
lib.dirs = /lib/testlibrary/bootlib

View File

@ -0,0 +1,30 @@
/*
* Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package jdk.internal.constant;
// Exposes packaage-private methods for testing.
public final class ConstantAccess {
public static int skipOverFieldSignature(String descriptor, int start, int end) {
return ConstantUtils.skipOverFieldSignature(descriptor, start, end);
}
}