zstan commented on code in PR #13602:
URL: https://github.com/apache/ignite/pull/13602#discussion_r4104003935
##########
modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/exec/rel/BaseAggregateTest.java:
##########
@@ -45,41 +44,46 @@
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.testframework.GridTestUtils;
-import org.apache.ignite.testframework.junits.WithSystemProperty;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runners.Parameterized;
+import org.apache.ignite.testframework.junit.SystemPropertiesExtension;
+import org.apache.ignite.testframework.junit.WithSystemProperty;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.Parameter;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
/**
*
*/
@SuppressWarnings("TypeMayBeWeakened")
+@ExtendWith(SystemPropertiesExtension.class)
@WithSystemProperty(key = "calcite.debug", value = "true")
+@ParameterizedClass(name = "Task executor = {0}, Execution strategy = {1},
testAgg={2}")
+@MethodSource("data")
public abstract class BaseAggregateTest extends AbstractExecutionTest {
/** Last parameter number. */
protected static final int TEST_AGG_PARAM_NUM = LAST_PARAM_NUM + 1;
/** */
- @Parameterized.Parameter(TEST_AGG_PARAM_NUM)
+ @Parameter(TEST_AGG_PARAM_NUM)
public TestAggregateType testAgg;
/** */
- @Parameterized.Parameters(name = PARAMS_STRING + ", type={" +
TEST_AGG_PARAM_NUM + "}")
- public static List<Object[]> data() {
- List<Object[]> extraParams = new ArrayList<>();
+ private static List<Arguments> data() {
+ List<Arguments> extraParams = new ArrayList<>();
- ImmutableList<Object[]> newParams = ImmutableList.of(
- new Object[] {TestAggregateType.SINGLE},
- new Object[] {TestAggregateType.MAP_REDUCE}
- );
-
- for (Object[] newParam : newParams) {
- for (Object[] inheritedParam : AbstractExecutionTest.parameters())
{
- Object[] both = Stream.concat(Arrays.stream(inheritedParam),
Arrays.stream(newParam))
- .toArray(Object[]::new);
+ for (TestAggregateType newParam : TestAggregateType.values()) {
+ for (Object[] inheritedParam : innerParams()) {
Review Comment:
done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
