GianlucaPrincipini commented on code in PR #9161: URL: https://github.com/apache/iceberg/pull/9161#discussion_r1414562089
########## parquet/src/test/java/org/apache/iceberg/parquet/TestDictionaryRowGroupFilter.java: ########## @@ -18,37 +18,13 @@ */ package org.apache.iceberg.parquet; -import static org.apache.iceberg.avro.AvroSchemaUtil.convert; Review Comment: Solved in 833e9bff045287bc164e96c1fcd221fb79cd4138. ########## parquet/src/test/java/org/apache/iceberg/utils/ParameterizedTestExtension.java: ########## @@ -0,0 +1,255 @@ +/* + * + * * Licensed to the Apache Software Foundation (ASF) under one + * * or more contributor license agreements. See the NOTICE file + * * distributed with this work for additional information + * * regarding copyright ownership. The ASF licenses this file + * * to you under the Apache License, Version 2.0 (the + * * "License"); you may not use this file except in compliance + * * with the License. You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, + * * software distributed under the License is distributed on an + * * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * * KIND, either express or implied. See the License for the + * * specific language governing permissions and limitations + * * under the License. + * + */ + +package org.apache.iceberg.utils; +import org.junit.jupiter.api.TestTemplate; +import org.junit.jupiter.api.extension.BeforeEachCallback; +import org.junit.jupiter.api.extension.Extension; +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.ParameterContext; +import org.junit.jupiter.api.extension.ParameterResolutionException; +import org.junit.jupiter.api.extension.ParameterResolver; +import org.junit.jupiter.api.extension.TestTemplateInvocationContext; +import org.junit.jupiter.api.extension.TestTemplateInvocationContextProvider; +import org.junit.platform.commons.support.AnnotationSupport; +import org.junit.platform.commons.support.HierarchyTraversalMode; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.text.MessageFormat; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.function.Function; +import java.util.stream.Stream; + +/** + * This extension is used to implement parameterized tests for Junit 5 to replace Parameterized in + * Junit4. + * + * <p>When use this extension, all tests must be annotated by {@link TestTemplate}. + */ +public class ParameterizedTestExtension implements TestTemplateInvocationContextProvider { Review Comment: Solved in 833e9bff045287bc164e96c1fcd221fb79cd4138 ########## parquet/src/test/java/org/apache/iceberg/utils/ParameterizedTestExtension.java: ########## @@ -0,0 +1,255 @@ +/* + * + * * Licensed to the Apache Software Foundation (ASF) under one + * * or more contributor license agreements. See the NOTICE file + * * distributed with this work for additional information + * * regarding copyright ownership. The ASF licenses this file + * * to you under the Apache License, Version 2.0 (the + * * "License"); you may not use this file except in compliance + * * with the License. You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, + * * software distributed under the License is distributed on an + * * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * * KIND, either express or implied. See the License for the + * * specific language governing permissions and limitations + * * under the License. + * + */ + +package org.apache.iceberg.utils; +import org.junit.jupiter.api.TestTemplate; +import org.junit.jupiter.api.extension.BeforeEachCallback; +import org.junit.jupiter.api.extension.Extension; +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.ParameterContext; +import org.junit.jupiter.api.extension.ParameterResolutionException; +import org.junit.jupiter.api.extension.ParameterResolver; +import org.junit.jupiter.api.extension.TestTemplateInvocationContext; +import org.junit.jupiter.api.extension.TestTemplateInvocationContextProvider; +import org.junit.platform.commons.support.AnnotationSupport; +import org.junit.platform.commons.support.HierarchyTraversalMode; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.text.MessageFormat; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.function.Function; +import java.util.stream.Stream; + +/** + * This extension is used to implement parameterized tests for Junit 5 to replace Parameterized in + * Junit4. + * + * <p>When use this extension, all tests must be annotated by {@link TestTemplate}. + */ +public class ParameterizedTestExtension implements TestTemplateInvocationContextProvider { + + private static final ExtensionContext.Namespace NAMESPACE = + ExtensionContext.Namespace.create("parameterized"); + private static final String PARAMETERS_STORE_KEY = "parameters"; + private static final String PARAMETER_FIELD_STORE_KEY_PREFIX = "parameterField_"; + private static final String INDEX_TEMPLATE = "{index}"; + + @Override + public boolean supportsTestTemplate(ExtensionContext context) { + return true; + } + + @Override + public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContexts( + ExtensionContext context) { + + // Search method annotated with @Parameters + final List<Method> parameterProviders = + AnnotationSupport.findAnnotatedMethods( + context.getRequiredTestClass(), + Parameters.class, + HierarchyTraversalMode.TOP_DOWN); + if (parameterProviders.isEmpty()) { + throw new IllegalStateException("Cannot find any parameter provider"); + } + if (parameterProviders.size() > 1) { + throw new IllegalStateException("Multiple parameter providers are found"); + } + + Method parameterProvider = parameterProviders.get(0); + // Get potential test name + String testNameTemplate = parameterProvider.getAnnotation(Parameters.class).name(); + + // Get parameter values + final Object parameterValues; + try { + parameterProvider.setAccessible(true); + parameterValues = parameterProvider.invoke(null); + context.getStore(NAMESPACE).put(PARAMETERS_STORE_KEY, parameterValues); + } catch (Exception e) { + throw new IllegalStateException("Failed to invoke parameter provider", e); + } + assert parameterValues != null; Review Comment: Solved in 653fec1f5be055d03c956c4cb274ae015818f2c1 ########## parquet/src/test/java/org/apache/iceberg/parquet/TestDictionaryRowGroupFilter.java: ########## @@ -79,15 +58,36 @@ import org.apache.parquet.hadoop.metadata.ColumnChunkMetaData; import org.apache.parquet.hadoop.metadata.ColumnPath; import org.apache.parquet.schema.MessageType; -import org.junit.Assume; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - -@RunWith(Parameterized.class) +import org.junit.jupiter.api.Assumptions; Review Comment: Solved in 833e9bff045287bc164e96c1fcd221fb79cd4138 -- 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: issues-unsubscr...@iceberg.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For additional commands, e-mail: issues-h...@iceberg.apache.org
