From bbd8b75423ac3bf35a6696df24f3804dcb586cac Mon Sep 17 00:00:00 2001 From: Frank Yin Date: Sat, 9 Oct 2021 02:36:29 +0800 Subject: [PATCH] For https://foursquare.atlassian.net/browse/PLAC-11387, bump test framework version (#9) --- pom.xml | 4 ++-- .../vcnc/haeinsa/HaeinsaTestingCluster.java | 20 ++++++++----------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index cf68649..5aecf3c 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ com.factual haeinsa - 1.0.5.12-factual + 1.0.5.13-factual jar haeinsa @@ -173,7 +173,7 @@ org.testng testng - 6.1.1 + 6.14.3 test diff --git a/src/test/java/kr/co/vcnc/haeinsa/HaeinsaTestingCluster.java b/src/test/java/kr/co/vcnc/haeinsa/HaeinsaTestingCluster.java index 7fd78ae..16941b3 100644 --- a/src/test/java/kr/co/vcnc/haeinsa/HaeinsaTestingCluster.java +++ b/src/test/java/kr/co/vcnc/haeinsa/HaeinsaTestingCluster.java @@ -15,22 +15,18 @@ */ package kr.co.vcnc.haeinsa; -import java.io.IOException; -import java.util.Set; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.HBaseConfiguration; -import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.HColumnDescriptor; -import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MiniHBaseCluster; +import org.apache.hadoop.hbase.*; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTableInterface; import org.apache.hadoop.hbase.client.HTablePool; import org.apache.hadoop.hbase.util.PoolMap.PoolType; -import org.testng.internal.annotations.Sets; + +import java.io.IOException; +import java.util.HashSet; +import java.util.Set; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; public final class HaeinsaTestingCluster { public static HaeinsaTestingCluster INSTANCE; @@ -68,7 +64,7 @@ private HaeinsaTestingCluster() throws Exception { haeinsaTablePool = TestingUtility.createHaeinsaTablePool(configuration, threadPool); hbaseTablePool = new HTablePool(configuration, 128, PoolType.Reusable); transactionManager = new HaeinsaTransactionManager(haeinsaTablePool); - createdTableNames = Sets.newHashSet(); + createdTableNames = new HashSet<>(); } public MiniHBaseCluster getCluster() {