Skip to content

Commit 67f6370

Browse files
committed
correct test case when puts in bufferedMutator got wrong
1 parent 7b79c08 commit 67f6370

File tree

6 files changed

+50
-18
lines changed

6 files changed

+50
-18
lines changed

src/test/java/com/alipay/oceanbase/hbase/NativeHBaseTest.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import org.apache.hadoop.hbase.TableName;
55
import org.apache.hadoop.hbase.client.*;
66
import org.junit.AfterClass;
7+
import org.junit.Assert;
78
import org.junit.Before;
89
import org.junit.BeforeClass;
910

@@ -39,8 +40,13 @@ public void cleanData() throws IOException {
3940

4041
@AfterClass
4142
public static void finish() throws IOException {
42-
hTable.close();
43-
multiCfHTable.close();
43+
try {
44+
hTable.close();
45+
multiCfHTable.close();
46+
} catch (Exception e) {
47+
Assert.assertSame(e.getClass(), IOException.class);
48+
Assert.assertTrue(e.getMessage().contains("put table"));
49+
}
4450
}
4551

4652
}

src/test/java/com/alipay/oceanbase/hbase/OHTableClientTest.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.alipay.oceanbase.hbase.util.ObHTableTestUtil;
2121
import org.junit.*;
2222

23+
import java.io.IOException;
2324
import java.util.LinkedList;
2425
import java.util.List;
2526

@@ -37,7 +38,7 @@ public static void before() throws Exception {
3738
((OHTableClient) multiCfHTable).init();
3839
List<String> tableGroups = new LinkedList<>();
3940
tableGroups.add("test");
40-
tableGroups.add("test_multi_cf");
41+
// tableGroups.add("test_multi_cf");
4142
ObHTableTestUtil.prepareClean(tableGroups);
4243
}
4344

@@ -77,8 +78,13 @@ public void testNew() throws Exception {
7778

7879
@AfterClass
7980
public static void finish() throws Exception {
80-
hTable.close();
81-
multiCfHTable.close();
82-
ObHTableTestUtil.closeConn();
81+
try {
82+
hTable.close();
83+
multiCfHTable.close();
84+
ObHTableTestUtil.closeConn();
85+
} catch (Exception e) {
86+
Assert.assertSame(e.getClass(), IOException.class);
87+
Assert.assertTrue(e.getMessage().contains("put table"));
88+
}
8389
}
8490
}

src/test/java/com/alipay/oceanbase/hbase/OHTableClientTestLoadTest.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,14 @@ public void test_refresh_table_entry() throws Exception {
6767

6868
@AfterClass
6969
public static void after() throws Exception {
70-
hTable.close();
71-
multiCfHTable.close();
72-
ObHTableTestUtil.closeConn();
70+
try {
71+
hTable.close();
72+
multiCfHTable.close();
73+
ObHTableTestUtil.closeConn();
74+
} catch (Exception e) {
75+
Assert.assertSame(e.getClass(), IOException.class);
76+
Assert.assertTrue(e.getMessage().contains("put table"));
77+
}
7378
}
7479

7580
@Test

src/test/java/com/alipay/oceanbase/hbase/OHTablePoolLoadTest.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,13 @@ public void testNew() throws IOException {
167167

168168
@AfterClass
169169
public static void finish() throws IOException, SQLException {
170-
hTable.close();
171-
multiCfHTable.close();
172-
ObHTableTestUtil.closeConn();
170+
try {
171+
hTable.close();
172+
multiCfHTable.close();
173+
ObHTableTestUtil.closeConn();
174+
} catch (Exception e) {
175+
Assert.assertSame(e.getClass(), IOException.class);
176+
Assert.assertTrue(e.getMessage().contains("put table"));
177+
}
173178
}
174179
}

src/test/java/com/alipay/oceanbase/hbase/OHTablePoolTest.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,14 @@ public void prepareCase() {
7373

7474
@AfterClass
7575
public static void finish() throws IOException, SQLException {
76-
hTable.close();
77-
multiCfHTable.close();
78-
ObHTableTestUtil.closeConn();
76+
try {
77+
hTable.close();
78+
multiCfHTable.close();
79+
ObHTableTestUtil.closeConn();
80+
} catch (Exception e) {
81+
Assert.assertSame(e.getClass(), IOException.class);
82+
Assert.assertTrue(e.getMessage().contains("put table"));
83+
}
7984
}
8085

8186
public void test_current_get_close(final OHTablePool ohTablePool, int concurrency, int maxSize) {

src/test/java/com/alipay/oceanbase/hbase/OHTableTest.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,14 @@ public void testNew() throws Exception {
108108

109109
@AfterClass
110110
public static void finish() throws IOException, SQLException {
111-
hTable.close();
112-
multiCfHTable.close();
113-
ObHTableTestUtil.closeConn();
111+
try {
112+
hTable.close();
113+
multiCfHTable.close();
114+
ObHTableTestUtil.closeConn();
115+
} catch (Exception e) {
116+
Assert.assertSame(e.getClass(), IOException.class);
117+
Assert.assertTrue(e.getMessage().contains("put table"));
118+
}
114119
}
115120

116121
}

0 commit comments

Comments
 (0)