mosche commented on code in PR #25216: URL: https://github.com/apache/beam/pull/25216#discussion_r1155874129
########## sdks/java/extensions/avro/src/test/avro192/org/apache/beam/sdk/extensions/avro/schemas/TestAvroFactory.java: ########## @@ -0,0 +1,33 @@ +/* + * 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.beam.sdk.extensions.avro.schemas; + +/** + * Create a {@link TestAvro} with some default values. + */ +public class TestAvroFactory extends AbstractTestAvroFactory { + private static final TestAvroNested AVRO_NESTED_SPECIFIC_RECORD = new TestAvroNested(true, 42); + + public static TestAvro newInstanceForAvroCoderTest() throws ReflectiveOperationException { Review Comment: The factory is a bit confusing this way, it took me a bit of time to understand ... Generally I would recommend writing such a factory in a way that the relevant input / data remains in the test class. This makes it easier to understand the test in isolation without having to check another place what the input data is. Anyways, consider this a nitpick, no need to change. Nevertheless, I'd suggest to ... - either have one factory method only (using the empty map flag) or name the methods according to what they create rather than who's supposed to use them (e.g. `newInstanceWithEmptyMap`). - rename the methods of the base factory to make their difference more obvious (`newInstanceForJodaTime` vs `newInstanceForJavaTime` or similar) ########## sdks/java/extensions/avro/src/test/java/org/apache/beam/sdk/extensions/avro/schemas/AvroSchemaTest.java: ########## @@ -302,23 +304,8 @@ public String toString() { private static final DateTime DATE_TIME = new DateTime().withDate(1979, 3, 14).withTime(1, 2, 3, 4); private static final LocalDate DATE = new LocalDate(1979, 3, 14); - private static final TestAvroNested AVRO_NESTED_SPECIFIC_RECORD = new TestAvroNested(true, 42); private static final TestAvro AVRO_SPECIFIC_RECORD = - new TestAvro( - true, - 43, - 44L, - (float) 44.1, - (double) 44.2, - "mystring", - ByteBuffer.wrap(BYTE_ARRAY), - new fixed4(BYTE_ARRAY), - DATE, - DATE_TIME, - TestEnum.abc, - AVRO_NESTED_SPECIFIC_RECORD, - ImmutableList.of(AVRO_NESTED_SPECIFIC_RECORD, AVRO_NESTED_SPECIFIC_RECORD), - ImmutableMap.of("k1", AVRO_NESTED_SPECIFIC_RECORD, "k2", AVRO_NESTED_SPECIFIC_RECORD)); + TestAvroFactory.newInstanceForAvroSchemaTest(); Review Comment: With this change we also stop testings non-empty maps for Avro 1.8.2 :/ How about duplicating the test cases here to test maps both with and without content? The tests using non empty maps could then be excluded from the version tests until fixed for a more recent Avro version. That way tests would also serve as documentation on what is supported and what not (similar to runner validation). -- 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]
