You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gobblin.apache.org by le...@apache.org on 2021/06/02 16:50:20 UTC
[gobblin] branch master updated: [GOBBLIN-1450] Update test
framework version for latest IntelliJ
This is an automated email from the ASF dual-hosted git repository.
lesun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/gobblin.git
The following commit(s) were added to refs/heads/master by this push:
new 75f6aff [GOBBLIN-1450] Update test framework version for latest IntelliJ
75f6aff is described below
commit 75f6afff6a39c01569c63ac7895ea692610fbd2c
Author: aprokofiev <ap...@linkedin.com>
AuthorDate: Wed May 26 12:02:12 2021 -0700
[GOBBLIN-1450] Update test framework version for latest IntelliJ
The recent version of IntelliJ are not fully compatible with old
versions of testng and junit that we use. As a result IDE does not show
test names in the UI correctly.
New version of test frameworks should solve this problem.
We also fix a couple of misconfigurations for TestNG. When the class
is annotated with "@Test", TestNG will run all public methods as tests.
We convert a couple of helper methods to private to fix that.
---
.../java/org/apache/gobblin/cluster/GobblinHelixTaskTest.java | 4 ++++
.../gobblin/compaction/mapreduce/AvroCompactionTaskTest.java | 9 +++++----
.../gobblin/compaction/mapreduce/OrcCompactionTaskTest.java | 4 ++--
.../java/org/apache/gobblin/config/client/TestConfigClient.java | 2 +-
.../gobblin/config/common/impl/TestCircularDependency.java | 4 ++--
.../apache/gobblin/config/common/impl/TestInMemoryTopology.java | 2 +-
.../org/apache/gobblin/hive/orc/HiveOrcSerDeManagerTest.java | 2 +-
.../extractor/extract/kafka/KafkaIngestionHealthCheckTest.java | 4 ++++
.../java/org/apache/gobblin/yarn/GobblinYarnAppLauncherTest.java | 2 +-
gradle/scripts/dependencyDefinitions.gradle | 4 ++--
10 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/gobblin-cluster/src/test/java/org/apache/gobblin/cluster/GobblinHelixTaskTest.java b/gobblin-cluster/src/test/java/org/apache/gobblin/cluster/GobblinHelixTaskTest.java
index 951f883..8cdbbef 100644
--- a/gobblin-cluster/src/test/java/org/apache/gobblin/cluster/GobblinHelixTaskTest.java
+++ b/gobblin-cluster/src/test/java/org/apache/gobblin/cluster/GobblinHelixTaskTest.java
@@ -215,6 +215,10 @@ public class GobblinHelixTaskTest {
}
@Subscribe
+ @Test(enabled = false)
+ // When a class has "@Test" annotation, TestNG will run all public methods as tests.
+ // This specific method is public because eventBus is calling it. To prevent running it as a test, we mark it
+ // as "disabled" test.
public void handleContainerHealthCheckFailureEvent(ContainerHealthCheckFailureEvent event) {
this.countDownLatchForFailInTaskCreation.countDown();
}
diff --git a/gobblin-compaction/src/test/java/org/apache/gobblin/compaction/mapreduce/AvroCompactionTaskTest.java b/gobblin-compaction/src/test/java/org/apache/gobblin/compaction/mapreduce/AvroCompactionTaskTest.java
index 223fc57..054c6ed 100644
--- a/gobblin-compaction/src/test/java/org/apache/gobblin/compaction/mapreduce/AvroCompactionTaskTest.java
+++ b/gobblin-compaction/src/test/java/org/apache/gobblin/compaction/mapreduce/AvroCompactionTaskTest.java
@@ -208,6 +208,7 @@ public class AvroCompactionTaskTest {
Assert.assertTrue(fs.exists(new Path (basePath, "Identity/MemberAccount/hourly/2017/04/03/10/compaction_2")));
}
+ @Test
public void testAvroRecompactionWithLimitation() throws Exception {
FileSystem fs = getFileSystem();
String basePath = "/tmp/testRecompactionWithLimitation";
@@ -264,7 +265,7 @@ public class AvroCompactionTaskTest {
return file;
}
- public Schema getSchema() {
+ private Schema getSchema() {
final String KEY_SCHEMA =
"{ \"type\" : \"record\", \"name\" : \"etl\",\"namespace\" : \"reducerTest\", \"fields\" : [ { \"name\" : "
+ "\"key\", \"type\" : {\"type\" : \"record\", \"name\" : \"key_name\", \"namespace\" : \"key_namespace\", "
@@ -275,7 +276,7 @@ public class AvroCompactionTaskTest {
return keySchema.getField("key").schema();
}
- public GenericRecord createRandomRecord () {
+ private GenericRecord createRandomRecord () {
GenericRecordBuilder keyRecordBuilder = new GenericRecordBuilder(getSchema());
keyRecordBuilder.set("partitionKey", new Long(1));
keyRecordBuilder.set("environment", "test");
@@ -284,7 +285,7 @@ public class AvroCompactionTaskTest {
return record;
}
- public GenericRecord createEvolvedSchemaRecord() {
+ private GenericRecord createEvolvedSchemaRecord() {
Schema evolvedSchema =
SchemaBuilder.record("evolved").fields()
.requiredLong("partitionKey").requiredString("environment").requiredString("subKey").optionalString("oppo").endRecord();
@@ -296,7 +297,7 @@ public class AvroCompactionTaskTest {
return keyRecordBuilder.build();
}
- public void createAvroFileWithRepeatingRecords(File file, GenericRecord r, int count, Optional<Schema> schema) throws IOException {
+ private void createAvroFileWithRepeatingRecords(File file, GenericRecord r, int count, Optional<Schema> schema) throws IOException {
DataFileWriter<GenericRecord> writer = new DataFileWriter<>(new GenericDatumWriter<GenericRecord>());
writer.create(schema.isPresent() ? schema.get() : getSchema(), new FileOutputStream(file));
for (int i = 0; i < count; ++i) {
diff --git a/gobblin-compaction/src/test/java/org/apache/gobblin/compaction/mapreduce/OrcCompactionTaskTest.java b/gobblin-compaction/src/test/java/org/apache/gobblin/compaction/mapreduce/OrcCompactionTaskTest.java
index 4b992a2..fc77310 100644
--- a/gobblin-compaction/src/test/java/org/apache/gobblin/compaction/mapreduce/OrcCompactionTaskTest.java
+++ b/gobblin-compaction/src/test/java/org/apache/gobblin/compaction/mapreduce/OrcCompactionTaskTest.java
@@ -384,7 +384,7 @@ public class OrcCompactionTaskTest {
* Read a output ORC compacted file into memory.
* This only works if fields are int value.
*/
- public List<OrcStruct> readOrcFile(Path orcFilePath)
+ private List<OrcStruct> readOrcFile(Path orcFilePath)
throws IOException, InterruptedException {
ReaderImpl orcReader = new ReaderImpl(orcFilePath, new OrcFile.ReaderOptions(new Configuration()));
@@ -402,7 +402,7 @@ public class OrcCompactionTaskTest {
return result;
}
- public void writeOrcRecordsInFile(Path path, TypeDescription schema, List<OrcStruct> orcStructs) throws Exception {
+ private void writeOrcRecordsInFile(Path path, TypeDescription schema, List<OrcStruct> orcStructs) throws Exception {
Configuration configuration = new Configuration();
OrcFile.WriterOptions options = OrcFile.writerOptions(configuration).setSchema(schema);
diff --git a/gobblin-config-management/gobblin-config-client/src/test/java/org/apache/gobblin/config/client/TestConfigClient.java b/gobblin-config-management/gobblin-config-client/src/test/java/org/apache/gobblin/config/client/TestConfigClient.java
index f4371b2..6331e0b 100644
--- a/gobblin-config-management/gobblin-config-client/src/test/java/org/apache/gobblin/config/client/TestConfigClient.java
+++ b/gobblin-config-management/gobblin-config-client/src/test/java/org/apache/gobblin/config/client/TestConfigClient.java
@@ -61,7 +61,7 @@ public class TestConfigClient {
private final ConfigKeyPath nertzTag2 = tag2.createChild("nertzTag2");
- public void printConfig(Config config){
+ private void printConfig(Config config){
Set<Map.Entry<String,ConfigValue>> entrySet = config.entrySet();
for(Map.Entry<String,ConfigValue> entry: entrySet){
System.out.println("key: " + entry.getKey() + ", value: " + entry.getValue());
diff --git a/gobblin-config-management/gobblin-config-core/src/test/java/org/apache/gobblin/config/common/impl/TestCircularDependency.java b/gobblin-config-management/gobblin-config-core/src/test/java/org/apache/gobblin/config/common/impl/TestCircularDependency.java
index 7122b64..adced9d 100644
--- a/gobblin-config-management/gobblin-config-core/src/test/java/org/apache/gobblin/config/common/impl/TestCircularDependency.java
+++ b/gobblin-config-management/gobblin-config-core/src/test/java/org/apache/gobblin/config/common/impl/TestCircularDependency.java
@@ -39,7 +39,7 @@ public class TestCircularDependency {
private final String version = "V1.0";
List<ConfigKeyPath> emptyList = Collections.emptyList();
- public static void addConfigStoreChildren(ConfigStore mockup, String version, ConfigKeyPath parent,
+ private static void addConfigStoreChildren(ConfigStore mockup, String version, ConfigKeyPath parent,
ConfigKeyPath... configKeyPaths) {
List<ConfigKeyPath> children = new ArrayList<ConfigKeyPath>();
for (ConfigKeyPath p : configKeyPaths) {
@@ -49,7 +49,7 @@ public class TestCircularDependency {
when(mockup.getChildren(parent, version)).thenReturn(children);
}
- public static void addConfigStoreImports(ConfigStore mockup, String version, ConfigKeyPath self,
+ private static void addConfigStoreImports(ConfigStore mockup, String version, ConfigKeyPath self,
ConfigKeyPath... configKeyPaths) {
List<ConfigKeyPath> ownImports = new ArrayList<ConfigKeyPath>();
for (ConfigKeyPath p : configKeyPaths) {
diff --git a/gobblin-config-management/gobblin-config-core/src/test/java/org/apache/gobblin/config/common/impl/TestInMemoryTopology.java b/gobblin-config-management/gobblin-config-core/src/test/java/org/apache/gobblin/config/common/impl/TestInMemoryTopology.java
index 4ad53f7..37dffa1 100644
--- a/gobblin-config-management/gobblin-config-core/src/test/java/org/apache/gobblin/config/common/impl/TestInMemoryTopology.java
+++ b/gobblin-config-management/gobblin-config-core/src/test/java/org/apache/gobblin/config/common/impl/TestInMemoryTopology.java
@@ -60,7 +60,7 @@ public class TestInMemoryTopology {
private final ConfigKeyPath nertzTag2 = tag2.createChild("nertzTag2");
- public void printConfig(Config config){
+ private void printConfig(Config config){
Set<Map.Entry<String,ConfigValue>> entrySet = config.entrySet();
for(Map.Entry<String,ConfigValue> entry: entrySet){
System.out.println("key: " + entry.getKey() + ", value: " + entry.getValue());
diff --git a/gobblin-hive-registration/src/test/java/org/apache/gobblin/hive/orc/HiveOrcSerDeManagerTest.java b/gobblin-hive-registration/src/test/java/org/apache/gobblin/hive/orc/HiveOrcSerDeManagerTest.java
index a5b2ee5..8e947e4 100644
--- a/gobblin-hive-registration/src/test/java/org/apache/gobblin/hive/orc/HiveOrcSerDeManagerTest.java
+++ b/gobblin-hive-registration/src/test/java/org/apache/gobblin/hive/orc/HiveOrcSerDeManagerTest.java
@@ -154,7 +154,7 @@ public class HiveOrcSerDeManagerTest {
manager.addSerDeProperties(this.testRegisterPath, registrationUnit);
}
- public void examineSchema(HiveRegistrationUnit registrationUnit) {
+ private void examineSchema(HiveRegistrationUnit registrationUnit) {
List<String> columns = Arrays.asList(registrationUnit.getSerDeProps().getProp(serdeConstants.LIST_COLUMNS).split(","));
Assert.assertTrue(columns.get(0).equals("name"));
Assert.assertTrue(columns.get(1).equals("timestamp"));
diff --git a/gobblin-modules/gobblin-kafka-common/src/test/java/org/apache/gobblin/source/extractor/extract/kafka/KafkaIngestionHealthCheckTest.java b/gobblin-modules/gobblin-kafka-common/src/test/java/org/apache/gobblin/source/extractor/extract/kafka/KafkaIngestionHealthCheckTest.java
index 4f69c6a..13fe26f 100644
--- a/gobblin-modules/gobblin-kafka-common/src/test/java/org/apache/gobblin/source/extractor/extract/kafka/KafkaIngestionHealthCheckTest.java
+++ b/gobblin-modules/gobblin-kafka-common/src/test/java/org/apache/gobblin/source/extractor/extract/kafka/KafkaIngestionHealthCheckTest.java
@@ -49,6 +49,10 @@ public class KafkaIngestionHealthCheckTest {
}
@Subscribe
+ @Test(enabled = false)
+ // When a class has "@Test" annotation, TestNG will run all public methods as tests.
+ // This specific method is public because eventBus is calling it. To prevent running it as a test, we mark it
+ // as "disabled" test.
public void handleContainerHealthCheckFailureEvent(ContainerHealthCheckFailureEvent event) {
this.countDownLatch.countDown();
}
diff --git a/gobblin-yarn/src/test/java/org/apache/gobblin/yarn/GobblinYarnAppLauncherTest.java b/gobblin-yarn/src/test/java/org/apache/gobblin/yarn/GobblinYarnAppLauncherTest.java
index e0456fb..99ee33a 100644
--- a/gobblin-yarn/src/test/java/org/apache/gobblin/yarn/GobblinYarnAppLauncherTest.java
+++ b/gobblin-yarn/src/test/java/org/apache/gobblin/yarn/GobblinYarnAppLauncherTest.java
@@ -124,7 +124,7 @@ public class GobblinYarnAppLauncherTest implements HelixMessageTestBase {
private final Closer closer = Closer.create();
- public static void setEnv(String key, String value) {
+ private static void setEnv(String key, String value) {
try {
Map<String, String> env = System.getenv();
Class<?> cl = env.getClass();
diff --git a/gradle/scripts/dependencyDefinitions.gradle b/gradle/scripts/dependencyDefinitions.gradle
index 2148dc4..7de8178 100644
--- a/gradle/scripts/dependencyDefinitions.gradle
+++ b/gradle/scripts/dependencyDefinitions.gradle
@@ -95,8 +95,8 @@ ext.externalDependency = [
"confluentJsonSerializer": "io.confluent:kafka-json-serializer:" + confluentVersion,
"zkClient": "com.101tec:zkclient:0.7",
"quartz": "org.quartz-scheduler:quartz:2.2.3",
- "testng": "org.testng:testng:6.9.10",
- "junit": "junit:junit:4.12",
+ "testng": "org.testng:testng:6.14.3",
+ "junit": "junit:junit:4.13.2",
"mockserver":"org.mock-server:mockserver-netty:3.10.4",
"jacksonCore": "org.codehaus.jackson:jackson-core-asl:1.9.13",
"jacksonMapper": "org.codehaus.jackson:jackson-mapper-asl:1.9.13",