Skip to content

Commit f4638c1

Browse files
qiyuewuyiqiyuewuyi
committed
optimize test for delete table after case finish.
1 parent c126a40 commit f4638c1

File tree

6 files changed

+64
-36
lines changed

6 files changed

+64
-36
lines changed

‎src/test/java/com/aliyun/openservices/ots/integration/ConditionalUpdateTest.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.aliyun.openservices.ots.utils.ServiceSettings;
77

88
import com.aliyun.openservices.ots.utils.TestUtil;
9+
import org.junit.AfterClass;
910
import org.junit.Before;
1011
import org.junit.Test;
1112

@@ -23,6 +24,12 @@ public class ConditionalUpdateTest {
2324
private static final OTS ots = OTSClientFactory.createOTSClient(ServiceSettings.load());
2425
private static Logger LOG = Logger.getLogger(ConditionalUpdateTest.class.getName());
2526

27+
@AfterClass
28+
public static void classAfter() {
29+
TestUtil.DeleteTable(ots, tableName);
30+
ots.shutdown();
31+
}
32+
2633
@Before
2734
public void setup() throws Exception {
2835
LOG.info("Instance: " + ServiceSettings.load().getOTSInstanceName());

‎src/test/java/com/aliyun/openservices/ots/integration/FilterAdvanceTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public class FilterAdvanceTest extends BaseFT {
3232

3333
@AfterClass
3434
public static void classAfter() {
35+
TestUtil.DeleteTable(ots, tableName);
3536
ots.shutdown();
3637
}
3738

‎src/test/java/com/aliyun/openservices/ots/integration/FilterRestrictionAndParamCheckingTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public class FilterRestrictionAndParamCheckingTest extends BaseFT {
3838

3939
@AfterClass
4040
public static void classAfter() {
41+
TestUtil.DeleteTable(ots, tableName);
4142
ots.shutdown();
4243
}
4344

‎src/test/java/com/aliyun/openservices/ots/integration/OTSClientTest.java‎

Lines changed: 41 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import com.aliyun.openservices.ots.model.*;
1111
import com.aliyun.openservices.ots.utils.TestUtil;
12+
import org.junit.AfterClass;
1213
import org.junit.Before;
1314
import org.junit.Test;
1415

@@ -22,19 +23,22 @@ public class OTSClientTest {
2223
private static final int MILLISECONDS_UNTIL_TABLE_READY = 10 * 1000;
2324
private static final int TABLE_OPERATION_INTERVAL_IN_MSEC = 1 * 1000;
2425

25-
private String tableName = TestUtil.newTableName("ots_client_test_table");
26-
final OTS ots = OTSClientFactory.createOTSClient(ServiceSettings.load());
26+
private static String tableName = TestUtil.newTableName("ots_client_test_table");
27+
private static final OTS ots = OTSClientFactory.createOTSClient(ServiceSettings.load());
2728

2829
private static final Logger LOG = Logger.getLogger(OTSClientTest.class.getName());
2930

31+
@AfterClass
32+
public static void classAfter() {
33+
TestUtil.DeleteTable(ots, tableName);
34+
ots.shutdown();
35+
}
36+
3037
@Before
3138
public void setup() throws Exception {
3239
LOG.info("Instance: " + ServiceSettings.load().getOTSInstanceName());
3340

34-
try {
35-
DeleteTableRequest deleteTableRequest = new DeleteTableRequest(tableName);
36-
ots.deleteTable(deleteTableRequest);
37-
} catch (Exception ex) {;}
41+
deleteTable(tableName);
3842
}
3943

4044
@Test
@@ -67,44 +71,44 @@ public void testTableOperation() throws Exception {
6771
Thread.sleep(70 * 1000 + 10); // sleep more than 70 seconds
6872
UpdateTableRequest utRequest = new UpdateTableRequest(tableName);
6973
ReservedThroughputChange capacityChange = new ReservedThroughputChange();
70-
capacityChange.setReadCapacityUnit(7);
74+
capacityChange.setReadCapacityUnit(1);
7175
utRequest.setReservedThroughputChange(capacityChange);
7276
UpdateTableResult utResponse = ots.updateTable(utRequest);
7377
assertTrue(utResponse.getReservedThroughputDetails().getLastDecreaseTime() != 0);
7478
assertTrue(utResponse.getReservedThroughputDetails().getLastIncreaseTime() != 0);
7579
assertEquals(utResponse.getReservedThroughputDetails().getNumberOfDecreasesToday(), 1);
76-
assertEquals(utResponse.getReservedThroughputDetails().getCapacityUnit().getReadCapacityUnit(), 7);
77-
assertEquals(utResponse.getReservedThroughputDetails().getCapacityUnit().getWriteCapacityUnit(), 10);
80+
assertEquals(utResponse.getReservedThroughputDetails().getCapacityUnit().getReadCapacityUnit(), 1);
81+
assertEquals(utResponse.getReservedThroughputDetails().getCapacityUnit().getWriteCapacityUnit(), 3);
7882

7983
LOG.info("get table meta and check table is updated");
8084
dtResult = ots.describeTable(dtRequest);
8185
compareTableMeta(tableMeta,dtResult.getTableMeta());
8286
assertTrue(dtResult.getReservedThroughputDetails().getLastDecreaseTime() != 0);
8387
assertTrue(dtResult.getReservedThroughputDetails().getLastIncreaseTime() != 0);
8488
assertEquals(dtResult.getReservedThroughputDetails().getNumberOfDecreasesToday(), 1);
85-
assertEquals(dtResult.getReservedThroughputDetails().getCapacityUnit().getReadCapacityUnit(), 7);
86-
assertEquals(dtResult.getReservedThroughputDetails().getCapacityUnit().getWriteCapacityUnit(), 10);
89+
assertEquals(dtResult.getReservedThroughputDetails().getCapacityUnit().getReadCapacityUnit(), 1);
90+
assertEquals(dtResult.getReservedThroughputDetails().getCapacityUnit().getWriteCapacityUnit(), 3);
8791

8892
LOG.info("decrease write capacity");
8993
Thread.sleep(70 * 1000 + 10); // sleep more than 70 seconds
9094
capacityChange = new ReservedThroughputChange();
91-
capacityChange.setWriteCapacityUnit(8);
95+
capacityChange.setWriteCapacityUnit(2);
9296
utRequest.setReservedThroughputChange(capacityChange);
9397
utResponse = ots.updateTable(utRequest);
9498
assertTrue(utResponse.getReservedThroughputDetails().getLastDecreaseTime() != 0);
9599
assertTrue(utResponse.getReservedThroughputDetails().getLastIncreaseTime() != 0);
96100
assertEquals(utResponse.getReservedThroughputDetails().getNumberOfDecreasesToday(), 2);
97-
assertEquals(utResponse.getReservedThroughputDetails().getCapacityUnit().getReadCapacityUnit(), 7);
98-
assertEquals(utResponse.getReservedThroughputDetails().getCapacityUnit().getWriteCapacityUnit(), 8);
101+
assertEquals(utResponse.getReservedThroughputDetails().getCapacityUnit().getReadCapacityUnit(), 1);
102+
assertEquals(utResponse.getReservedThroughputDetails().getCapacityUnit().getWriteCapacityUnit(), 2);
99103

100104
LOG.info("get table meta and check table is updated");
101105
dtResult = ots.describeTable(dtRequest);
102106
compareTableMeta(tableMeta,dtResult.getTableMeta());
103107
assertTrue(dtResult.getReservedThroughputDetails().getLastDecreaseTime() != 0);
104108
assertTrue(dtResult.getReservedThroughputDetails().getLastIncreaseTime() != 0);
105109
assertEquals(dtResult.getReservedThroughputDetails().getNumberOfDecreasesToday(), 2);
106-
assertEquals(dtResult.getReservedThroughputDetails().getCapacityUnit().getReadCapacityUnit(), 7);
107-
assertEquals(dtResult.getReservedThroughputDetails().getCapacityUnit().getWriteCapacityUnit(), 8);
110+
assertEquals(dtResult.getReservedThroughputDetails().getCapacityUnit().getReadCapacityUnit(), 1);
111+
assertEquals(dtResult.getReservedThroughputDetails().getCapacityUnit().getWriteCapacityUnit(), 2);
108112

109113
LOG.info("delete table");
110114
DeleteTableRequest delRequest = new DeleteTableRequest(tableName);
@@ -1048,17 +1052,12 @@ public void testBatchGetRow() throws Exception {
10481052
String[] tableNames = new String[TABLE_COUNT];
10491053
for (int i = 0; i < TABLE_COUNT; i++) {
10501054
tableNames[i] = tableName + "_" + i;
1051-
try {
1052-
DeleteTableRequest deleteTableRequest = new DeleteTableRequest(tableNames[i]);
1053-
ots.deleteTable(deleteTableRequest);
1054-
Thread.sleep(TABLE_OPERATION_INTERVAL_IN_MSEC);
1055-
} catch (Exception ex) {;}
1055+
deleteTable(tableNames[i]);
1056+
Thread.sleep(TABLE_OPERATION_INTERVAL_IN_MSEC);
10561057

10571058
tableMeta.setTableName(tableNames[i]);
10581059
ctRequest.setTableMeta(tableMeta);
10591060
ots.createTable(ctRequest);
1060-
1061-
Thread.sleep(TABLE_OPERATION_INTERVAL_IN_MSEC);
10621061
}
10631062
Thread.sleep(MILLISECONDS_UNTIL_TABLE_READY);
10641063
for (int i = 0; i < TABLE_COUNT; i++) {
@@ -1089,6 +1088,10 @@ public void testBatchGetRow() throws Exception {
10891088
compareRow(row, i * ROW_COUNT + j, new String[]{"uid", "name", "sid", "flag", "col_integer", "col_string", "col_binary"});
10901089
}
10911090
}
1091+
1092+
for (int i = 0; i < TABLE_COUNT; i++) {
1093+
deleteTable(tableNames[i]);
1094+
}
10921095
}
10931096

10941097
@Test
@@ -1107,17 +1110,12 @@ public void testBatchWriteRow() throws Exception {
11071110
String[] tableNames = new String[TABLE_COUNT];
11081111
for (int i = 0; i < TABLE_COUNT; i++) {
11091112
tableNames[i] = tableName + "_" + i;
1110-
try {
1111-
DeleteTableRequest deleteTableRequest = new DeleteTableRequest(tableNames[i]);
1112-
ots.deleteTable(deleteTableRequest);
1113-
Thread.sleep(TABLE_OPERATION_INTERVAL_IN_MSEC);
1114-
} catch (Exception ex) {;}
1113+
deleteTable(tableNames[i]);
1114+
Thread.sleep(TABLE_OPERATION_INTERVAL_IN_MSEC);
11151115

11161116
tableMeta.setTableName(tableNames[i]);
11171117
ctRequest.setTableMeta(tableMeta);
11181118
ots.createTable(ctRequest);
1119-
1120-
Thread.sleep(TABLE_OPERATION_INTERVAL_IN_MSEC);
11211119
}
11221120
Thread.sleep(MILLISECONDS_UNTIL_TABLE_READY);
11231121
for (int i = 0; i < TABLE_COUNT; i++) {
@@ -1364,6 +1362,10 @@ public void testBatchWriteRow() throws Exception {
13641362
}
13651363
}
13661364
}
1365+
1366+
for (int i = 0; i < TABLE_COUNT; i++) {
1367+
deleteTable(tableNames[i]);
1368+
}
13671369
}
13681370

13691371
@Test
@@ -1394,8 +1396,8 @@ private TableMeta getTestTableMeta() {
13941396

13951397
private CapacityUnit getTestCapacityUnit() {
13961398
CapacityUnit capacityUnit = new CapacityUnit();
1397-
capacityUnit.setReadCapacityUnit(10);
1398-
capacityUnit.setWriteCapacityUnit(10);
1399+
capacityUnit.setReadCapacityUnit(3);
1400+
capacityUnit.setWriteCapacityUnit(3);
13991401
return capacityUnit;
14001402
}
14011403

@@ -1537,4 +1539,11 @@ private void generateDataForTest(String tableName, int from, int to) {
15371539
writeRows(request);
15381540
}
15391541
}
1542+
1543+
private void deleteTable(String tableName) {
1544+
try {
1545+
DeleteTableRequest deleteTableRequest = new DeleteTableRequest(tableName);
1546+
ots.deleteTable(deleteTableRequest);
1547+
} catch (Exception ex) {;}
1548+
}
15401549
}

‎src/test/java/com/aliyun/openservices/ots/integration/RelationFilterTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.aliyun.openservices.ots.ClientConfiguration;
44
import com.aliyun.openservices.ots.OTS;
5+
import com.aliyun.openservices.ots.OTSClient;
56
import com.aliyun.openservices.ots.common.BaseFT;
67
import com.aliyun.openservices.ots.common.OTSHelper;
78
import com.aliyun.openservices.ots.common.Utils;
@@ -31,6 +32,7 @@ public class RelationFilterTest extends BaseFT {
3132

3233
@AfterClass
3334
public static void classAfter() {
35+
TestUtil.DeleteTable(ots, tableName);
3436
ots.shutdown();
3537
}
3638

‎src/test/java/com/aliyun/openservices/ots/utils/TestUtil.java‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package com.aliyun.openservices.ots.utils;
22

3-
import com.aliyun.openservices.ots.model.ColumnType;
4-
import com.aliyun.openservices.ots.model.ColumnValue;
5-
import com.aliyun.openservices.ots.model.PrimaryKeyType;
6-
import com.aliyun.openservices.ots.model.PrimaryKeyValue;
3+
import com.aliyun.openservices.ots.OTS;
4+
import com.aliyun.openservices.ots.OTSClient;
5+
import com.aliyun.openservices.ots.model.*;
76

87
import java.util.ArrayList;
98
import java.util.List;
@@ -78,4 +77,13 @@ public static ColumnValue randomColumnValue(ColumnType type) {
7877
throw new IllegalStateException("Unsupported column type: " + type);
7978
}
8079
}
80+
81+
public static void DeleteTable(OTS ots, String tableName) {
82+
try {
83+
DeleteTableRequest deleteTableRequest = new DeleteTableRequest(tableName);
84+
ots.deleteTable(deleteTableRequest);
85+
} catch (Exception ex) {
86+
;
87+
}
88+
}
8189
}

0 commit comments

Comments
 (0)