1
1
/*
2
- * Copyright (c) 2017, 2018 , Oracle and/or its affiliates. All rights reserved.
2
+ * Copyright (c) 2017, 2019 , Oracle and/or its affiliates. All rights reserved.
3
3
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4
4
*
5
5
* The Universal Permissive License (UPL), Version 1.0
@@ -169,7 +169,9 @@ private static class TruffleFrameworkMethod extends FrameworkMethod {
169
169
170
170
for (int i = 0 ; i < paramCount ; i ++) {
171
171
Inject testRootNode = findRootNodeAnnotation (method .getParameterAnnotations ()[i ]);
172
- nodeConstructors [i ] = getNodeConstructor (testRootNode , testClass );
172
+ if (testRootNode != null ) {
173
+ nodeConstructors [i ] = getNodeConstructor (testRootNode , testClass );
174
+ }
173
175
}
174
176
}
175
177
@@ -189,7 +191,9 @@ RootNode[] createTestRootNodes(Object test) {
189
191
190
192
RootNode [] ret = new RootNode [nodeConstructors .length ];
191
193
for (int i = 0 ; i < ret .length ; i ++) {
192
- ret [i ] = nodeConstructors [i ].apply (test );
194
+ if (nodeConstructors [i ] != null ) {
195
+ ret [i ] = nodeConstructors [i ].apply (test );
196
+ }
193
197
}
194
198
return ret ;
195
199
}
@@ -209,7 +213,11 @@ public void evaluate() throws Throwable {
209
213
try (C testContext = createTestContext (testName )) {
210
214
ArrayList <T > callTargets = new ArrayList <>(testNodes .length );
211
215
for (RootNode testNode : testNodes ) {
212
- callTargets .add (createTestCallTarget (testContext , testNode ));
216
+ if (testNode != null ) {
217
+ callTargets .add (createTestCallTarget (testContext , testNode ));
218
+ } else {
219
+ callTargets .add (null );
220
+ }
213
221
}
214
222
215
223
Object [] args = callTargets .toArray ();
0 commit comments