Skip to content

Commit 3aea4f3

Browse files
jchaloujchalou
committed
[GR-54657] Prepare for JUnit upgrade
PullRequest: graal/17992
2 parents 3df415c + 4c52916 commit 3aea4f3

File tree

72 files changed

+330
-275
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+330
-275
lines changed

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GuardPrioritiesTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,18 @@
2424
*/
2525
package jdk.graal.compiler.core.test;
2626

27-
import static jdk.vm.ci.meta.DeoptimizationAction.InvalidateReprofile;
28-
import static jdk.vm.ci.meta.DeoptimizationReason.TransferToInterpreter;
2927
import static jdk.graal.compiler.graph.test.matchers.NodeIterableCount.hasCount;
3028
import static jdk.graal.compiler.graph.test.matchers.NodeIterableIsEmpty.isNotEmpty;
31-
import static org.junit.Assert.assertThat;
29+
import static jdk.vm.ci.meta.DeoptimizationAction.InvalidateReprofile;
30+
import static jdk.vm.ci.meta.DeoptimizationReason.TransferToInterpreter;
31+
import static org.hamcrest.MatcherAssert.assertThat;
3232
import static org.junit.Assume.assumeThat;
3333
import static org.junit.Assume.assumeTrue;
3434

3535
import java.util.Iterator;
3636

37+
import org.junit.Test;
38+
3739
import jdk.graal.compiler.api.directives.GraalDirectives;
3840
import jdk.graal.compiler.core.common.GraalOptions;
3941
import jdk.graal.compiler.graph.iterators.NodeIterable;
@@ -48,8 +50,6 @@
4850
import jdk.graal.compiler.phases.common.HighTierLoweringPhase;
4951
import jdk.graal.compiler.phases.schedule.SchedulePhase;
5052
import jdk.graal.compiler.phases.tiers.HighTierContext;
51-
import org.junit.Test;
52-
5353
import jdk.vm.ci.meta.SpeculationLog;
5454

