Skip to content

Commit a6f0c44

Browse files
whybertwhybert
committed
Merge pull request #3 from aliyun/optimize_test
Optimize test
2 parents c126a40 + 0c38298 commit a6f0c44

File tree

7 files changed

+61
-40
lines changed

7 files changed

+61
-40
lines changed

‎.travis.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jdk:
55
- oraclejdk8
66
env:
77
global:
8-
- secure: SimZMTg4ZlUmeko5nIngk+NPMHA+nHZi9Bid8fFi7g4V3hkRjKByQgGoO+5GQzZacRttxosczAKkJ65tejgHZ3rcTBKqljOJ5Dw3jbh4+ABYLH9cY+GzEIodQvgpJzjcGqeWZNUlYdmEqXKsFEZcDdgvnDJJtkrHg8YQmJEwk9DVtyCnHYapXAcsK6xlaB14GIuLKbyZMw3n4tJ33+afusUdIXT1eJtYP3zKjY8VnHZWHFXnvrN7F7pynnKON8WSx4NZa3Wov290ByhPYglSdFTVX9zul7hPD4ZMfCJ5Om3Iz1O1m5yvLckn/y2IBwIGraXgvlXMKhqMMlb9Zvy2mmZWIOViOl/gG7g6LzbGbJMmj4vD95/Iv3FPO/j+M2F/xRUxjaGPIvhzP1Cd+P0NUZxPo5JQj0JYikDx0PTQd8RTOnzQ71YMXPbiL8Td1NcxwLrLqQLU5/lUoLIxusTDeMOu0EGbK43HAU6AlyAtxgjsTiva8OmR/AjfdHINotiBchoYjq9ZRrBzxakBvDLr+gnYn8UAdm6AoE8DOhz3ZoIgFiyjvNkQ31wWacoZrCoszY4ZE2QBwhXyfq7iAqJkPtg4qiftLnmOEMeyLEnKJM/kFk2tpYhxyBgLbxjdRG4WHaIXjE7lmKpzsPy43WnWJQMYFI3BuuC0dfDjuRbjy5s=
9-
- secure: DXaytAv0L3pV8GlTbcCe0u0ajKDxnZhLnvBk3d8w9Y0AuncgWw4BMngeG2n+kATILRJwV0TS3a0yMRTqMF8o4yWwguHZtqKkU5dvWtbfQowoYaFbXkJZOCkaJL89h0LMTzTyXxNUQurp/U3XDSQARxyoXKBd65eZmj06oRIm5GyzQvc3kKzke7Jy/WhQ5r+3aEm0qUwomwaLVI9KFY81qo5eXkbndF1VLIhELhQgpB+brWUoRnzjssYIYPsYUgeTHrdhgePXbGP5Rk7T9OK/+giNCt4c5PLqUpnQ0SK4gGVpukAxKvoA/5KMxefrPdDypQ6If/TC01B7tYbH8QP88C0vZKccJlKyh9CLMmW3HBRFXGfMXISky1Kwn/8OCUZZrUISvGcDRAVmZx6+cOg6qbhYGHPjbJELA71mVRaIQfm8yQGXpPZeikpSLttzPAZMPb8Dgy3fGOlh3jppipeWO9jv2tJPaMnWBBVoXuWEpJXQXiRhhYrK7RLlBBJLyS3DGVd9c2G2b7o8SXPfQuvcxSMloEQtbBJUC0DENXwFwcfuNo1STGUrsHuUaLgRzjzL1tmkcDp8tU9f01qbhjrCHolWJTOFISDu8xQWPkWFapihWfrhshNizjnagicFxBgD6zhjSXgXHLEZQnkzgkBugToZZB+K4wDKD3xTaR8rt70=
10-
- secure: QEQ2B9+5jinULaZgWAelkndYg+0RAczxv9OSEMYxEj9kzr8W6EJYeZi/KsTAY6kKI4IDZwptclDbKF+uVAruQ52UtDiNIu69AWfdYu2IL1YwQ3YGJRFtvA0qZpELAY3VHyB6zR9Qm0A1DeDtcYglL+QUlwL54lqVnz8Z+4hp8zikGKb7nYl+8oztWGYaghQSf641/7nZuZFyhOzhS34CN7tWEM8aSzYxBVg2G4x6bYTgbGJL00blzENbyqrWe4ZsMCXc1AWtxNLtS8TalOJxISKw97Gx5EksbSKPaaEhlfik1ooQ+w2UAgMAeSrcaMhFoOqZ6QLItoFveVu1CskHHwHngp7OziemroOG/8Ef8m11lVloZIRc7qogivYPHxhoFD49+n0xiaWsMXMOtUzP74z5T4P5AvbVtq4qycyCAxgMqh2c/wqTkezUQC+cw1Qho6kJM/bAxfyLPSOvOWMKbrRU09sM5/OA0+1JiU1QYbVuYY9w/z+9MaRMaFTsIioWWyAD8FF5TSMroBsjkFsQm7/uZFxWXFFZt8d6Tnq28nZfW31T0PwtIr8jknRe9p3ijLqqRh1i13DIE5u13ZyKsLJEBZyJdPyA3g3+oq7UfKFbIxFdjRM3JA+FQVh5yvrfxqu5qgC0RaU4uMXDu6Vg9AvuSVNedo9JjVjFwCcTU6Q=
11-
- secure: gcOuRG1xp+o17hL2X29qPikn1Hkl2NI0TRSnbuiT8n8gZrpyrP3+BpDR/XxbedrOGLgU6lZFGY3ZX6m1+8aD2Xkh9nCK/X1TakJ02qSDzpvpBBHbroyd9fWS4Y6bMGNkdzO102MMg6q9ICiFhcOaxz7mFHt49TBlVI+YqL2xRUXOHq/ZMdopLiVxjpATXdFb9NV9MqVsCS/7XV9+o61QVqfpvHErbiKK7AqMj7X5VJjwDfW28tJHmq8VeFh4ZGzvEn7HF85Aq7W6FCuacejdP3rmY5z5yz5Z1kZTFV22+yXLKqe1Gt4yCn2lufw0soQTW+++2yVj9tgH/g7y9/YrDJbkjCfpYwOXRjQIS7NHMWB8qngMn4sGajt9VWTCP8EDx6WYdoYzOeq+grl1dH+pdwxtgmp+0nAZMsBwc16t+X6Jbx5yTu4mtacZOi/yTuy/3Zaas464XwW83oRHpw0PNi1H6lwmmJGW1+4L9HqqdDzjT/xeqwPGpcrSdAR6ENWSxaKfcVmfGt4BFDKzCW0LVSV555pW4lJMlzEr/L2DtL9QdpPGPtcAFfHuuzQBGt0i6cn4GRe+mMWatBnmlVX8Jb8VbOloWOWD4R3AzcQzso4FRtuUoQdFeQ+cVM7pzY8EhSoGkn8cbljOT/MVusdkfH03vVVUJnD2mLvjaSlqtwA=
8+
- secure: pb3cA55ecarxX3rUoD5WojFccNvj2in04bM/SNAiqEWgEY14eLZoHo7WdYAvqjoRG33tXMsGzMPKOKQeCIldl4MWHK8BKgul419AGgRyFVviENnQNwT4xPGkhMKvdO3i5dk455HviXLC/5pQe63VZvn+dr24g2wPo2I02FRPLNS/2wcIcZzvTFgJLG8NAdAelkZKKcQtLSE/Os5XMFwqY0vQbNsEAbhgOSnT9ZU64bih0khAp5b2Yo8snX+vpiElioekW0nIwtuYbjoI4D8Zzm22oyWod81AYZ+hXbvNI4LX6UB0FWuo1PpNzscArhBchCD13eFTOTJg+a9RlGtYfJSrqfVX/8PqwN1viHNjDTxo/4xfTrU19fLewb/cPmtBmokwACcmESs4mpzSDZazJqtAK7k+ahweizKHrQC8KsTQMaVh901PpUb8ezZG2hxQE2zxialRHOxb8FdP7bb8+j2EvHCjhYcE9nA02sBXetuymZSGPfHvL7A9Bm7Nn8F8VFXBuwa0y5HhcmGfIfq4yi8yMkPbZQb2X900zqKi+Kp28WnWP6uhyJjlwyg50h5QeLsCYpQZRkmtJC3IPOC/LQ+vYccoNBq0PAiwHrwJZBKIGuZ1a0ZLWrOhf4wKrGnyOTKEk1IU1UvdmMCn9BiI6A3W6i7jc57f/GdywKBCSdk=
9+
- secure: ihi5j5IXJ9hu583MUV0oFgUBO8GvIzovy+ou3pPdG7/TeT50vnLDsIys5A5X6jqhchC7WrrlVwrRG999o6NZJEk4S3PG+reWWI7MrciQKiuqLz2bIPm0BMDocHZ7vCnNT0GXMBxA/Ri0Xp9in6vTiIO8AsY1wb/4RHFvs98bCeJ8H+Pn1tfAHKolNEUMY7TyCOGgoDJqe489hlhjiEZCvZIFnxlhRjH+tQoyiN3jHOpLswPu1JebZHQFCOuQhGjfgR4BoeD7JtGgHKpr4N71XxGjgf7Pmq2SgpySfDfDCllcm2vRl+s0OUZF0AzmX6covDYdonPTQFMsRsKtnkI2IqlguukOjLROKx0Qn+p+qi4e5wmt6CMfBQFTVHx8WU3zFPBTfdiQ2OdY67n0vcDMWjGwRCBasnRcWIYtzsZT8M9jsY7LPpwAGBpjhW9gTl8tW08rshfnxyNPtErc5LiUlKXBTgNMMOfE1F6b7HM/YYoy1D+CXieIdRUxC4QcB1g0YQ7bE7RtwdSwjTRjI3pWOcuj7uY725R9Hj0ZhZSy+lpBHX5WKrXUIrMqDqAkyWplUWSKWTV9Xh4VFu7q2VC2nuWJ1MECuDv8biFT6HkXYBnGwah5vYOkrginf4o+9iQiY8lv71eweHIgLX2MevKOm25oVoce4J3cY0ej/Yy1D/M=
10+
- secure: e2sBWT97y2TnAFEKA981vyy63LZYYJqKgGeVlD+5tQ+kCDMfK2GaDscms9y/wWcZKtQ7FzfAVXWY4zEFPLgxN11yRXSQafoXg4vV/O7+VDTbI/SuU+3GYhpO3fWD9n6Nvv6R2UPEqlro/cvNflE5HXJHdrSFn79rlmtaxO3Pl34P1NJHNBOl6C3epABZWj+c8jtUBzqKmn+45QaO9+A1tnEPAUw/H6mh45fmsLPMMvrq5DOp34R/uzspFXG7plwJZrOT+4zlcT2+nYbvpoBXWOGf0gk2OfREQMiq8nZuyGEd3JGjzIxe4YTqrmBwh5rNp9CEj3noLOyv4UYpCgMB45jnOP2MVHIbsfsF1VJgijAVcgk/3sQxDjUyuBGlnUl/fub0CGcrTv0uxOcry+hB2CAQKv3omZi0yDFW6OuQKX4l6dmMwHxaEaUjsscMI6zf4jINKDOiRgd8r12sXETTm0U2d6yABTM1qv7V9j7Kng8dy6XROt5U/0iG1VGfPfRT1JwkcAalgIwD83Kf/PgSd00bUKukT1NQGMxpx/i75FEhxxVNor9Wubg7cg2mUThfBg5bUAEV4LyJaL/f4zFsTYQvW/7Q/Ig9ijVxS9NHAyUEPHzJKEXPqdcYzs4IJhTIu+DOEfx2xLE2yFaBHfpodh2sRtVgXwXyNe/Pn/HkS2I=
11+
- secure: utB92j2ZdAe9aGW+OUIHjiqy2lVWCCmmfCoTlwh2NIZamhstOHhQ/9T8wRksqE0zv5tEZFJScjKdifun9qD7+iIK0YsFluqRf3VB8ZDLZyN7dM0GTky0sjcN8ql9he/HqR4UtwH7MJfw/iiJLSnN/IZMG+LXgC7FMe8o+nsj15LwOWNu/bSMQtIEtRxWLK5UH6TsoQ2G1pzC3t7eEjVaIJ02YwnWhgimg4UkUT/s0e5WTsybqz7uSm7+PP7vNbT9kxBHs5VV7Nib9YJt6OwlrGDpWmb8JDzQbsMqjClT75ySKWp0BJuPETeB/riy6zrzJDZh5gaioHB63TIQjw0L+NtCPjZYwURKHklBnI6IiewwXEsGrnnhB1sBg4kxyKxv7Z/QmX+GTiAlMoMoO1DwAAgNXYMexgD0Ier7rGO7zlVfbDUl2J9oQBZiCZuIbbFeqKsnk5clSTggc/3CiTyRvI2mdSIRH6gLTixtN9O8U5Eqq91lCQWX8pZwvO4OtT0s4lbNNS6x9Ev/lHuA8qovPBy1gJOD+AQoCFE9I6KVGN0w0WkhjlaC1vTTII7kzh+/cwKFkjm4FuKFNKVLyEcchcB9lCfLB3vsD94XCoWQnumjBfCXd2uM0X0xX9Z/wFj8dvUA/ngxmbR+MhE30wwqFTPDPlSXIaqrZRv6XA2Hjbc=

‎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: 34 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+
TestUtil.DeleteTable(ots, 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+
TestUtil.DeleteTable(ots, 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+
TestUtil.DeleteTable(ots, 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+
TestUtil.DeleteTable(ots, 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+
TestUtil.DeleteTable(ots, 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

‎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)