Skip to content

Commit 689443e

Browse files
marcphilippdnestoro
authored andcommitted
Move test for recursive class definitions
1 parent c37ce67 commit 689443e

File tree

2 files changed

+92
-27
lines changed

2 files changed

+92
-27
lines changed

common/junit-platform-native/src/test/java/org/graalvm/junit/jupiter/AbstractParentClassTests.java

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343

4444
import org.junit.jupiter.api.Assertions;
4545
import org.junit.jupiter.api.BeforeAll;
46-
import org.junit.jupiter.api.Test;
4746
import org.junit.jupiter.params.ParameterizedTest;
4847
import org.junit.jupiter.params.provider.Arguments;
4948
import org.junit.jupiter.params.provider.MethodSource;
@@ -53,32 +52,6 @@
5352

5453
public class AbstractParentClassTests {
5554

56-
public static class OuterClass {
57-
@Test
58-
protected void test() {
59-
Assertions.assertTrue(true, "Just a dummy test that should be executed in outer class");
60-
}
61-
62-
/* Since at org.graalvm.junit.platform.JUnitPlatformFeature#registerTestClassForReflection we register all
63-
* declared classes and superclass of the test class, and we do so recursively, we want to avoid infinite loop.
64-
* This inheritance shows that we won't call registration of these classes indefinitely (call registration of
65-
* all declared classes of AbstractParentClassTests, then recursively call superclass of InfiniteLoopTest and
66-
* repeat the process indefinitely) */
67-
private class InfiniteLoopTest extends OuterClass {
68-
@Test
69-
protected void test() {
70-
Assertions.assertTrue(true, "Just a dummy test that should be executed in inner class");
71-
}
72-
}
73-
74-
/* Since enum here is declared class of AbstractParentClassTests, we want to avoid registrations of
75-
* enum's internal superclasses and sub-classes at org.graalvm.junit.platform.JUnitPlatformFeature#registerTestClassForReflection */
76-
private enum EnumTest {
77-
SOME_VALUE,
78-
OTHER_VALUE
79-
}
80-
}
81-
8255
public abstract static class MathPowerTests {
8356
protected static BiFunction<Integer, Integer, Integer> powFunction;
8457

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
/*
2+
* Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* The Universal Permissive License (UPL), Version 1.0
6+
*
7+
* Subject to the condition set forth below, permission is hereby granted to any
8+
* person obtaining a copy of this software, associated documentation and/or
9+
* data (collectively the "Software"), free of charge and under any and all
10+
* copyright rights in the Software, and any and all patent rights owned or
11+
* freely licensable by each licensor hereunder covering either (i) the
12+
* unmodified Software as contributed to or provided by such licensor, or (ii)
13+
* the Larger Works (as defined below), to deal in both
14+
*
15+
* (a) the Software, and
16+
*
17+
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
18+
* one is included with the Software each a "Larger Work" to which the Software
19+
* is contributed by such licensors),
20+
*
21+
* without restriction, including without limitation the rights to copy, create
22+
* derivative works of, display, perform, and distribute the Software and make,
23+
* use, sell, offer for sale, import, export, have made, and have sold the
24+
* Software and the Larger Work(s), and to sublicense the foregoing rights on
25+
* either these or other terms.
26+
*
27+
* This license is subject to the following condition:
28+
*
29+
* The above copyright notice and either this complete permission notice or at a
30+
* minimum a reference to the UPL must be included in all copies or substantial
31+
* portions of the Software.
32+
*
33+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
* SOFTWARE.
40+
*/
41+
42+
package org.graalvm.junit.platform;
43+
44+
import org.junit.jupiter.api.Test;
45+
46+
import java.util.ArrayList;
47+
import java.util.List;
48+
49+
import static org.junit.jupiter.api.Assertions.assertEquals;
50+
51+
class TestClassRegistrarTests {
52+
53+
@Test
54+
void avoidsInfiniteLoopsWhenClassDefinitionsAreRecursive() {
55+
List<Class<?>> registeredClasses = new ArrayList<>();
56+
var registrar = new TestClassRegistrar(registeredClasses::add);
57+
58+
registrar.registerTestClassForReflection(OuterClass.class);
59+
60+
assertEquals(List.of(OuterClass.class, OuterClass.InfiniteLoop.class), registeredClasses);
61+
}
62+
63+
@Test
64+
void avoidsRegistrationOfJavaInternalTypes() {
65+
List<Class<?>> registeredClasses = new ArrayList<>();
66+
var registrar = new TestClassRegistrar(registeredClasses::add);
67+
68+
registrar.registerTestClassForReflection(EnumTest.class);
69+
70+
assertEquals(List.of(EnumTest.class), registeredClasses);
71+
}
72+
73+
public static class OuterClass {
74+
75+
/* Since TestClassRegistrar registers all declared classes and superclass of the test class, and we do so
76+
* recursively, we want to avoid infinite loop.
77+
* This inheritance shows that we won't call registration of these classes indefinitely (call registration of
78+
* all declared classes of AbstractParentClassTests, then recursively call superclass of InfiniteLoopTest and
79+
* repeat the process indefinitely) */
80+
@SuppressWarnings({"unused", "InnerClassMayBeStatic"})
81+
class InfiniteLoop extends OuterClass {
82+
}
83+
}
84+
85+
/* Since enum here is declared class of AbstractParentClassTests, we want to avoid registrations of
86+
* enum's internal superclasses and sub-classes */
87+
@SuppressWarnings("unused")
88+
enum EnumTest {
89+
SOME_VALUE,
90+
OTHER_VALUE
91+
}
92+
}

0 commit comments

Comments
 (0)