5555
public class GuardPrioritiesTest extends GraphScheduleTest {

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MemoryScheduleTest.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,15 @@
2727
import static jdk.graal.compiler.core.common.GraalOptions.OptImplicitNullChecks;
2828
import static jdk.graal.compiler.core.common.GraalOptions.OptScheduleOutOfLoops;
2929
import static jdk.graal.compiler.graph.test.matchers.NodeIterableCount.hasCount;
30+
import static org.hamcrest.MatcherAssert.assertThat;
3031
import static org.hamcrest.core.IsInstanceOf.instanceOf;
31-
import static org.junit.Assert.assertThat;
3232

3333
import java.util.ArrayList;
3434
import java.util.List;
3535

36+
import org.junit.Assert;
37+
import org.junit.Test;
38+
3639
import jdk.graal.compiler.api.directives.GraalDirectives;
3740
import jdk.graal.compiler.debug.DebugContext;
3841
import jdk.graal.compiler.graph.Node;
@@ -57,8 +60,6 @@
5760
import jdk.graal.compiler.phases.tiers.HighTierContext;
5861
import jdk.graal.compiler.phases.tiers.LowTierContext;
5962
import jdk.graal.compiler.phases.tiers.MidTierContext;
60-
import org.junit.Assert;
61-
import org.junit.Test;
6263

6364
/**
6465
* In these test the FrameStates are explicitly cleared out, so that the scheduling of

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SwitchDyingLoopTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@
2626

2727
import static jdk.graal.compiler.graph.test.matchers.NodeIterableCount.hasCount;
2828
import static jdk.graal.compiler.graph.test.matchers.NodeIterableIsEmpty.isEmpty;
29+
import static org.hamcrest.MatcherAssert.assertThat;
2930
import static org.junit.Assert.assertNotNull;
30-
import static org.junit.Assert.assertThat;
31+
32+
import org.junit.Test;
3133

3234
import jdk.graal.compiler.core.common.type.StampFactory;
3335
import jdk.graal.compiler.nodes.LoopBeginNode;
@@ -36,8 +38,6 @@
3638
import jdk.graal.compiler.nodes.extended.IntegerSwitchNode;
3739
import jdk.graal.compiler.phases.common.CanonicalizerPhase;
3840
import jdk.graal.compiler.phases.tiers.HighTierContext;
39-
import org.junit.Test;
40-
4141
import jdk.vm.ci.meta.JavaKind;
4242

4343
public class SwitchDyingLoopTest extends GraalCompilerTest {

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UncheckedInterfaceProviderTest.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@
2727
import static org.hamcrest.CoreMatchers.instanceOf;
2828
import static org.hamcrest.CoreMatchers.is;
2929

30-
import jdk.vm.ci.meta.ResolvedJavaType;
30+
import org.hamcrest.MatcherAssert;
31+
import org.junit.Assert;
32+
import org.junit.BeforeClass;
33+
import org.junit.Test;
34+
3135
import jdk.graal.compiler.api.directives.GraalDirectives;
3236
import jdk.graal.compiler.core.common.type.Stamp;
3337
import jdk.graal.compiler.nodeinfo.Verbosity;
@@ -38,11 +42,8 @@
3842
import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
3943
import jdk.graal.compiler.nodes.spi.UncheckedInterfaceProvider;
4044
import jdk.graal.compiler.nodes.type.StampTool;
41-
import org.junit.Assert;
42-
import org.junit.BeforeClass;
43-
import org.junit.Test;
44-
4545
import jdk.vm.ci.meta.ResolvedJavaMethod;
46+
import jdk.vm.ci.meta.ResolvedJavaType;
4647

4748
public class UncheckedInterfaceProviderTest extends GraalCompilerTest {
4849
private Runnable interfaceField;
@@ -95,7 +96,7 @@ public static void setup() {
9596
public void test() {
9697
StructuredGraph graph = parseEager("snippet", StructuredGraph.AllowAssumptions.YES);
9798
for (BlackholeNode b : graph.getNodes().filter(BlackholeNode.class)) {
98-
Assert.assertThat(b.getValue(), is(instanceOf(UncheckedInterfaceProvider.class)));
99+
MatcherAssert.assertThat(b.getValue(), is(instanceOf(UncheckedInterfaceProvider.class)));
99100
Stamp uncheckedStamp = ((UncheckedInterfaceProvider) b.getValue()).uncheckedStamp();
100101
String context = b.getValue().toString(Verbosity.Debugger);
101102
Assert.assertNotNull(context, uncheckedStamp);

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnusedArray.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,13 @@
2525
package jdk.graal.compiler.core.test;
2626

2727
import static jdk.graal.compiler.graph.test.matchers.NodeIterableIsEmpty.isEmpty;
28-
import static org.junit.Assert.assertThat;
28+
import static org.hamcrest.MatcherAssert.assertThat;
29+
30+
import org.junit.Test;
2931

3032
import jdk.graal.compiler.graph.iterators.NodeIterable;
3133
import jdk.graal.compiler.nodes.StructuredGraph;
3234
import jdk.graal.compiler.nodes.java.NewArrayNode;
33-
import org.junit.Test;
3435

3536
public class UnusedArray extends GraalCompilerTest {
3637
@SuppressWarnings("unused")

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/NodeUsagesTests.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,24 @@
2626

2727
import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
2828
import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
29+
import static org.hamcrest.MatcherAssert.assertThat;
2930
import static org.junit.Assert.assertEquals;
30-
import static org.junit.Assert.assertThat;
3131
import static org.junit.Assert.assertTrue;
3232

33-
import jdk.graal.compiler.graph.test.matchers.NodeIterableContains;
34-
import jdk.graal.compiler.graph.test.matchers.NodeIterableIsEmpty;
33+
import org.junit.Assert;
34+
import org.junit.Test;
35+
3536
import jdk.graal.compiler.graph.GraalGraphError;
3637
import jdk.graal.compiler.graph.Graph;
3738
import jdk.graal.compiler.graph.Node;
3839
import jdk.graal.compiler.graph.NodeClass;
3940
import jdk.graal.compiler.graph.NodeInputList;
4041
import jdk.graal.compiler.graph.NodeSuccessorList;
4142
import jdk.graal.compiler.graph.Position;
43+
import jdk.graal.compiler.graph.test.matchers.NodeIterableContains;
44+
import jdk.graal.compiler.graph.test.matchers.NodeIterableIsEmpty;
4245
import jdk.graal.compiler.nodeinfo.NodeInfo;
4346
import jdk.graal.compiler.options.OptionValues;
44-
import org.junit.Assert;
45-
import org.junit.Test;
4647

4748
public class NodeUsagesTests extends GraphTest {
4849

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotMonitorValueTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@
2525
package jdk.graal.compiler.hotspot.test;
2626

2727
import static org.hamcrest.CoreMatchers.not;
28+
import static org.hamcrest.MatcherAssert.assertThat;
2829
import static org.junit.Assert.assertNotNull;
2930
import static org.junit.Assert.assertNull;
30-
import static org.junit.Assert.assertThat;
3131

3232
import java.util.Arrays;
3333
import java.util.List;
3434

35+
import org.junit.Test;
36+
3537
import jdk.graal.compiler.code.CompilationResult;
36-
import jdk.graal.compiler.core.test.GraalCompilerTest;
3738
import jdk.graal.compiler.core.phases.HighTier;
39+
import jdk.graal.compiler.core.test.GraalCompilerTest;
3840
import jdk.graal.compiler.debug.DebugContext;
3941
import jdk.graal.compiler.options.OptionValues;
40-
import org.junit.Test;
41-
4242
import jdk.vm.ci.code.BytecodeFrame;
4343
import jdk.vm.ci.code.InstalledCode;
4444
import jdk.vm.ci.code.StackLockValue;

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/StringInternConstantTest.java

+7-5
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,20 @@
2424
*/
2525
package jdk.graal.compiler.hotspot.test;
2626

27+
import static org.hamcrest.CoreMatchers.instanceOf;
28+
29+
import org.hamcrest.MatcherAssert;
30+
import org.junit.Assert;
31+
import org.junit.Test;
32+
2733
import jdk.graal.compiler.core.test.GraalCompilerTest;
2834
import jdk.graal.compiler.nodes.ConstantNode;
2935
import jdk.graal.compiler.nodes.FixedNode;
3036
import jdk.graal.compiler.nodes.ReturnNode;
3137
import jdk.graal.compiler.nodes.StructuredGraph;
32-
import org.junit.Test;
33-
3438
import jdk.vm.ci.hotspot.HotSpotObjectConstant;
3539
import jdk.vm.ci.meta.Constant;
3640
import jdk.vm.ci.meta.ResolvedJavaMethod;
37-
import static org.hamcrest.CoreMatchers.instanceOf;
38-
import org.junit.Assert;
3941

4042
/**
4143
* Tests constant folding of {@link String#intern()}.
@@ -50,7 +52,7 @@ public void test1() {
5052
StructuredGraph graph = parseForCompile(method);
5153

5254
FixedNode firstFixed = graph.start().next();
53-
Assert.assertThat(firstFixed, instanceOf(ReturnNode.class));
55+
MatcherAssert.assertThat(firstFixed, instanceOf(ReturnNode.class));
5456

5557
ReturnNode ret = (ReturnNode) firstFixed;
5658
if (ret.result() instanceof ConstantNode) {

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/DerivedOopTest.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@
2626

2727
import java.util.Objects;
2828

29+
import org.junit.Assert;
30+
import org.junit.Rule;
31+
import org.junit.Test;
32+
import org.junit.rules.ExpectedException;
33+
2934
import jdk.graal.compiler.api.directives.GraalDirectives;
3035
import jdk.graal.compiler.debug.DebugContext;
3136
import jdk.graal.compiler.debug.DebugContext.Scope;
@@ -39,11 +44,6 @@
3944
import jdk.graal.compiler.replacements.Snippets;
4045
import jdk.graal.compiler.word.Word;
4146
import jdk.graal.compiler.word.WordCastNode;
42-
import org.junit.Assert;
43-
import org.junit.Rule;
44-
import org.junit.Test;
45-
import org.junit.rules.ExpectedException;
46-
4747
import jdk.vm.ci.meta.JavaKind;
4848
import jdk.vm.ci.meta.ResolvedJavaMethod;
4949

@@ -141,7 +141,7 @@ public static Result fieldOffsetSnippet(Result obj, long offset) {
141141
return obj;
142142
}
143143

144-
@Rule public final ExpectedException thrown = ExpectedException.none();
144+
@SuppressWarnings("deprecation") @Rule public final ExpectedException thrown = ExpectedException.none();
145145
private static final String UNKNOWN_REFERENCE_AT_SAFEPOINT_MSG = "should not reach here: unknown reference alive across safepoint";
146146

147147
@Test

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringEqualsConstantTest.java

+7-5
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,20 @@
2424
*/
2525
package jdk.graal.compiler.replacements.test;
2626

27+
import static org.hamcrest.CoreMatchers.instanceOf;
28+
29+
import org.hamcrest.MatcherAssert;
30+
import org.junit.Assert;
31+
import org.junit.Test;
32+
2733
import jdk.graal.compiler.core.test.GraalCompilerTest;
2834
import jdk.graal.compiler.nodes.ConstantNode;
2935
import jdk.graal.compiler.nodes.FixedNode;
3036
import jdk.graal.compiler.nodes.ReturnNode;
3137
import jdk.graal.compiler.nodes.StructuredGraph;
3238
import jdk.graal.compiler.nodes.ValueNode;
3339
import jdk.vm.ci.meta.JavaConstant;
34-
import org.junit.Test;
35-
3640
import jdk.vm.ci.meta.ResolvedJavaMethod;
37-
import static org.hamcrest.CoreMatchers.instanceOf;
38-
import org.junit.Assert;
3941

4042
/**
4143
* Tests constant folding of string equality.
@@ -56,7 +58,7 @@ private void testStringEquals(String s0, String s1) {
5658
compile(method, graph);
5759

5860
FixedNode firstFixed = graph.start().next();
59-
Assert.assertThat(firstFixed, instanceOf(ReturnNode.class));
61+
MatcherAssert.assertThat(firstFixed, instanceOf(ReturnNode.class));
6062

6163
ReturnNode ret = (ReturnNode) firstFixed;
6264
JavaConstant result = ret.result().asJavaConstant();

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringHashConstantTest.java

+8-6
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,20 @@
2424
*/
2525
package jdk.graal.compiler.replacements.test;
2626

27+
import static org.hamcrest.CoreMatchers.instanceOf;
28+
29+
import org.hamcrest.MatcherAssert;
30+
import org.junit.Assert;
31+
import org.junit.Test;
32+
2733
import jdk.graal.compiler.core.test.GraalCompilerTest;
2834
import jdk.graal.compiler.nodes.ConstantNode;
2935
import jdk.graal.compiler.nodes.FixedNode;
3036
import jdk.graal.compiler.nodes.ReturnNode;
3137
import jdk.graal.compiler.nodes.StructuredGraph;
3238
import jdk.graal.compiler.nodes.ValueNode;
3339
import jdk.vm.ci.meta.JavaConstant;
34-
import org.junit.Test;
35-
3640
import jdk.vm.ci.meta.ResolvedJavaMethod;
37-
import static org.hamcrest.CoreMatchers.instanceOf;
38-
import org.junit.Assert;
3941

4042
/**
4143
* Tests constant folding of {@link String#hashCode()}.
@@ -60,7 +62,7 @@ public void test1() {
6062
compile(method, graph);
6163

6264
FixedNode firstFixed = graph.start().next();
63-
Assert.assertThat(firstFixed, instanceOf(ReturnNode.class));
65+
MatcherAssert.assertThat(firstFixed, instanceOf(ReturnNode.class));
6466

6567
ReturnNode ret = (ReturnNode) firstFixed;
6668
JavaConstant result = ret.result().asJavaConstant();
@@ -81,7 +83,7 @@ public void test2() {
8183
StructuredGraph graph = parseForCompile(method);
8284

8385
FixedNode firstFixed = graph.start().next();
84-
Assert.assertThat(firstFixed, instanceOf(ReturnNode.class));
86+
MatcherAssert.assertThat(firstFixed, instanceOf(ReturnNode.class));
8587

8688
ReturnNode ret = (ReturnNode) firstFixed;
8789
JavaConstant result = ret.result().asJavaConstant();

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ConditionAnchoringTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import static jdk.graal.compiler.graph.test.matchers.NodeIterableCount.hasCount;
2828
import static jdk.graal.compiler.graph.test.matchers.NodeIterableIsEmpty.isEmpty;
2929
import static jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createStandardInlineInfo;
30+
import static org.hamcrest.MatcherAssert.assertThat;
3031
import static org.hamcrest.core.IsInstanceOf.instanceOf;
31-
import static org.junit.Assert.assertThat;
3232

3333
import java.lang.reflect.Field;
3434

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/MaterializedFrameTest.java

+8-7
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,8 @@
2828
import static org.hamcrest.CoreMatchers.equalTo;
2929
import static org.hamcrest.CoreMatchers.instanceOf;
3030
import static org.hamcrest.CoreMatchers.not;
31-
import static org.junit.Assert.assertThat;
31+
import static org.hamcrest.MatcherAssert.assertThat;
3232

33-
import jdk.graal.compiler.api.directives.GraalDirectives;
34-
import jdk.graal.compiler.graph.iterators.NodeIterable;
35-
import jdk.graal.compiler.nodes.StructuredGraph;
36-
import jdk.graal.compiler.nodes.calc.IsNullNode;
37-
import jdk.graal.compiler.nodes.java.LoadFieldNode;
38-
import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
3933
import org.junit.Test;
4034

4135
import com.oracle.truffle.api.CompilerDirectives;
@@ -49,6 +43,13 @@
4943
import com.oracle.truffle.api.profiles.ValueProfile;
5044
import com.oracle.truffle.runtime.OptimizedCallTarget;
5145

46+
import jdk.graal.compiler.api.directives.GraalDirectives;
47+
import jdk.graal.compiler.graph.iterators.NodeIterable;
48+
import jdk.graal.compiler.nodes.StructuredGraph;
49+
import jdk.graal.compiler.nodes.calc.IsNullNode;
50+
import jdk.graal.compiler.nodes.java.LoadFieldNode;
51+
import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
52+
5253
public class MaterializedFrameTest extends PartialEvaluationTest {
5354
private static RootNode createRootNode() {
5455
var builder = FrameDescriptor.newBuilder();

‎substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/SecurityServiceTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.graalvm.nativeimage.hosted.RuntimeClassInitialization;
3333
import org.graalvm.nativeimage.hosted.RuntimeReflection;
3434
import org.hamcrest.CoreMatchers;
35+
import org.hamcrest.MatcherAssert;
3536
import org.junit.Assert;
3637
import org.junit.Test;
3738

@@ -81,15 +82,15 @@ public void testUnknownSecurityServices() throws Exception {
8182
Assert.assertNotNull("Provider is not registered", registered);
8283
final Object impl = registered.getService("NoOp", "no-op-algo").newInstance(null);
8384
Assert.assertNotNull("No service instance was created", impl);
84-
Assert.assertThat("Unexpected service implementation class", impl, CoreMatchers.instanceOf(NoOpImpl.class));
85+
MatcherAssert.assertThat("Unexpected service implementation class", impl, CoreMatchers.instanceOf(NoOpImpl.class));
8586
}
8687

8788
@Test
8889
public void testAutomaticSecurityServiceRegistration() {
8990
try {
9091
JCACompliantNoOpService service = JCACompliantNoOpService.getInstance("no-op-algo-two");
9192
Assert.assertNotNull("No service instance was created", service);
92-
Assert.assertThat("Unexpected service implementation class", service, CoreMatchers.instanceOf(JcaCompliantNoOpServiceImpl.class));
93+
MatcherAssert.assertThat("Unexpected service implementation class", service, CoreMatchers.instanceOf(JcaCompliantNoOpServiceImpl.class));
9394
} catch (NoSuchAlgorithmException e) {
9495
Assert.fail("Failed to fetch noop service with exception: " + e);
9596
}

0 commit comments

Comments
 (0)