create test-common module and move some util out of the helper-specif…

…ic test module (#175)
linkedin · Aug 2, 2021 · 17f362f · 17f362f
1 parent 77d1b72
commit 17f362f
Show file tree

Hide file tree

Showing 52 changed files with 67 additions and 48 deletions.
diff --git a/.../src/main/java/com/linkedin/avroutil1/compatibility/avro110/Generate110TestResources.java b/.../src/main/java/com/linkedin/avroutil1/compatibility/avro110/Generate110TestResources.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro110;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import org.apache.avro.io.BinaryEncoder;
 import org.apache.avro.io.EncoderFactory;
 import org.apache.avro.io.JsonEncoder;

diff --git a/...14/src/main/java/com/linkedin/avroutil1/compatibility/avro14/Generate14TestResources.java b/...14/src/main/java/com/linkedin/avroutil1/compatibility/avro14/Generate14TestResources.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro14;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import org.apache.avro.io.BinaryEncoder;
 import org.apache.avro.io.JsonEncoder;
 import org.apache.avro.specific.SpecificDatumWriter;

diff --git a/...15/src/main/java/com/linkedin/avroutil1/compatibility/avro15/Generate15TestResources.java b/...15/src/main/java/com/linkedin/avroutil1/compatibility/avro15/Generate15TestResources.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro15;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import org.apache.avro.io.BinaryEncoder;
 import org.apache.avro.io.EncoderFactory;
 import org.apache.avro.io.JsonEncoder;

diff --git a/...16/src/main/java/com/linkedin/avroutil1/compatibility/avro16/Generate16TestResources.java b/...16/src/main/java/com/linkedin/avroutil1/compatibility/avro16/Generate16TestResources.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro16;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import org.apache.avro.io.BinaryEncoder;
 import org.apache.avro.io.EncoderFactory;
 import org.apache.avro.io.JsonEncoder;

diff --git a/...17/src/main/java/com/linkedin/avroutil1/compatibility/avro17/Generate17TestResources.java b/...17/src/main/java/com/linkedin/avroutil1/compatibility/avro17/Generate17TestResources.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro17;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import org.apache.avro.io.BinaryEncoder;
 import org.apache.avro.io.EncoderFactory;
 import org.apache.avro.io.JsonEncoder;

diff --git a/...18/src/main/java/com/linkedin/avroutil1/compatibility/avro18/Generate18TestResources.java b/...18/src/main/java/com/linkedin/avroutil1/compatibility/avro18/Generate18TestResources.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro18;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import org.apache.avro.io.BinaryEncoder;
 import org.apache.avro.io.EncoderFactory;
 import org.apache.avro.io.JsonEncoder;

diff --git a/...19/src/main/java/com/linkedin/avroutil1/compatibility/avro19/Generate19TestResources.java b/...19/src/main/java/com/linkedin/avroutil1/compatibility/avro19/Generate19TestResources.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro19;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import org.apache.avro.io.BinaryEncoder;
 import org.apache.avro.io.EncoderFactory;
 import org.apache.avro.io.JsonEncoder;

diff --git a/.../src/test/java/com/linkedin/avroutil1/compatibility/avro110/Avro110ParseBehaviorTest.java b/.../src/test/java/com/linkedin/avroutil1/compatibility/avro110/Avro110ParseBehaviorTest.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro110;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import org.apache.avro.AvroTypeException;
 import org.apache.avro.Schema;
 import org.apache.avro.SchemaParseException;

diff --git a/...java/com/linkedin/avroutil1/compatibility/avro110/Avro110WireFormatCompatibilityTest.java b/...java/com/linkedin/avroutil1/compatibility/avro110/Avro110WireFormatCompatibilityTest.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro110;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import org.apache.avro.AvroTypeException;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericDatumReader;

diff --git a/...java/com/linkedin/avroutil1/compatibility/avro110/AvroCompatibilityHelperAvro110Test.java b/...java/com/linkedin/avroutil1/compatibility/avro110/AvroCompatibilityHelperAvro110Test.java
@@ -7,7 +7,7 @@
 package com.linkedin.avroutil1.compatibility.avro110;
 
 import com.linkedin.avroutil1.Pojo;
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import com.linkedin.avroutil1.compatibility.AvroCompatibilityHelper;
 import com.linkedin.avroutil1.compatibility.AvroVersion;
 import java.io.IOException;

diff --git a/...est/java/com/linkedin/avroutil1/compatibility/avro110/CodeTransformationsAvro110Test.java b/...est/java/com/linkedin/avroutil1/compatibility/avro110/CodeTransformationsAvro110Test.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro110;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import com.linkedin.avroutil1.compatibility.AvroCompatibilityHelper;
 import com.linkedin.avroutil1.compatibility.AvroVersion;
 import com.linkedin.avroutil1.compatibility.CodeTransformations;

diff --git a/...a/com/linkedin/avroutil1/compatibility/avro14/Avro14FutureGeneratedCodeAtCompileTest.java b/...a/com/linkedin/avroutil1/compatibility/avro14/Avro14FutureGeneratedCodeAtCompileTest.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro14;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import net.openhft.compiler.CompilerUtils;
 import org.testng.Assert;
 import org.testng.annotations.Test;

diff --git a/...14/src/test/java/com/linkedin/avroutil1/compatibility/avro14/Avro14GeneratedCodeTest.java b/...14/src/test/java/com/linkedin/avroutil1/compatibility/avro14/Avro14GeneratedCodeTest.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro14;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import com.linkedin.avroutil1.compatibility.AvroCompatibilityHelper;
 import net.openhft.compiler.CompilerUtils;
 import org.apache.avro.Schema;

diff --git a/...14/src/test/java/com/linkedin/avroutil1/compatibility/avro14/Avro14ParseBehaviorTest.java b/...14/src/test/java/com/linkedin/avroutil1/compatibility/avro14/Avro14ParseBehaviorTest.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro14;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import org.apache.avro.Schema;
 import org.testng.Assert;
 import org.testng.annotations.Test;

diff --git a/...t/java/com/linkedin/avroutil1/compatibility/avro14/Avro14WireFormatCompatibilityTest.java b/...t/java/com/linkedin/avroutil1/compatibility/avro14/Avro14WireFormatCompatibilityTest.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro14;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import org.apache.avro.AvroTypeException;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericDatumReader;

diff --git a/...t/java/com/linkedin/avroutil1/compatibility/avro14/AvroCompatibilityHelperAvro14Test.java b/...t/java/com/linkedin/avroutil1/compatibility/avro14/AvroCompatibilityHelperAvro14Test.java
@@ -7,7 +7,7 @@
 package com.linkedin.avroutil1.compatibility.avro14;
 
 import com.linkedin.avroutil1.Pojo;
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import com.linkedin.avroutil1.compatibility.AvroCompatibilityHelper;
 import com.linkedin.avroutil1.compatibility.AvroVersion;
 import java.io.IOException;

diff --git a/.../test/java/com/linkedin/avroutil1/compatibility/avro14/CodeTransformationsAvro14Test.java b/.../test/java/com/linkedin/avroutil1/compatibility/avro14/CodeTransformationsAvro14Test.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro14;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import com.linkedin.avroutil1.compatibility.AvroCompatibilityHelper;
 import com.linkedin.avroutil1.compatibility.AvroVersion;
 import com.linkedin.avroutil1.compatibility.CodeTransformations;

diff --git a/...15/src/test/java/com/linkedin/avroutil1/compatibility/avro15/Avro15ParseBehaviorTest.java b/...15/src/test/java/com/linkedin/avroutil1/compatibility/avro15/Avro15ParseBehaviorTest.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro15;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import org.apache.avro.Schema;
 import org.apache.avro.SchemaParseException;
 import org.testng.Assert;

diff --git a/...t/java/com/linkedin/avroutil1/compatibility/avro15/Avro15WireFormatCompatibilityTest.java b/...t/java/com/linkedin/avroutil1/compatibility/avro15/Avro15WireFormatCompatibilityTest.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro15;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import org.apache.avro.AvroTypeException;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericDatumReader;

diff --git a/...t/java/com/linkedin/avroutil1/compatibility/avro15/AvroCompatibilityHelperAvro15Test.java b/...t/java/com/linkedin/avroutil1/compatibility/avro15/AvroCompatibilityHelperAvro15Test.java
@@ -7,7 +7,7 @@
 package com.linkedin.avroutil1.compatibility.avro15;
 
 import com.linkedin.avroutil1.Pojo;
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import com.linkedin.avroutil1.compatibility.AvroCompatibilityHelper;
 import com.linkedin.avroutil1.compatibility.AvroVersion;
 import java.io.IOException;

diff --git a/.../test/java/com/linkedin/avroutil1/compatibility/avro15/CodeTransformationsAvro15Test.java b/.../test/java/com/linkedin/avroutil1/compatibility/avro15/CodeTransformationsAvro15Test.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro15;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import com.linkedin.avroutil1.compatibility.AvroCompatibilityHelper;
 import com.linkedin.avroutil1.compatibility.AvroVersion;
 import com.linkedin.avroutil1.compatibility.CodeTransformations;

diff --git a/...16/src/test/java/com/linkedin/avroutil1/compatibility/avro16/Avro16ParseBehaviorTest.java b/...16/src/test/java/com/linkedin/avroutil1/compatibility/avro16/Avro16ParseBehaviorTest.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro16;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import org.apache.avro.Schema;
 import org.apache.avro.SchemaParseException;
 import org.testng.Assert;

diff --git a/...t/java/com/linkedin/avroutil1/compatibility/avro16/Avro16WireFormatCompatibilityTest.java b/...t/java/com/linkedin/avroutil1/compatibility/avro16/Avro16WireFormatCompatibilityTest.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro16;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import org.apache.avro.AvroTypeException;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericDatumReader;

diff --git a/...t/java/com/linkedin/avroutil1/compatibility/avro16/AvroCompatibilityHelperAvro16Test.java b/...t/java/com/linkedin/avroutil1/compatibility/avro16/AvroCompatibilityHelperAvro16Test.java
@@ -7,7 +7,7 @@
 package com.linkedin.avroutil1.compatibility.avro16;
 
 import com.linkedin.avroutil1.Pojo;
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import com.linkedin.avroutil1.compatibility.AvroCompatibilityHelper;
 import com.linkedin.avroutil1.compatibility.AvroVersion;
 import java.io.IOException;

diff --git a/.../test/java/com/linkedin/avroutil1/compatibility/avro16/CodeTransformationsAvro16Test.java b/.../test/java/com/linkedin/avroutil1/compatibility/avro16/CodeTransformationsAvro16Test.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro16;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import com.linkedin.avroutil1.compatibility.AvroCompatibilityHelper;
 import com.linkedin.avroutil1.compatibility.AvroVersion;
 import com.linkedin.avroutil1.compatibility.CodeTransformations;

diff --git a/...17/src/test/java/com/linkedin/avroutil1/compatibility/avro17/Avro17ParseBehaviorTest.java b/...17/src/test/java/com/linkedin/avroutil1/compatibility/avro17/Avro17ParseBehaviorTest.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro17;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import org.apache.avro.AvroTypeException;
 import org.apache.avro.Schema;
 import org.apache.avro.SchemaParseException;

diff --git a/...t/java/com/linkedin/avroutil1/compatibility/avro17/Avro17WireFormatCompatibilityTest.java b/...t/java/com/linkedin/avroutil1/compatibility/avro17/Avro17WireFormatCompatibilityTest.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro17;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import org.apache.avro.AvroTypeException;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericDatumReader;

diff --git a/...t/java/com/linkedin/avroutil1/compatibility/avro17/AvroCompatibilityHelperAvro17Test.java b/...t/java/com/linkedin/avroutil1/compatibility/avro17/AvroCompatibilityHelperAvro17Test.java
@@ -7,7 +7,7 @@
 package com.linkedin.avroutil1.compatibility.avro17;
 
 import com.linkedin.avroutil1.Pojo;
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import com.linkedin.avroutil1.compatibility.AvroCompatibilityHelper;
 import com.linkedin.avroutil1.compatibility.AvroVersion;
 import java.io.IOException;

diff --git a/.../test/java/com/linkedin/avroutil1/compatibility/avro17/CodeTransformationsAvro17Test.java b/.../test/java/com/linkedin/avroutil1/compatibility/avro17/CodeTransformationsAvro17Test.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro17;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import com.linkedin.avroutil1.compatibility.AvroCompatibilityHelper;
 import com.linkedin.avroutil1.compatibility.AvroVersion;
 import com.linkedin.avroutil1.compatibility.CodeTransformations;

diff --git a/...18/src/test/java/com/linkedin/avroutil1/compatibility/avro18/Avro18ParseBehaviorTest.java b/...18/src/test/java/com/linkedin/avroutil1/compatibility/avro18/Avro18ParseBehaviorTest.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro18;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import org.apache.avro.AvroTypeException;
 import org.apache.avro.Schema;
 import org.apache.avro.SchemaParseException;

diff --git a/...t/java/com/linkedin/avroutil1/compatibility/avro18/Avro18WireFormatCompatibilityTest.java b/...t/java/com/linkedin/avroutil1/compatibility/avro18/Avro18WireFormatCompatibilityTest.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro18;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import org.apache.avro.AvroTypeException;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericDatumReader;

diff --git a/...t/java/com/linkedin/avroutil1/compatibility/avro18/AvroCompatibilityHelperAvro18Test.java b/...t/java/com/linkedin/avroutil1/compatibility/avro18/AvroCompatibilityHelperAvro18Test.java
@@ -7,7 +7,7 @@
 package com.linkedin.avroutil1.compatibility.avro18;
 
 import com.linkedin.avroutil1.Pojo;
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import com.linkedin.avroutil1.compatibility.AvroCompatibilityHelper;
 import com.linkedin.avroutil1.compatibility.AvroVersion;
 import java.io.IOException;

diff --git a/.../test/java/com/linkedin/avroutil1/compatibility/avro18/CodeTransformationsAvro18Test.java b/.../test/java/com/linkedin/avroutil1/compatibility/avro18/CodeTransformationsAvro18Test.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro18;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import com.linkedin.avroutil1.compatibility.AvroCompatibilityHelper;
 import com.linkedin.avroutil1.compatibility.AvroVersion;
 import com.linkedin.avroutil1.compatibility.CodeTransformations;

diff --git a/...19/src/test/java/com/linkedin/avroutil1/compatibility/avro19/Avro19ParseBehaviorTest.java b/...19/src/test/java/com/linkedin/avroutil1/compatibility/avro19/Avro19ParseBehaviorTest.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro19;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import org.apache.avro.AvroTypeException;
 import org.apache.avro.Schema;
 import org.apache.avro.SchemaParseException;

diff --git a/...t/java/com/linkedin/avroutil1/compatibility/avro19/Avro19WireFormatCompatibilityTest.java b/...t/java/com/linkedin/avroutil1/compatibility/avro19/Avro19WireFormatCompatibilityTest.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro19;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import org.apache.avro.AvroTypeException;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericDatumReader;

diff --git a/...t/java/com/linkedin/avroutil1/compatibility/avro19/AvroCompatibilityHelperAvro19Test.java b/...t/java/com/linkedin/avroutil1/compatibility/avro19/AvroCompatibilityHelperAvro19Test.java
@@ -7,7 +7,7 @@
 package com.linkedin.avroutil1.compatibility.avro19;
 
 import com.linkedin.avroutil1.Pojo;
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import com.linkedin.avroutil1.compatibility.AvroCompatibilityHelper;
 import com.linkedin.avroutil1.compatibility.AvroVersion;
 import java.io.IOException;

diff --git a/.../test/java/com/linkedin/avroutil1/compatibility/avro19/CodeTransformationsAvro19Test.java b/.../test/java/com/linkedin/avroutil1/compatibility/avro19/CodeTransformationsAvro19Test.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility.avro19;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import com.linkedin.avroutil1.compatibility.AvroCompatibilityHelper;
 import com.linkedin.avroutil1.compatibility.AvroVersion;
 import com.linkedin.avroutil1.compatibility.CodeTransformations;

diff --git a/...c/test/java/com/linkedin/avroutil1/compatibility/AvroCompatibilityHelperDefaultsTest.java b/...c/test/java/com/linkedin/avroutil1/compatibility/AvroCompatibilityHelperDefaultsTest.java
@@ -7,7 +7,7 @@
 package com.linkedin.avroutil1.compatibility;
 
 import com.google.common.base.Throwables;
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import org.apache.avro.AvroRuntimeException;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericData;

diff --git a/...a/com/linkedin/avroutil1/compatibility/AvroCompatibilityHelperGenericUtilMethodsTest.java b/...a/com/linkedin/avroutil1/compatibility/AvroCompatibilityHelperGenericUtilMethodsTest.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericData;
 import org.testng.Assert;

diff --git a/...test/java/com/linkedin/avroutil1/compatibility/AvroCompatibilityHelperJsonCodecsTest.java b/...test/java/com/linkedin/avroutil1/compatibility/AvroCompatibilityHelperJsonCodecsTest.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import net.javacrumbs.jsonunit.assertj.JsonAssertions;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericDatumReader;

diff --git a/...rc/test/java/com/linkedin/avroutil1/compatibility/AvroCompatibilityHelperParsingTest.java b/...rc/test/java/com/linkedin/avroutil1/compatibility/AvroCompatibilityHelperParsingTest.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import java.util.Arrays;
 import java.util.Map;
 import org.apache.avro.AvroTypeException;

diff --git a/...o/src/test/java/com/linkedin/avroutil1/compatibility/AvroWireFormatCompatibilityTest.java b/...o/src/test/java/com/linkedin/avroutil1/compatibility/AvroWireFormatCompatibilityTest.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import org.apache.avro.AvroTypeException;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericDatumReader;

diff --git a/...er-tests-allavro/src/test/java/com/linkedin/avroutil1/compatibility/FieldBuilderTest.java b/...er-tests-allavro/src/test/java/com/linkedin/avroutil1/compatibility/FieldBuilderTest.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import org.apache.avro.Schema;
 import org.testng.Assert;
 import org.testng.annotations.Test;

diff --git a/...lper-tests-allavro/src/test/java/com/linkedin/avroutil1/compatibility/PropAccessTest.java b/...lper-tests-allavro/src/test/java/com/linkedin/avroutil1/compatibility/PropAccessTest.java
@@ -6,7 +6,7 @@
 
 package com.linkedin.avroutil1.compatibility;
 
-import com.linkedin.avroutil1.TestUtil;
+import com.linkedin.avroutil1.testcommon.TestUtil;
 import org.apache.avro.Schema;
 import org.testng.Assert;
 import org.testng.annotations.Test;