This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch IOTDB-6327 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 5e3ba6f989200c5c1583bba63e3fa2d62f4ff184 Author: JackieTien97 <[email protected]> AuthorDate: Sat May 11 16:47:22 2024 +0800 mv back --- .../iotdb/session/SessionCacheLeaderTest.java | 173 ++++++++------- .../iotdb/session/SessionConnectionTest.java | 91 ++++---- .../java/org/apache/iotdb/session/SessionTest.java | 12 +- .../java/org/apache/iotdb/session/TabletTest.java | 6 +- .../session/pool/SessionPoolExceptionTest.java | 58 +++-- .../apache/iotdb/session/pool/SessionPoolTest.java | 247 +++++++++++---------- .../iotdb/session/util/SessionUtilsTest.java | 0 .../apache/iotdb/session/util/ThreadUtilsTest.java | 0 .../test/resources/iotdb-common.properties | 0 .../test/resources/iotdb-datanode.properties | 0 .../iotdb/session => }/test/resources/logback.xml | 0 11 files changed, 302 insertions(+), 285 deletions(-) diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/test/java/org/apache/iotdb/session/SessionCacheLeaderTest.java b/iotdb-client/session/src/test/java/org/apache/iotdb/session/SessionCacheLeaderTest.java similarity index 86% rename from iotdb-client/session/src/main/java/org/apache/iotdb/session/test/java/org/apache/iotdb/session/SessionCacheLeaderTest.java rename to iotdb-client/session/src/test/java/org/apache/iotdb/session/SessionCacheLeaderTest.java index 69a45806079..a53ec1ecb9d 100644 --- a/iotdb-client/session/src/main/java/org/apache/iotdb/session/test/java/org/apache/iotdb/session/SessionCacheLeaderTest.java +++ b/iotdb-client/session/src/test/java/org/apache/iotdb/session/SessionCacheLeaderTest.java @@ -45,10 +45,6 @@ import java.util.List; import java.util.Map; import java.util.Random; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; - public class SessionCacheLeaderTest { private static final List<TEndPoint> endpoints = @@ -83,8 +79,8 @@ public class SessionCacheLeaderTest { // without leader cache session = new MockSession("127.0.0.1", 55560, false); session.open(); - assertNull(session.deviceIdToEndpoint); - assertNull(session.endPointToSessionConnection); + Assert.assertNull(session.deviceIdToEndpoint); + Assert.assertNull(session.endPointToSessionConnection); String deviceId = "root.sg2.d1"; List<String> measurements = new ArrayList<>(); @@ -103,15 +99,15 @@ public class SessionCacheLeaderTest { session.insertRecord(deviceId, time, measurements, types, values); } - assertNull(session.deviceIdToEndpoint); - assertNull(session.endPointToSessionConnection); + Assert.assertNull(session.deviceIdToEndpoint); + Assert.assertNull(session.endPointToSessionConnection); session.close(); // with leader cache session = new MockSession("127.0.0.1", 55560, true); session.open(); - assertEquals(0, session.deviceIdToEndpoint.size()); - assertEquals(1, session.endPointToSessionConnection.size()); + Assert.assertEquals(0, session.deviceIdToEndpoint.size()); + Assert.assertEquals(1, session.endPointToSessionConnection.size()); for (long time = 0; time < 100; time++) { List<Object> values = new ArrayList<>(); @@ -121,9 +117,10 @@ public class SessionCacheLeaderTest { session.insertRecord(deviceId, time, measurements, types, values); } - assertEquals(1, session.deviceIdToEndpoint.size()); - assertEquals(getDeviceIdBelongedEndpoint(deviceId), session.deviceIdToEndpoint.get(deviceId)); - assertEquals(2, session.endPointToSessionConnection.size()); + Assert.assertEquals(1, session.deviceIdToEndpoint.size()); + Assert.assertEquals( + getDeviceIdBelongedEndpoint(deviceId), session.deviceIdToEndpoint.get(deviceId)); + Assert.assertEquals(2, session.endPointToSessionConnection.size()); session.close(); } @@ -133,8 +130,8 @@ public class SessionCacheLeaderTest { // without leader cache session = new MockSession("127.0.0.1", 55560, false); session.open(); - assertNull(session.deviceIdToEndpoint); - assertNull(session.endPointToSessionConnection); + Assert.assertNull(session.deviceIdToEndpoint); + Assert.assertNull(session.endPointToSessionConnection); String deviceId = "root.sg2.d1"; List<String> measurements = new ArrayList<>(); @@ -149,15 +146,15 @@ public class SessionCacheLeaderTest { session.insertRecord(deviceId, time, measurements, values); } - assertNull(session.deviceIdToEndpoint); - assertNull(session.endPointToSessionConnection); + Assert.assertNull(session.deviceIdToEndpoint); + Assert.assertNull(session.endPointToSessionConnection); session.close(); // with leader cache session = new MockSession("127.0.0.1", 55560, true); session.open(); - assertEquals(0, session.deviceIdToEndpoint.size()); - assertEquals(1, session.endPointToSessionConnection.size()); + Assert.assertEquals(0, session.deviceIdToEndpoint.size()); + Assert.assertEquals(1, session.endPointToSessionConnection.size()); for (long time = 0; time < 10; time++) { List<String> values = new ArrayList<>(); @@ -167,9 +164,10 @@ public class SessionCacheLeaderTest { session.insertRecord(deviceId, time, measurements, values); } - assertEquals(1, session.deviceIdToEndpoint.size()); - assertEquals(getDeviceIdBelongedEndpoint(deviceId), session.deviceIdToEndpoint.get(deviceId)); - assertEquals(2, session.endPointToSessionConnection.size()); + Assert.assertEquals(1, session.deviceIdToEndpoint.size()); + Assert.assertEquals( + getDeviceIdBelongedEndpoint(deviceId), session.deviceIdToEndpoint.get(deviceId)); + Assert.assertEquals(2, session.endPointToSessionConnection.size()); session.close(); } @@ -178,8 +176,8 @@ public class SessionCacheLeaderTest { // without leader cache session = new MockSession("127.0.0.1", 55560, false); session.open(); - assertNull(session.deviceIdToEndpoint); - assertNull(session.endPointToSessionConnection); + Assert.assertNull(session.deviceIdToEndpoint); + Assert.assertNull(session.endPointToSessionConnection); List<String> allDeviceIds = new ArrayList<String>() { @@ -231,15 +229,15 @@ public class SessionCacheLeaderTest { valuesList.clear(); timestamps.clear(); - assertNull(session.deviceIdToEndpoint); - assertNull(session.endPointToSessionConnection); + Assert.assertNull(session.deviceIdToEndpoint); + Assert.assertNull(session.endPointToSessionConnection); session.close(); // with leader cache session = new MockSession("127.0.0.1", 55560, true); session.open(); - assertEquals(0, session.deviceIdToEndpoint.size()); - assertEquals(1, session.endPointToSessionConnection.size()); + Assert.assertEquals(0, session.deviceIdToEndpoint.size()); + Assert.assertEquals(1, session.endPointToSessionConnection.size()); for (long time = 0; time < 500; time++) { List<Object> values = new ArrayList<>(); @@ -265,11 +263,12 @@ public class SessionCacheLeaderTest { } session.insertRecords(deviceIds, timestamps, measurementsList, typesList, valuesList); - assertEquals(4, session.deviceIdToEndpoint.size()); + Assert.assertEquals(4, session.deviceIdToEndpoint.size()); for (String deviceId : allDeviceIds) { - assertEquals(getDeviceIdBelongedEndpoint(deviceId), session.deviceIdToEndpoint.get(deviceId)); + Assert.assertEquals( + getDeviceIdBelongedEndpoint(deviceId), session.deviceIdToEndpoint.get(deviceId)); } - assertEquals(4, session.endPointToSessionConnection.size()); + Assert.assertEquals(4, session.endPointToSessionConnection.size()); session.close(); } @@ -279,8 +278,8 @@ public class SessionCacheLeaderTest { // without leader cache session = new MockSession("127.0.0.1", 55560, false); session.open(); - assertNull(session.deviceIdToEndpoint); - assertNull(session.endPointToSessionConnection); + Assert.assertNull(session.deviceIdToEndpoint); + Assert.assertNull(session.endPointToSessionConnection); List<String> allDeviceIds = new ArrayList<String>() { @@ -322,15 +321,15 @@ public class SessionCacheLeaderTest { valuesList.clear(); timestamps.clear(); - assertNull(session.deviceIdToEndpoint); - assertNull(session.endPointToSessionConnection); + Assert.assertNull(session.deviceIdToEndpoint); + Assert.assertNull(session.endPointToSessionConnection); session.close(); // with leader cache session = new MockSession("127.0.0.1", 55560, true); session.open(); - assertEquals(0, session.deviceIdToEndpoint.size()); - assertEquals(1, session.endPointToSessionConnection.size()); + Assert.assertEquals(0, session.deviceIdToEndpoint.size()); + Assert.assertEquals(1, session.endPointToSessionConnection.size()); for (long time = 0; time < 500; time++) { List<String> values = new ArrayList<>(); @@ -351,11 +350,12 @@ public class SessionCacheLeaderTest { } session.insertRecords(deviceIds, timestamps, measurementsList, valuesList); - assertEquals(4, session.deviceIdToEndpoint.size()); + Assert.assertEquals(4, session.deviceIdToEndpoint.size()); for (String deviceId : allDeviceIds) { - assertEquals(getDeviceIdBelongedEndpoint(deviceId), session.deviceIdToEndpoint.get(deviceId)); + Assert.assertEquals( + getDeviceIdBelongedEndpoint(deviceId), session.deviceIdToEndpoint.get(deviceId)); } - assertEquals(4, session.endPointToSessionConnection.size()); + Assert.assertEquals(4, session.endPointToSessionConnection.size()); session.close(); } @@ -365,8 +365,8 @@ public class SessionCacheLeaderTest { // without leader cache session = new MockSession("127.0.0.1", 55560, false); session.open(); - assertNull(session.deviceIdToEndpoint); - assertNull(session.endPointToSessionConnection); + Assert.assertNull(session.deviceIdToEndpoint); + Assert.assertNull(session.endPointToSessionConnection); String deviceId = "root.sg2.d2"; List<Long> times = new ArrayList<>(); @@ -411,20 +411,20 @@ public class SessionCacheLeaderTest { Boolean.TRUE); session.insertRecordsOfOneDevice(deviceId, times, measurements, datatypes, values); - assertNull(session.deviceIdToEndpoint); - assertNull(session.endPointToSessionConnection); + Assert.assertNull(session.deviceIdToEndpoint); + Assert.assertNull(session.endPointToSessionConnection); session.close(); // with leader cache session = new MockSession("127.0.0.1", 55560, true); session.open(); - assertEquals(0, session.deviceIdToEndpoint.size()); - assertEquals(1, session.endPointToSessionConnection.size()); + Assert.assertEquals(0, session.deviceIdToEndpoint.size()); + Assert.assertEquals(1, session.endPointToSessionConnection.size()); session.insertRecordsOfOneDevice(deviceId, times, measurements, datatypes, values); - assertEquals(1, session.deviceIdToEndpoint.size()); - assertEquals(2, session.endPointToSessionConnection.size()); + Assert.assertEquals(1, session.deviceIdToEndpoint.size()); + Assert.assertEquals(2, session.endPointToSessionConnection.size()); session.close(); } @@ -433,8 +433,8 @@ public class SessionCacheLeaderTest { // without leader cache session = new MockSession("127.0.0.1", 55560, false); session.open(); - assertNull(session.deviceIdToEndpoint); - assertNull(session.endPointToSessionConnection); + Assert.assertNull(session.deviceIdToEndpoint); + Assert.assertNull(session.endPointToSessionConnection); String deviceId = "root.sg2.d2"; List<MeasurementSchema> schemaList = new ArrayList<>(); @@ -463,15 +463,15 @@ public class SessionCacheLeaderTest { tablet.reset(); } - assertNull(session.deviceIdToEndpoint); - assertNull(session.endPointToSessionConnection); + Assert.assertNull(session.deviceIdToEndpoint); + Assert.assertNull(session.endPointToSessionConnection); session.close(); // with leader cache session = new MockSession("127.0.0.1", 55560, true); session.open(); - assertEquals(0, session.deviceIdToEndpoint.size()); - assertEquals(1, session.endPointToSessionConnection.size()); + Assert.assertEquals(0, session.deviceIdToEndpoint.size()); + Assert.assertEquals(1, session.endPointToSessionConnection.size()); for (long row = 0; row < 100; row++) { int rowIndex = tablet.rowSize++; @@ -493,8 +493,8 @@ public class SessionCacheLeaderTest { tablet.reset(); } - assertEquals(1, session.deviceIdToEndpoint.size()); - assertEquals(2, session.endPointToSessionConnection.size()); + Assert.assertEquals(1, session.deviceIdToEndpoint.size()); + Assert.assertEquals(2, session.endPointToSessionConnection.size()); session.close(); } @@ -503,8 +503,8 @@ public class SessionCacheLeaderTest { // without leader cache session = new MockSession("127.0.0.1", 55560, false); session.open(); - assertNull(session.deviceIdToEndpoint); - assertNull(session.endPointToSessionConnection); + Assert.assertNull(session.deviceIdToEndpoint); + Assert.assertNull(session.endPointToSessionConnection); List<String> allDeviceIds = new ArrayList<String>() { @@ -559,15 +559,15 @@ public class SessionCacheLeaderTest { tablet3.reset(); } - assertNull(session.deviceIdToEndpoint); - assertNull(session.endPointToSessionConnection); + Assert.assertNull(session.deviceIdToEndpoint); + Assert.assertNull(session.endPointToSessionConnection); session.close(); // with leader cache session = new MockSession("127.0.0.1", 55560, true); session.open(); - assertEquals(0, session.deviceIdToEndpoint.size()); - assertEquals(1, session.endPointToSessionConnection.size()); + Assert.assertEquals(0, session.deviceIdToEndpoint.size()); + Assert.assertEquals(1, session.endPointToSessionConnection.size()); for (long row = 0; row < 100; row++) { int row1 = tablet1.rowSize++; @@ -598,11 +598,12 @@ public class SessionCacheLeaderTest { tablet3.reset(); } - assertEquals(3, session.deviceIdToEndpoint.size()); + Assert.assertEquals(3, session.deviceIdToEndpoint.size()); for (String deviceId : allDeviceIds.subList(1, allDeviceIds.size())) { - assertEquals(getDeviceIdBelongedEndpoint(deviceId), session.deviceIdToEndpoint.get(deviceId)); + Assert.assertEquals( + getDeviceIdBelongedEndpoint(deviceId), session.deviceIdToEndpoint.get(deviceId)); } - assertEquals(4, session.endPointToSessionConnection.size()); + Assert.assertEquals(4, session.endPointToSessionConnection.size()); session.close(); } @@ -613,10 +614,10 @@ public class SessionCacheLeaderTest { try { session.open(); } catch (IoTDBConnectionException e) { - fail(e.getMessage()); + Assert.fail(e.getMessage()); } - assertNull(session.deviceIdToEndpoint); - assertNull(session.endPointToSessionConnection); + Assert.assertNull(session.deviceIdToEndpoint); + Assert.assertNull(session.endPointToSessionConnection); ((MockSession) session).getLastConstructedSessionConnection().setConnectionBroken(true); List<String> allDeviceIds = @@ -680,8 +681,8 @@ public class SessionCacheLeaderTest { valuesList.clear(); timestamps.clear(); - assertNull(session.deviceIdToEndpoint); - assertNull(session.endPointToSessionConnection); + Assert.assertNull(session.deviceIdToEndpoint); + Assert.assertNull(session.endPointToSessionConnection); try { session.close(); } catch (IoTDBConnectionException e) { @@ -697,8 +698,8 @@ public class SessionCacheLeaderTest { } catch (IoTDBConnectionException e) { Assert.fail(e.getMessage()); } - assertEquals(0, session.deviceIdToEndpoint.size()); - assertEquals(1, session.endPointToSessionConnection.size()); + Assert.assertEquals(0, session.deviceIdToEndpoint.size()); + Assert.assertEquals(1, session.endPointToSessionConnection.size()); for (long time = 0; time < 500; time++) { List<Object> values = new ArrayList<>(); List<TSDataType> types = new ArrayList<>(); @@ -739,11 +740,12 @@ public class SessionCacheLeaderTest { Assert.assertEquals( "the session connection = TEndPoint(ip:127.0.0.1, port:55561) is broken", e.getMessage()); } - assertEquals(3, session.deviceIdToEndpoint.size()); + Assert.assertEquals(3, session.deviceIdToEndpoint.size()); for (Map.Entry<String, TEndPoint> endPointMap : session.deviceIdToEndpoint.entrySet()) { - assertEquals(getDeviceIdBelongedEndpoint(endPointMap.getKey()), endPointMap.getValue()); + Assert.assertEquals( + getDeviceIdBelongedEndpoint(endPointMap.getKey()), endPointMap.getValue()); } - assertEquals(3, session.endPointToSessionConnection.size()); + Assert.assertEquals(3, session.endPointToSessionConnection.size()); try { session.close(); } catch (IoTDBConnectionException e) { @@ -760,8 +762,8 @@ public class SessionCacheLeaderTest { } catch (IoTDBConnectionException e) { Assert.fail(e.getMessage()); } - assertNull(session.deviceIdToEndpoint); - assertNull(session.endPointToSessionConnection); + Assert.assertNull(session.deviceIdToEndpoint); + Assert.assertNull(session.endPointToSessionConnection); // set the session connection as broken ((MockSession) session).getLastConstructedSessionConnection().setConnectionBroken(true); @@ -806,7 +808,7 @@ public class SessionCacheLeaderTest { try { session.insertTablets(tabletMap, true); } catch (IoTDBConnectionException e) { - assertEquals( + Assert.assertEquals( "the session connection = TEndPoint(ip:127.0.0.1, port:55560) is broken", e.getMessage()); } @@ -829,8 +831,8 @@ public class SessionCacheLeaderTest { tablet3.reset(); } - assertNull(session.deviceIdToEndpoint); - assertNull(session.endPointToSessionConnection); + Assert.assertNull(session.deviceIdToEndpoint); + Assert.assertNull(session.endPointToSessionConnection); try { session.close(); } catch (IoTDBConnectionException e) { @@ -845,8 +847,8 @@ public class SessionCacheLeaderTest { } catch (IoTDBConnectionException e) { Assert.fail(e.getMessage()); } - assertEquals(0, session.deviceIdToEndpoint.size()); - assertEquals(1, session.endPointToSessionConnection.size()); + Assert.assertEquals(0, session.deviceIdToEndpoint.size()); + Assert.assertEquals(1, session.endPointToSessionConnection.size()); for (long row = 0; row < 100; row++) { int row1 = tablet1.rowSize++; @@ -918,11 +920,12 @@ public class SessionCacheLeaderTest { tablet2.reset(); tablet3.reset(); - assertEquals(2, session.deviceIdToEndpoint.size()); + Assert.assertEquals(2, session.deviceIdToEndpoint.size()); for (Map.Entry<String, TEndPoint> endPointEntry : session.deviceIdToEndpoint.entrySet()) { - assertEquals(getDeviceIdBelongedEndpoint(endPointEntry.getKey()), endPointEntry.getValue()); + Assert.assertEquals( + getDeviceIdBelongedEndpoint(endPointEntry.getKey()), endPointEntry.getValue()); } - assertEquals(3, session.endPointToSessionConnection.size()); + Assert.assertEquals(3, session.endPointToSessionConnection.size()); try { session.close(); } catch (IoTDBConnectionException e) { diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/test/java/org/apache/iotdb/session/SessionConnectionTest.java b/iotdb-client/session/src/test/java/org/apache/iotdb/session/SessionConnectionTest.java similarity index 80% rename from iotdb-client/session/src/main/java/org/apache/iotdb/session/test/java/org/apache/iotdb/session/SessionConnectionTest.java rename to iotdb-client/session/src/test/java/org/apache/iotdb/session/SessionConnectionTest.java index 61a5abd3865..cb69e42863b 100644 --- a/iotdb-client/session/src/main/java/org/apache/iotdb/session/test/java/org/apache/iotdb/session/SessionConnectionTest.java +++ b/iotdb-client/session/src/test/java/org/apache/iotdb/session/SessionConnectionTest.java @@ -69,10 +69,6 @@ import java.time.ZoneId; import java.util.Arrays; import java.util.Collections; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.ArgumentMatchers.anyString; - public class SessionConnectionTest { @Mock private SessionConnection sessionConnection; @@ -100,7 +96,8 @@ public class SessionConnectionTest { TSStatus tsStatusSuccess = new TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode()); tsStatus.setSubStatus( Arrays.asList(new TSStatus(TSStatusCode.REDIRECTION_RECOMMEND.getStatusCode()))); - Mockito.when(client.setStorageGroup(anyLong(), anyString())).thenReturn(tsStatus); + Mockito.when(client.setStorageGroup(ArgumentMatchers.anyLong(), ArgumentMatchers.anyString())) + .thenReturn(tsStatus); TSExecuteStatementResp execResp = new TSExecuteStatementResp(tsStatus); execResp.setColumns(Arrays.asList()); execResp.setDataTypeList(Arrays.asList()); @@ -108,47 +105,53 @@ public class SessionConnectionTest { execResp.setQueryResult(Arrays.asList()); execResp.setIgnoreTimeStamp(false); execResp.setMoreData(false); - Mockito.when(client.executeQueryStatementV2(any())).thenReturn(execResp); - Mockito.when(client.executeFastLastDataQueryForOneDeviceV2(any())).thenReturn(execResp); - Mockito.when(client.executeLastDataQueryV2(any())).thenReturn(execResp); - Mockito.when(client.deleteStorageGroups(anyLong(), any())).thenReturn(tsStatus); - Mockito.when(client.createTimeseries(any())).thenReturn(tsStatus); - Mockito.when(client.createAlignedTimeseries(any())).thenReturn(tsStatus); - Mockito.when(client.createMultiTimeseries(any())).thenReturn(tsStatus); - Mockito.when(client.executeUpdateStatementV2(any())).thenReturn(execResp); - Mockito.when(client.closeOperation(any())).thenReturn(tsStatus); - Mockito.when(client.executeAggregationQueryV2(any())).thenReturn(execResp); - Mockito.when(client.executeRawDataQueryV2(any())).thenReturn(execResp); - Mockito.when(client.insertRecord(any())).thenReturn(tsStatus); - Mockito.when(client.testInsertRecord(any())).thenReturn(tsStatus); - Mockito.when(client.insertRecords(any())).thenReturn(tsStatusSuccess); - Mockito.when(client.testInsertRecords(any())).thenReturn(tsStatusSuccess); - Mockito.when(client.insertStringRecord(any())).thenReturn(tsStatus); - Mockito.when(client.testInsertStringRecord(any())).thenReturn(tsStatus); - Mockito.when(client.insertStringRecords(any())).thenReturn(tsStatusSuccess); - Mockito.when(client.testInsertStringRecords(any())).thenReturn(tsStatusSuccess); - Mockito.when(client.insertRecordsOfOneDevice(any())).thenReturn(tsStatus); - Mockito.when(client.insertStringRecordsOfOneDevice(any())).thenReturn(tsStatus); - Mockito.when(client.deleteTimeseries(anyLong(), any())).thenReturn(tsStatus); - Mockito.when(client.insertTablet(any())).thenReturn(tsStatus); - Mockito.when(client.testInsertTablet(any())).thenReturn(tsStatus); - Mockito.when(client.insertTablets(any())).thenReturn(tsStatusSuccess); - Mockito.when(client.testInsertTablets(any())).thenReturn(tsStatusSuccess); - Mockito.when(client.deleteData(any())).thenReturn(tsStatusSuccess); - Mockito.when(client.createSchemaTemplate(any())).thenReturn(tsStatusSuccess); - Mockito.when(client.appendSchemaTemplate(any())).thenReturn(tsStatusSuccess); - Mockito.when(client.pruneSchemaTemplate(any())).thenReturn(tsStatusSuccess); - Mockito.when(client.querySchemaTemplate(any())) + Mockito.when(client.executeQueryStatementV2(ArgumentMatchers.any())).thenReturn(execResp); + Mockito.when(client.executeFastLastDataQueryForOneDeviceV2(ArgumentMatchers.any())) + .thenReturn(execResp); + Mockito.when(client.executeLastDataQueryV2(ArgumentMatchers.any())).thenReturn(execResp); + Mockito.when(client.deleteStorageGroups(ArgumentMatchers.anyLong(), ArgumentMatchers.any())) + .thenReturn(tsStatus); + Mockito.when(client.createTimeseries(ArgumentMatchers.any())).thenReturn(tsStatus); + Mockito.when(client.createAlignedTimeseries(ArgumentMatchers.any())).thenReturn(tsStatus); + Mockito.when(client.createMultiTimeseries(ArgumentMatchers.any())).thenReturn(tsStatus); + Mockito.when(client.executeUpdateStatementV2(ArgumentMatchers.any())).thenReturn(execResp); + Mockito.when(client.closeOperation(ArgumentMatchers.any())).thenReturn(tsStatus); + Mockito.when(client.executeAggregationQueryV2(ArgumentMatchers.any())).thenReturn(execResp); + Mockito.when(client.executeRawDataQueryV2(ArgumentMatchers.any())).thenReturn(execResp); + Mockito.when(client.insertRecord(ArgumentMatchers.any())).thenReturn(tsStatus); + Mockito.when(client.testInsertRecord(ArgumentMatchers.any())).thenReturn(tsStatus); + Mockito.when(client.insertRecords(ArgumentMatchers.any())).thenReturn(tsStatusSuccess); + Mockito.when(client.testInsertRecords(ArgumentMatchers.any())).thenReturn(tsStatusSuccess); + Mockito.when(client.insertStringRecord(ArgumentMatchers.any())).thenReturn(tsStatus); + Mockito.when(client.testInsertStringRecord(ArgumentMatchers.any())).thenReturn(tsStatus); + Mockito.when(client.insertStringRecords(ArgumentMatchers.any())).thenReturn(tsStatusSuccess); + Mockito.when(client.testInsertStringRecords(ArgumentMatchers.any())) + .thenReturn(tsStatusSuccess); + Mockito.when(client.insertRecordsOfOneDevice(ArgumentMatchers.any())).thenReturn(tsStatus); + Mockito.when(client.insertStringRecordsOfOneDevice(ArgumentMatchers.any())) + .thenReturn(tsStatus); + Mockito.when(client.deleteTimeseries(ArgumentMatchers.anyLong(), ArgumentMatchers.any())) + .thenReturn(tsStatus); + Mockito.when(client.insertTablet(ArgumentMatchers.any())).thenReturn(tsStatus); + Mockito.when(client.testInsertTablet(ArgumentMatchers.any())).thenReturn(tsStatus); + Mockito.when(client.insertTablets(ArgumentMatchers.any())).thenReturn(tsStatusSuccess); + Mockito.when(client.testInsertTablets(ArgumentMatchers.any())).thenReturn(tsStatusSuccess); + Mockito.when(client.deleteData(ArgumentMatchers.any())).thenReturn(tsStatusSuccess); + Mockito.when(client.createSchemaTemplate(ArgumentMatchers.any())).thenReturn(tsStatusSuccess); + Mockito.when(client.appendSchemaTemplate(ArgumentMatchers.any())).thenReturn(tsStatusSuccess); + Mockito.when(client.pruneSchemaTemplate(ArgumentMatchers.any())).thenReturn(tsStatusSuccess); + Mockito.when(client.querySchemaTemplate(ArgumentMatchers.any())) .thenReturn(new TSQueryTemplateResp(tsStatusSuccess, 1)); - Mockito.when(client.setSchemaTemplate(any())).thenReturn(tsStatusSuccess); - Mockito.when(client.unsetSchemaTemplate(any())).thenReturn(tsStatusSuccess); - Mockito.when(client.dropSchemaTemplate(any())).thenReturn(tsStatusSuccess); - Mockito.when(client.createTimeseriesUsingSchemaTemplate(any())).thenReturn(tsStatusSuccess); + Mockito.when(client.setSchemaTemplate(ArgumentMatchers.any())).thenReturn(tsStatusSuccess); + Mockito.when(client.unsetSchemaTemplate(ArgumentMatchers.any())).thenReturn(tsStatusSuccess); + Mockito.when(client.dropSchemaTemplate(ArgumentMatchers.any())).thenReturn(tsStatusSuccess); + Mockito.when(client.createTimeseriesUsingSchemaTemplate(ArgumentMatchers.any())) + .thenReturn(tsStatusSuccess); Mockito.when(client.getBackupConfiguration()) .thenReturn(new TSBackupConfigurationResp(tsStatusSuccess)); Mockito.when(client.fetchAllConnectionsInfo()).thenReturn(new TSConnectionInfoResp()); - Mockito.when(client.setTimeZone(any())).thenReturn(tsStatusSuccess); - Mockito.when(client.closeSession(any())).thenReturn(tsStatusSuccess); + Mockito.when(client.setTimeZone(ArgumentMatchers.any())).thenReturn(tsStatusSuccess); + Mockito.when(client.closeSession(ArgumentMatchers.any())).thenReturn(tsStatusSuccess); } @After @@ -217,7 +220,7 @@ public class SessionConnectionTest { throws IoTDBConnectionException, StatementExecutionException, TException { TSStatus tsStatus = new TSStatus(TSStatusCode.MULTIPLE_ERROR.getStatusCode()); tsStatus.setSubStatus(Arrays.asList(new TSStatus())); - Mockito.when(client.createTimeseries(any())).thenReturn(tsStatus); + Mockito.when(client.createTimeseries(ArgumentMatchers.any())).thenReturn(tsStatus); sessionConnection.createTimeseries(new TSCreateTimeseriesReq()); } @@ -226,7 +229,7 @@ public class SessionConnectionTest { throws IoTDBConnectionException, StatementExecutionException, TException { TSStatus tsStatus = new TSStatus(TSStatusCode.INCOMPATIBLE_VERSION.getStatusCode()); tsStatus.setSubStatus(Arrays.asList(new TSStatus())); - Mockito.when(client.createTimeseries(any())).thenReturn(tsStatus); + Mockito.when(client.createTimeseries(ArgumentMatchers.any())).thenReturn(tsStatus); sessionConnection.createTimeseries(new TSCreateTimeseriesReq()); } diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/test/java/org/apache/iotdb/session/SessionTest.java b/iotdb-client/session/src/test/java/org/apache/iotdb/session/SessionTest.java similarity index 99% rename from iotdb-client/session/src/main/java/org/apache/iotdb/session/test/java/org/apache/iotdb/session/SessionTest.java rename to iotdb-client/session/src/test/java/org/apache/iotdb/session/SessionTest.java index aec44fe3430..066aa579ca1 100644 --- a/iotdb-client/session/src/main/java/org/apache/iotdb/session/test/java/org/apache/iotdb/session/SessionTest.java +++ b/iotdb-client/session/src/test/java/org/apache/iotdb/session/SessionTest.java @@ -54,10 +54,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; -import static org.mockito.ArgumentMatchers.any; - public class SessionTest { @Mock private ISession session; @@ -78,7 +74,7 @@ public class SessionTest { Whitebox.setInternalState(session, "defaultSessionConnection", sessionConnection); TSQueryTemplateResp resp = new TSQueryTemplateResp(); resp.setMeasurements(Arrays.asList("root.sg1.d1.s1")); - Mockito.when(sessionConnection.querySchemaTemplate(any())).thenReturn(resp); + Mockito.when(sessionConnection.querySchemaTemplate(ArgumentMatchers.any())).thenReturn(resp); HashMap<String, TEndPoint> deviceIdToEndpoint = new HashMap<>(); deviceIdToEndpoint.put("device1", new TEndPoint()); deviceIdToEndpoint.put("device2", new TEndPoint()); @@ -127,7 +123,7 @@ public class SessionTest { timeZone = "UTC"; session.setTimeZone(timeZone); session.setTimeZoneOfSession(timeZone); - assertEquals(timeZone, ((Session) session).zoneId.toString()); + Assert.assertEquals(timeZone, ((Session) session).zoneId.toString()); } @Test @@ -1195,9 +1191,9 @@ public class SessionTest { public void testEmptyNodeUrls() { try { ISession failedSession = new Session(Collections.emptyList(), "root", "root"); - fail(); + Assert.fail(); } catch (IllegalArgumentException e) { - assertEquals("nodeUrls shouldn't be empty.", e.getMessage()); + Assert.assertEquals("nodeUrls shouldn't be empty.", e.getMessage()); } } } diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/test/java/org/apache/iotdb/session/TabletTest.java b/iotdb-client/session/src/test/java/org/apache/iotdb/session/TabletTest.java similarity index 93% rename from iotdb-client/session/src/main/java/org/apache/iotdb/session/test/java/org/apache/iotdb/session/TabletTest.java rename to iotdb-client/session/src/test/java/org/apache/iotdb/session/TabletTest.java index 689ebab4684..b2f17ea562a 100644 --- a/iotdb-client/session/src/main/java/org/apache/iotdb/session/test/java/org/apache/iotdb/session/TabletTest.java +++ b/iotdb-client/session/src/test/java/org/apache/iotdb/session/TabletTest.java @@ -28,8 +28,6 @@ import org.junit.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertArrayEquals; - public class TabletTest { @Test public void testSortTablet() { @@ -75,7 +73,7 @@ public class TabletTest { long[] resValues = (long[]) tablet.values[0]; long[] expectedTimestamps = new long[] {0, 1, 2}; long[] expectedValues = new long[] {1, 2, 0}; - assertArrayEquals(expectedTimestamps, resTimestamps); - assertArrayEquals(expectedValues, resValues); + Assert.assertArrayEquals(expectedTimestamps, resTimestamps); + Assert.assertArrayEquals(expectedValues, resValues); } } diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/test/java/org/apache/iotdb/session/pool/SessionPoolExceptionTest.java b/iotdb-client/session/src/test/java/org/apache/iotdb/session/pool/SessionPoolExceptionTest.java similarity index 86% rename from iotdb-client/session/src/main/java/org/apache/iotdb/session/test/java/org/apache/iotdb/session/pool/SessionPoolExceptionTest.java rename to iotdb-client/session/src/test/java/org/apache/iotdb/session/pool/SessionPoolExceptionTest.java index cfe1a3f5ce7..533e388665f 100644 --- a/iotdb-client/session/src/main/java/org/apache/iotdb/session/test/java/org/apache/iotdb/session/pool/SessionPoolExceptionTest.java +++ b/iotdb-client/session/src/test/java/org/apache/iotdb/session/pool/SessionPoolExceptionTest.java @@ -49,15 +49,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentLinkedDeque; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.anyList; -import static org.mockito.ArgumentMatchers.anyMap; -import static org.mockito.ArgumentMatchers.anyString; - @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class SessionPoolExceptionTest { @@ -94,7 +85,12 @@ public class SessionPoolExceptionTest { public void testInsertRecords() throws Exception { Mockito.doThrow(new IoTDBConnectionException("")) .when(session) - .insertRecords(anyList(), anyList(), anyList(), anyList(), anyList()); + .insertRecords( + ArgumentMatchers.anyList(), + ArgumentMatchers.anyList(), + ArgumentMatchers.anyList(), + ArgumentMatchers.anyList(), + ArgumentMatchers.anyList()); List<String> deviceIds = Arrays.asList("device1", "device2"); List<Long> timeList = Arrays.asList(1L, 2L); List<List<String>> measurementsList = @@ -107,7 +103,7 @@ public class SessionPoolExceptionTest { List<List<Object>> valuesList = Arrays.asList(Arrays.asList(25.0f, 50.0f), Arrays.asList(220.0, 1.5)); sessionPool.insertRecords(deviceIds, timeList, measurementsList, typesList, valuesList); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -116,7 +112,7 @@ public class SessionPoolExceptionTest { public void testInsertTablet() throws IoTDBConnectionException, StatementExecutionException { Mockito.doThrow(new IoTDBConnectionException("")) .when(session) - .insertTablet(any(Tablet.class), anyBoolean()); + .insertTablet(ArgumentMatchers.any(Tablet.class), ArgumentMatchers.anyBoolean()); List<MeasurementSchema> schemas = new ArrayList<>(); MeasurementSchema schema = new MeasurementSchema(); schema.setMeasurementId("pressure"); @@ -135,7 +131,7 @@ public class SessionPoolExceptionTest { public void testInsertTablets() throws IoTDBConnectionException, StatementExecutionException { Mockito.doThrow(new IoTDBConnectionException("")) .when(session) - .insertTablets(anyMap(), anyBoolean()); + .insertTablets(ArgumentMatchers.anyMap(), ArgumentMatchers.anyBoolean()); List<MeasurementSchema> schemas = new ArrayList<>(); MeasurementSchema schema = new MeasurementSchema(); schema.setMeasurementId("pressure"); @@ -157,7 +153,12 @@ public class SessionPoolExceptionTest { throws IoTDBConnectionException, StatementExecutionException { Mockito.doThrow(new IoTDBConnectionException("")) .when(session) - .insertAlignedRecords(anyList(), anyList(), anyList(), anyList(), anyList()); + .insertAlignedRecords( + ArgumentMatchers.anyList(), + ArgumentMatchers.anyList(), + ArgumentMatchers.anyList(), + ArgumentMatchers.anyList(), + ArgumentMatchers.anyList()); List<String> deviceIds = Arrays.asList("alignedDevice3", "alignedDevice4"); List<Long> timeList = Arrays.asList(1L, 2L); List<List<String>> measurementsList = @@ -177,7 +178,7 @@ public class SessionPoolExceptionTest { throws IoTDBConnectionException, StatementExecutionException { Mockito.doThrow(new IoTDBConnectionException("")) .when(session) - .insertAlignedTablets(anyMap(), anyBoolean()); + .insertAlignedTablets(ArgumentMatchers.anyMap(), ArgumentMatchers.anyBoolean()); List<MeasurementSchema> schemas = new ArrayList<>(); MeasurementSchema schema = new MeasurementSchema(); schema.setMeasurementId("pressure"); @@ -200,7 +201,12 @@ public class SessionPoolExceptionTest { Mockito.doThrow(new IoTDBConnectionException("")) .when(session) .insertRecordsOfOneDevice( - anyString(), anyList(), anyList(), anyList(), anyList(), anyBoolean()); + ArgumentMatchers.anyString(), + ArgumentMatchers.anyList(), + ArgumentMatchers.anyList(), + ArgumentMatchers.anyList(), + ArgumentMatchers.anyList(), + ArgumentMatchers.anyBoolean()); List<Long> timeList = Arrays.asList(1L, 2L); List<List<String>> measurementsList = Arrays.asList( @@ -220,7 +226,12 @@ public class SessionPoolExceptionTest { throws IoTDBConnectionException, StatementExecutionException { Mockito.doThrow(new IoTDBConnectionException("")) .when(session) - .insertStringRecordsOfOneDevice(anyString(), anyList(), anyList(), anyList(), anyBoolean()); + .insertStringRecordsOfOneDevice( + ArgumentMatchers.anyString(), + ArgumentMatchers.anyList(), + ArgumentMatchers.anyList(), + ArgumentMatchers.anyList(), + ArgumentMatchers.anyBoolean()); List<Long> timeList = Arrays.asList(1L, 2L); List<List<String>> measurementsList = Arrays.asList( @@ -235,7 +246,12 @@ public class SessionPoolExceptionTest { throws IoTDBConnectionException, StatementExecutionException { Mockito.doThrow(new IoTDBConnectionException("")) .when(session) - .insertRecordsOfOneDevice(anyString(), anyList(), anyList(), anyList(), anyList()); + .insertRecordsOfOneDevice( + ArgumentMatchers.anyString(), + ArgumentMatchers.anyList(), + ArgumentMatchers.anyList(), + ArgumentMatchers.anyList(), + ArgumentMatchers.anyList()); List<Long> timeList = Arrays.asList(1L, 2L); List<List<String>> measurementsList = Arrays.asList( @@ -269,7 +285,7 @@ public class SessionPoolExceptionTest { try { sessionPool.insertRecords(deviceIds, timeList, measurementsList, typesList, valuesList); } catch (IoTDBConnectionException e) { - assertTrue(e instanceof IoTDBConnectionException); + Assert.assertTrue(e instanceof IoTDBConnectionException); } } @@ -277,9 +293,9 @@ public class SessionPoolExceptionTest { public void testEmptyNodeUrls() { try { ISessionPool failedSession = new SessionPool(Collections.emptyList(), "root", "root", 1); - fail(); + Assert.fail(); } catch (IllegalArgumentException e) { - assertEquals("nodeUrls shouldn't be empty.", e.getMessage()); + Assert.assertEquals("nodeUrls shouldn't be empty.", e.getMessage()); } } } diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/test/java/org/apache/iotdb/session/pool/SessionPoolTest.java b/iotdb-client/session/src/test/java/org/apache/iotdb/session/pool/SessionPoolTest.java similarity index 93% rename from iotdb-client/session/src/main/java/org/apache/iotdb/session/test/java/org/apache/iotdb/session/pool/SessionPoolTest.java rename to iotdb-client/session/src/test/java/org/apache/iotdb/session/pool/SessionPoolTest.java index 0ceea65d982..288832821eb 100644 --- a/iotdb-client/session/src/main/java/org/apache/iotdb/session/test/java/org/apache/iotdb/session/pool/SessionPoolTest.java +++ b/iotdb-client/session/src/test/java/org/apache/iotdb/session/pool/SessionPoolTest.java @@ -74,12 +74,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentLinkedDeque; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doThrow; - @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class SessionPoolTest { @@ -116,18 +110,18 @@ public class SessionPoolTest { .version(Version.V_1_0) .build(); - assertEquals("localhost", pool.getHost()); - assertEquals(1234, pool.getPort()); - assertEquals("abc", pool.getUser()); - assertEquals("123", pool.getPassword()); - assertEquals(10, pool.getMaxSize()); - assertEquals(1, pool.getFetchSize()); - assertEquals(2, pool.getWaitToGetSessionTimeoutInMs()); - assertTrue(pool.isEnableRedirection()); - assertTrue(pool.isEnableCompression()); - assertEquals(3, pool.getConnectionTimeoutInMs()); - assertEquals(ZoneOffset.UTC, pool.getZoneId()); - assertEquals(Version.V_1_0, pool.getVersion()); + Assert.assertEquals("localhost", pool.getHost()); + Assert.assertEquals(1234, pool.getPort()); + Assert.assertEquals("abc", pool.getUser()); + Assert.assertEquals("123", pool.getPassword()); + Assert.assertEquals(10, pool.getMaxSize()); + Assert.assertEquals(1, pool.getFetchSize()); + Assert.assertEquals(2, pool.getWaitToGetSessionTimeoutInMs()); + Assert.assertTrue(pool.isEnableRedirection()); + Assert.assertTrue(pool.isEnableCompression()); + Assert.assertEquals(3, pool.getConnectionTimeoutInMs()); + Assert.assertEquals(ZoneOffset.UTC, pool.getZoneId()); + Assert.assertEquals(Version.V_1_0, pool.getVersion()); } @Test @@ -150,20 +144,20 @@ public class SessionPoolTest { .thriftMaxFrameSize(67108864) .build(); - assertEquals("abc", pool.getUser()); - assertEquals("123", pool.getPassword()); - assertEquals(10, pool.getMaxSize()); - assertEquals(1, pool.getFetchSize()); - assertEquals(2, pool.getWaitToGetSessionTimeoutInMs()); - assertTrue(pool.isEnableRedirection()); - assertTrue(pool.isEnableCompression()); - assertEquals(3, pool.getConnectionTimeoutInMs()); - assertEquals(ZoneOffset.UTC, pool.getZoneId()); - assertEquals(Version.V_1_0, pool.getVersion()); + Assert.assertEquals("abc", pool.getUser()); + Assert.assertEquals("123", pool.getPassword()); + Assert.assertEquals(10, pool.getMaxSize()); + Assert.assertEquals(1, pool.getFetchSize()); + Assert.assertEquals(2, pool.getWaitToGetSessionTimeoutInMs()); + Assert.assertTrue(pool.isEnableRedirection()); + Assert.assertTrue(pool.isEnableCompression()); + Assert.assertEquals(3, pool.getConnectionTimeoutInMs()); + Assert.assertEquals(ZoneOffset.UTC, pool.getZoneId()); + Assert.assertEquals(Version.V_1_0, pool.getVersion()); pool.setQueryTimeout(12345); - assertEquals(12345, pool.getQueryTimeout()); + Assert.assertEquals(12345, pool.getQueryTimeout()); pool.setVersion(Version.V_0_13); - assertEquals(Version.V_0_13, pool.getVersion()); + Assert.assertEquals(Version.V_0_13, pool.getVersion()); } @Before @@ -172,18 +166,22 @@ public class SessionPoolTest { MockitoAnnotations.initMocks(this); execResp.queryResult = FakedFirstFetchTsBlockResult(); - Mockito.when(client.executeStatementV2(any(TSExecuteStatementReq.class))).thenReturn(execResp); + Mockito.when(client.executeStatementV2(ArgumentMatchers.any(TSExecuteStatementReq.class))) + .thenReturn(execResp); Mockito.when(execResp.getQueryId()).thenReturn(queryId); Mockito.when(execResp.getStatus()).thenReturn(successStatus); - Mockito.when(client.fetchMetadata(any(TSFetchMetadataReq.class))).thenReturn(fetchMetadataResp); + Mockito.when(client.fetchMetadata(ArgumentMatchers.any(TSFetchMetadataReq.class))) + .thenReturn(fetchMetadataResp); Mockito.when(fetchMetadataResp.getStatus()).thenReturn(successStatus); - Mockito.when(client.fetchResultsV2(any(TSFetchResultsReq.class))).thenReturn(fetchResultsResp); + Mockito.when(client.fetchResultsV2(ArgumentMatchers.any(TSFetchResultsReq.class))) + .thenReturn(fetchResultsResp); Mockito.when(fetchResultsResp.getStatus()).thenReturn(successStatus); TSStatus closeResp = successStatus; - Mockito.when(client.closeOperation(any(TSCloseOperationReq.class))).thenReturn(closeResp); + Mockito.when(client.closeOperation(ArgumentMatchers.any(TSCloseOperationReq.class))) + .thenReturn(closeResp); sessionPool = new SessionPool.Builder() @@ -224,7 +222,7 @@ public class SessionPoolTest { BitMap[] partBitMap = new BitMap[2]; Tablet tablet = new Tablet("device1", schemas, timestamp, values, partBitMap, 2); sessionPool.insertTablet(tablet); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -268,7 +266,7 @@ public class SessionPoolTest { BitMap[] partBitMap = new BitMap[2]; Tablet tablet = new Tablet("device1", schemas, timestamp, values, partBitMap, 2); sessionPool.testInsertTablet(tablet); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -287,7 +285,7 @@ public class SessionPoolTest { BitMap[] partBitMap = new BitMap[2]; Tablet tablet = new Tablet("device1", schemas, timestamp, values, partBitMap, 2); sessionPool.testInsertTablet(tablet, true); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -308,7 +306,7 @@ public class SessionPoolTest { Map<String, Tablet> map = new HashMap<>(); map.put("one", tablet); sessionPool.testInsertTablets(map); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -330,7 +328,7 @@ public class SessionPoolTest { Map<String, Tablet> map = new HashMap<>(); map.put("one", tablet); sessionPool.testInsertTablets(map, true); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -345,7 +343,7 @@ public class SessionPoolTest { List<List<String>> valuesList = Arrays.asList(Arrays.asList("11", "12"), Arrays.asList("10", "11")); sessionPool.testInsertRecords(deviceIds, timeList, measurementsList, valuesList); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -365,7 +363,7 @@ public class SessionPoolTest { List<List<Object>> valuesList = Arrays.asList(Arrays.asList(11.20, "ssq1"), Arrays.asList(11.21, "ssq2")); sessionPool.testInsertRecords(deviceIds, timeList, measurementsList, typesList, valuesList); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -374,7 +372,7 @@ public class SessionPoolTest { public void testTestInsertRecord() throws IoTDBConnectionException, StatementExecutionException { sessionPool.testInsertRecord( "device1", 1L, Arrays.asList("temperature", "humidity"), Arrays.asList("11", "12")); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -387,7 +385,7 @@ public class SessionPoolTest { Arrays.asList("temperature", "humidity"), Arrays.asList(TSDataType.FLOAT, TSDataType.FLOAT), Arrays.asList("11", "12")); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -407,7 +405,7 @@ public class SessionPoolTest { BitMap[] partBitMap = new BitMap[2]; Tablet tablet = new Tablet("alignedDevice1", schemas, timestamp, values, partBitMap, 2); sessionPool.insertAlignedTablet(tablet); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -428,7 +426,7 @@ public class SessionPoolTest { Map<String, Tablet> map = new HashMap<>(); map.put("one", tablet); sessionPool.insertTablets(map); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -450,7 +448,7 @@ public class SessionPoolTest { Map<String, Tablet> map = new HashMap<>(); map.put("one", tablet); sessionPool.insertAlignedTablets(map); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -470,7 +468,7 @@ public class SessionPoolTest { List<List<Object>> valuesList = Arrays.asList(Arrays.asList(25.0f, 50.0f), Arrays.asList(220.0, 1.5)); sessionPool.insertAlignedRecords(deviceIds, timeList, measurementsList, typesList, valuesList); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -490,7 +488,7 @@ public class SessionPoolTest { Arrays.asList(Arrays.asList(25.0f, 50.0f), Arrays.asList(220.0, 1.5)); sessionPool.insertRecordsOfOneDevice( "device1", timeList, measurementsList, typesList, valuesList); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -510,7 +508,7 @@ public class SessionPoolTest { Arrays.asList(Arrays.asList(25.0f, 50.0f), Arrays.asList(220.0, 1.5)); sessionPool.insertRecordsOfOneDevice( "device1", timeList, measurementsList, typesList, valuesList, true); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -530,7 +528,7 @@ public class SessionPoolTest { Arrays.asList(Arrays.asList(25.0f, 50.0f), Arrays.asList(220.0, 1.5)); sessionPool.insertOneDeviceRecords( "device1", timeList, measurementsList, typesList, valuesList); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -550,7 +548,7 @@ public class SessionPoolTest { Arrays.asList(Arrays.asList(25.0f, 50.0f), Arrays.asList(220.0, 1.5)); sessionPool.insertOneDeviceRecords( "device1", timeList, measurementsList, typesList, valuesList, true); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -570,7 +568,7 @@ public class SessionPoolTest { Arrays.asList(Arrays.asList(25.0f, 50.0f), Arrays.asList(220.0, 1.5)); sessionPool.insertAlignedRecordsOfOneDevice( "device1", timeList, measurementsList, typesList, valuesList); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -590,7 +588,7 @@ public class SessionPoolTest { Arrays.asList(Arrays.asList(25.0f, 50.0f), Arrays.asList(220.0, 1.5)); sessionPool.insertAlignedRecordsOfOneDevice( "device1", timeList, measurementsList, typesList, valuesList, true); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -605,7 +603,7 @@ public class SessionPoolTest { List<List<String>> valuesList = Arrays.asList(Arrays.asList("25.0f", "50.0f"), Arrays.asList("220.0", "1.5")); sessionPool.insertStringRecordsOfOneDevice("device1", timeList, measurementsList, valuesList); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -621,7 +619,7 @@ public class SessionPoolTest { Arrays.asList(Arrays.asList("25.0f", "50.0f"), Arrays.asList("220.0", "1.5")); sessionPool.insertStringRecordsOfOneDevice( "device1", timeList, measurementsList, valuesList, true); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -637,7 +635,7 @@ public class SessionPoolTest { Arrays.asList(Arrays.asList("25.0f", "50.0f"), Arrays.asList("220.0", "1.5")); sessionPool.insertAlignedStringRecordsOfOneDevice( "device1", timeList, measurementsList, valuesList); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -653,7 +651,7 @@ public class SessionPoolTest { Arrays.asList(Arrays.asList("25.0f", "50.0f"), Arrays.asList("220.0", "1.5")); sessionPool.insertAlignedStringRecordsOfOneDevice( "device1", timeList, measurementsList, valuesList, true); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -668,7 +666,7 @@ public class SessionPoolTest { List<List<String>> valuesList = Arrays.asList(Arrays.asList("25.0f", " 50.0f"), Arrays.asList("220.0", "1.5")); sessionPool.insertRecords(deviceIds, timeList, measurementsList, valuesList); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -685,7 +683,7 @@ public class SessionPoolTest { Arrays.asList(Arrays.asList("25.0f", " 50.0f"), Arrays.asList("220.0", "1.5")); sessionPool.insertAlignedRecords(deviceIds, timeList, measurementsList, valuesList); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -695,7 +693,7 @@ public class SessionPoolTest { List<String> measurementsList = Arrays.asList("temperature", "humidity"); List<TSDataType> typesList = Arrays.asList(TSDataType.DOUBLE, TSDataType.DOUBLE); sessionPool.insertRecord("device1", 3L, measurementsList, typesList, "25.0", "50.0"); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -706,7 +704,7 @@ public class SessionPoolTest { List<TSDataType> typesList = Arrays.asList(TSDataType.FLOAT, TSDataType.FLOAT); List<Object> valuesList = Arrays.asList("25.0f", " 50.0f"); sessionPool.insertRecord("device1", 4L, measurementsList, typesList, valuesList); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -716,7 +714,7 @@ public class SessionPoolTest { List<String> measurementsList = Arrays.asList("temperature", "humidity"); List<String> valuesList = Arrays.asList("25.0f", " 50.0f"); sessionPool.insertRecord("device1", 4L, measurementsList, valuesList); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -725,7 +723,7 @@ public class SessionPoolTest { public void testGetTimestampPrecision() throws IoTDBConnectionException, StatementExecutionException { sessionPool.getTimestampPrecision(); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -739,7 +737,7 @@ public class SessionPoolTest { List<TSDataType> types = Arrays.asList(TSDataType.BOOLEAN, TSDataType.INT32); List<Object> values = Arrays.asList(true, 11); sessionPool.insertAlignedRecord(multiSeriesId, time, multiMeasurementComponents, types, values); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -752,7 +750,7 @@ public class SessionPoolTest { List<String> multiMeasurementComponents = Arrays.asList("temperature", "humidity"); List<String> values = Arrays.asList("12ws", "11ws"); sessionPool.insertAlignedRecord(multiSeriesId, time, multiMeasurementComponents, values); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -761,7 +759,7 @@ public class SessionPoolTest { public void testDeleteTimeseries() throws IoTDBConnectionException, StatementExecutionException { String path = "root.device1.temperature"; sessionPool.deleteTimeseries(path); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -771,7 +769,7 @@ public class SessionPoolTest { throws IoTDBConnectionException, StatementExecutionException { List<String> paths = Arrays.asList("root.device1.temperature", "root.device1.humidity"); sessionPool.deleteTimeseries(paths); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -781,7 +779,7 @@ public class SessionPoolTest { String path = "root.device1.temperature"; long time = 2L; sessionPool.deleteData(path, time); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -791,7 +789,7 @@ public class SessionPoolTest { List<String> paths = Arrays.asList("root.device1.temperature", "root.device1.humidity"); long time = 3L; sessionPool.deleteData(paths, time); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -801,7 +799,7 @@ public class SessionPoolTest { List<String> paths = Arrays.asList("root.device1.temperature", "root.device1.humidity"); sessionPool.deleteData( paths, System.currentTimeMillis() - 1000 * 60, System.currentTimeMillis()); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -809,7 +807,7 @@ public class SessionPoolTest { @Test public void testSetStorageGroup() throws IoTDBConnectionException, StatementExecutionException { sessionPool.setStorageGroup("root.device1"); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -818,7 +816,7 @@ public class SessionPoolTest { public void testDeleteStorageGroup() throws IoTDBConnectionException, StatementExecutionException { sessionPool.deleteStorageGroup("root.device1"); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -828,7 +826,7 @@ public class SessionPoolTest { throws IoTDBConnectionException, StatementExecutionException { List<String> sgs = Arrays.asList("root.device2", "root.device3"); sessionPool.deleteStorageGroups(sgs); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -837,7 +835,7 @@ public class SessionPoolTest { public void testCreateDatabase() throws IoTDBConnectionException, StatementExecutionException { String database = "root.device1.temperature"; sessionPool.createDatabase(database); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -846,7 +844,7 @@ public class SessionPoolTest { public void testDeleteDatabase() throws IoTDBConnectionException, StatementExecutionException { String path = "root.device2.humidity"; sessionPool.deleteDatabase(path); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -855,7 +853,7 @@ public class SessionPoolTest { public void testDeleteDatabase2() throws IoTDBConnectionException, StatementExecutionException { List<String> paths = Arrays.asList("root.device2.temperature", "root.device2.humidity"); sessionPool.deleteDatabases(paths); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -867,7 +865,7 @@ public class SessionPoolTest { TSEncoding encoding = TSEncoding.RLE; CompressionType compressor = CompressionType.SNAPPY; sessionPool.createTimeseries(path, dataType, encoding, compressor); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -886,7 +884,7 @@ public class SessionPoolTest { String measurementAlias = " atmosphere"; sessionPool.createTimeseries( path, dataType, encoding, compressor, props, tags, attributes, measurementAlias); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -903,7 +901,7 @@ public class SessionPoolTest { List<String> measurementAlias = Arrays.asList("centigrade degree", "atmosphere"); sessionPool.createAlignedTimeseries( deviceId, measurements, dataTypes, encodings, compressors, measurementAlias); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -930,7 +928,7 @@ public class SessionPoolTest { List<Map<String, String>> attrs = Arrays.asList(attrMap, attrMap2); sessionPool.createAlignedTimeseries( deviceId, measurements, dataTypes, encodings, compressors, measurementAlias, tags, attrs); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -956,7 +954,7 @@ public class SessionPoolTest { tagsList, attributesList, measurementAliasList); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -966,7 +964,7 @@ public class SessionPoolTest { throws IoTDBConnectionException, StatementExecutionException { String path = "root.device5.temperature"; sessionPool.checkTimeseriesExists(path); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1003,10 +1001,10 @@ public class SessionPoolTest { iNodeVector.addChild(mNodeS2); template.addToTemplate(iNodeVector); sessionPool.createSchemaTemplate(template); - assertEquals(2, iNodeVector.getChildren().size()); - assertEquals(false, iNodeVector.getChildren().get("s1").isShareTime()); + Assert.assertEquals(2, iNodeVector.getChildren().size()); + Assert.assertEquals(false, iNodeVector.getChildren().get("s1").isShareTime()); iNodeVector.deleteChild(iNodeVector); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1024,7 +1022,7 @@ public class SessionPoolTest { "template3", measurements, dataTypes, encodings, compressionTypes, false); sessionPool.createSchemaTemplate( "template4", measurements1, dataTypes, encodings, compressionTypes, true); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1043,7 +1041,7 @@ public class SessionPoolTest { Arrays.asList(CompressionType.SNAPPY, CompressionType.SNAPPY); sessionPool.createSchemaTemplate( "template3", schemaNames, measurements, dataTypes, encodings, compressionTypes); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1058,7 +1056,7 @@ public class SessionPoolTest { Arrays.asList(CompressionType.SNAPPY, CompressionType.SNAPPY); sessionPool.addAlignedMeasurementsInTemplate( "template3", measurements, dataTypes, encodings, compressionTypes); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1072,7 +1070,7 @@ public class SessionPoolTest { TSDataType.FLOAT, TSEncoding.PLAIN, CompressionType.SNAPPY); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1087,7 +1085,7 @@ public class SessionPoolTest { Arrays.asList(CompressionType.SNAPPY, CompressionType.SNAPPY); sessionPool.addUnalignedMeasurementsInTemplate( "template5", measurements, dataTypes, encodings, compressionTypes); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1101,7 +1099,7 @@ public class SessionPoolTest { TSDataType.TEXT, TSEncoding.PLAIN, CompressionType.SNAPPY); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1110,7 +1108,7 @@ public class SessionPoolTest { public void testDeleteNodeInTemplate() throws IoTDBConnectionException, StatementExecutionException, IOException { sessionPool.deleteNodeInTemplate("template1", "root.ut0.sensor1"); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1119,7 +1117,7 @@ public class SessionPoolTest { public void testCountMeasurementsInTemplate() throws IoTDBConnectionException, StatementExecutionException { sessionPool.countMeasurementsInTemplate("template2"); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1128,7 +1126,7 @@ public class SessionPoolTest { public void testIsMeasurementInTemplate() throws IoTDBConnectionException, StatementExecutionException { sessionPool.isMeasurementInTemplate("template2", "root.ut0.sensor2"); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1137,7 +1135,7 @@ public class SessionPoolTest { public void testIsPathExistInTemplate() throws IoTDBConnectionException, StatementExecutionException { sessionPool.isPathExistInTemplate("template2", "root.ut0.sensor2"); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1146,7 +1144,7 @@ public class SessionPoolTest { public void testShowMeasurementsInTemplate() throws IoTDBConnectionException, StatementExecutionException { sessionPool.showMeasurementsInTemplate("template2"); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1155,7 +1153,7 @@ public class SessionPoolTest { public void testShowMeasurementsInTemplate2() throws IoTDBConnectionException, StatementExecutionException { sessionPool.showMeasurementsInTemplate("template2", "root.ut0.**"); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1163,7 +1161,7 @@ public class SessionPoolTest { @Test public void testShowAllTemplates() throws IoTDBConnectionException, StatementExecutionException { sessionPool.showAllTemplates(); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1172,7 +1170,7 @@ public class SessionPoolTest { public void testShowPathsTemplateSetOn() throws IoTDBConnectionException, StatementExecutionException { sessionPool.showPathsTemplateSetOn("template2"); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1181,7 +1179,7 @@ public class SessionPoolTest { public void testShowPathsTemplateUsingOn() throws IoTDBConnectionException, StatementExecutionException { sessionPool.showPathsTemplateUsingOn("template2"); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1200,7 +1198,7 @@ public class SessionPoolTest { BitMap[] partBitMap = new BitMap[2]; Tablet tablet = new Tablet("device", schemas, timestamp, values, partBitMap, 2); sessionPool.sortTablet(tablet); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1208,7 +1206,7 @@ public class SessionPoolTest { @Test public void testSetSchemaTemplate() throws IoTDBConnectionException, StatementExecutionException { sessionPool.setSchemaTemplate("template2", "root.ut0.sensor2"); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1217,7 +1215,7 @@ public class SessionPoolTest { public void testUnSetSchemaTemplate() throws IoTDBConnectionException, StatementExecutionException { sessionPool.unsetSchemaTemplate("root.ut0.sensor2", "template2"); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1226,7 +1224,7 @@ public class SessionPoolTest { public void testDropSchemaTemplate() throws IoTDBConnectionException, StatementExecutionException { sessionPool.dropSchemaTemplate("template2"); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1236,7 +1234,7 @@ public class SessionPoolTest { throws IoTDBConnectionException, StatementExecutionException { List<String> devicePaths = Arrays.asList("root.ut3", "root.ut4"); sessionPool.createTimeseriesUsingSchemaTemplate(devicePaths); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1261,12 +1259,14 @@ public class SessionPoolTest { 10, true, 10); - Mockito.when(session.executeQueryStatement(any(String.class), eq(50))) + Mockito.when( + session.executeQueryStatement( + ArgumentMatchers.any(String.class), ArgumentMatchers.eq(50))) .thenReturn(sessionDataSet); sessionDataSetWrapper = sessionPool.executeQueryStatement(sql, 50); sessionDataSetWrapper.setSessionDataSet(sessionDataSet); sessionPool.closeResultSet(sessionDataSetWrapper); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1275,7 +1275,7 @@ public class SessionPoolTest { public void testExecuteQueryStatement3() throws IoTDBConnectionException, StatementExecutionException { sessionPool.executeQueryStatement("show version"); - assertEquals( + Assert.assertEquals( 0, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1285,7 +1285,7 @@ public class SessionPoolTest { throws IoTDBConnectionException, StatementExecutionException { sessionPool.executeNonQueryStatement( "create timeseries root.test.g_0.d_7815.s_7818 WITH datatype=boolean, encoding=PLAIN"); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1296,7 +1296,7 @@ public class SessionPoolTest { List<String> paths = Arrays.asList("root.test.g_0.d_7815.s_7818"); sessionPool.executeRawDataQuery( paths, System.currentTimeMillis() - 1000 * 60 * 24l, System.currentTimeMillis(), 50); - assertEquals( + Assert.assertEquals( 0, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1306,7 +1306,7 @@ public class SessionPoolTest { throws IoTDBConnectionException, StatementExecutionException { List<String> paths = Arrays.asList("root.test.g_0.d_7815.s_7818"); sessionPool.executeLastDataQuery(paths, System.currentTimeMillis() - 1000 * 60 * 24l); - assertEquals( + Assert.assertEquals( 0, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1316,7 +1316,7 @@ public class SessionPoolTest { throws IoTDBConnectionException, StatementExecutionException { List<String> paths = Arrays.asList("root.test.g_0.d_7815.s_7818"); sessionPool.executeLastDataQuery(paths); - assertEquals( + Assert.assertEquals( 0, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1326,7 +1326,7 @@ public class SessionPoolTest { throws IoTDBConnectionException, StatementExecutionException { List<String> paths = Arrays.asList("root.test.g_0.d_7815.s_7818"); sessionPool.executeLastDataQuery(paths, System.currentTimeMillis() - 1000 * 60 * 24l, 50); - assertEquals( + Assert.assertEquals( 0, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1337,7 +1337,7 @@ public class SessionPoolTest { List<String> paths = Arrays.asList("s_7817", "s_7818"); sessionPool.executeLastDataQueryForOneDevice( "root.test.g_0", "root.test.g_0.d_7818", paths, true); - assertEquals( + Assert.assertEquals( 0, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1349,7 +1349,7 @@ public class SessionPoolTest { List<TAggregationType> aggregations = Arrays.asList(TAggregationType.MAX_VALUE, TAggregationType.LAST_VALUE); sessionPool.executeAggregationQuery(paths, aggregations); - assertEquals( + Assert.assertEquals( 0, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1366,7 +1366,7 @@ public class SessionPoolTest { System.currentTimeMillis() - 1000 * 60 * 24l, System.currentTimeMillis(), 500); - assertEquals( + Assert.assertEquals( 0, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1382,7 +1382,7 @@ public class SessionPoolTest { aggregations, System.currentTimeMillis() - 1000 * 60 * 24l, System.currentTimeMillis()); - assertEquals( + Assert.assertEquals( 0, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1400,7 +1400,7 @@ public class SessionPoolTest { System.currentTimeMillis(), 500, 500 * 1000); - assertEquals( + Assert.assertEquals( 0, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1408,7 +1408,7 @@ public class SessionPoolTest { @Test public void testFetchAllConnections() throws IoTDBConnectionException { sessionPool.fetchAllConnections(); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1417,7 +1417,7 @@ public class SessionPoolTest { public void testGetBackupConfiguration() throws IoTDBConnectionException, StatementExecutionException { sessionPool.getBackupConfiguration(); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1428,7 +1428,7 @@ public class SessionPoolTest { ISessionPool sessionPool = Mockito.mock(ISessionPool.class); Map<String, Tablet> tablets = new HashMap<>(); boolean sorted = true; - doThrow(new StatementExecutionException("")) + Mockito.doThrow(new StatementExecutionException("")) .when(sessionPool) .insertAlignedTablets(tablets, sorted); sessionPool.insertAlignedTablets(tablets, sorted); @@ -1449,7 +1449,7 @@ public class SessionPoolTest { List<List<Object>> valuesList = Arrays.asList(Arrays.asList(25.0f, 50.0f), Arrays.asList(220.0, 1.5)); sessionPool.insertRecords(deviceIds, timeList, measurementsList, typesList, valuesList); - assertEquals( + Assert.assertEquals( 1, ((ConcurrentLinkedDeque<ISession>) Whitebox.getInternalState(sessionPool, "queue")).size()); } @@ -1496,7 +1496,8 @@ public class SessionPoolTest { true, 10); - Mockito.when(session.executeQueryStatement(any(String.class))).thenReturn(sessionDataSet); + Mockito.when(session.executeQueryStatement(ArgumentMatchers.any(String.class))) + .thenReturn(sessionDataSet); SessionDataSetWrapper sessionDataSetWrapper = sessionPool.executeQueryStatement(testSql); List<String> columnNames = sessionDataSetWrapper.getColumnNames(); diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/test/java/org/apache/iotdb/session/util/SessionUtilsTest.java b/iotdb-client/session/src/test/java/org/apache/iotdb/session/util/SessionUtilsTest.java similarity index 100% rename from iotdb-client/session/src/main/java/org/apache/iotdb/session/test/java/org/apache/iotdb/session/util/SessionUtilsTest.java rename to iotdb-client/session/src/test/java/org/apache/iotdb/session/util/SessionUtilsTest.java diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/test/java/org/apache/iotdb/session/util/ThreadUtilsTest.java b/iotdb-client/session/src/test/java/org/apache/iotdb/session/util/ThreadUtilsTest.java similarity index 100% rename from iotdb-client/session/src/main/java/org/apache/iotdb/session/test/java/org/apache/iotdb/session/util/ThreadUtilsTest.java rename to iotdb-client/session/src/test/java/org/apache/iotdb/session/util/ThreadUtilsTest.java diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/test/resources/iotdb-common.properties b/iotdb-client/session/src/test/resources/iotdb-common.properties similarity index 100% rename from iotdb-client/session/src/main/java/org/apache/iotdb/session/test/resources/iotdb-common.properties rename to iotdb-client/session/src/test/resources/iotdb-common.properties diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/test/resources/iotdb-datanode.properties b/iotdb-client/session/src/test/resources/iotdb-datanode.properties similarity index 100% rename from iotdb-client/session/src/main/java/org/apache/iotdb/session/test/resources/iotdb-datanode.properties rename to iotdb-client/session/src/test/resources/iotdb-datanode.properties diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/test/resources/logback.xml b/iotdb-client/session/src/test/resources/logback.xml similarity index 100% rename from iotdb-client/session/src/main/java/org/apache/iotdb/session/test/resources/logback.xml rename to iotdb-client/session/src/test/resources/logback.xml
