Skip to content

Commit a9d9b44

Browse files
chernserchernser
committed
added more test checks
1 parent edfc467 commit a9d9b44

File tree

1 file changed

+48
-48
lines changed

1 file changed

+48
-48
lines changed

‎jdbc-v2/src/test/java/com/clickhouse/jdbc/DataTypeTests.java‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1723,14 +1723,14 @@ public void testGeoPoint() throws Exception {
17231723
assertEquals(rsMd.getColumnTypeName(geomColumn), ClickHouseDataType.Point.name());
17241724
assertEquals(rsMd.getColumnType(geomColumn), Types.ARRAY);
17251725

1726-
while (rs.next()) {
1727-
if (rs.isLast()) {
1728-
assertEquals(rs.getRow(), 1);
1729-
}
1730-
1731-
Object asObject = rs.getObject(geomColumn);
1732-
Array asArray = rs.getArray(geomColumn);
1733-
}
1726+
rs.next();
1727+
assertTrue(rs.isLast());
1728+
Object asObject = rs.getObject(geomColumn);
1729+
assertTrue(asObject instanceof double[]);
1730+
Array asArray = rs.getArray(geomColumn);
1731+
assertEquals(asArray.getArray(), row);
1732+
assertEquals(asArray.getBaseTypeName(), ClickHouseDataType.Point.name());
1733+
assertEquals(asArray.getBaseType(), Types.ARRAY);
17341734
}
17351735
}
17361736
}
@@ -1760,14 +1760,14 @@ public void testGeoRing() throws Exception {
17601760
assertEquals(rsMd.getColumnTypeName(geomColumn), ClickHouseDataType.Ring.name());
17611761
assertEquals(rsMd.getColumnType(geomColumn), Types.ARRAY);
17621762

1763-
while (rs.next()) {
1764-
if (rs.isLast()) {
1765-
assertEquals(rs.getRow(), 1);
1766-
}
1767-
1768-
Object asObject = rs.getObject(geomColumn);
1769-
Array asArray = rs.getArray(geomColumn);
1770-
}
1763+
rs.next();
1764+
assertTrue(rs.isLast());
1765+
Object asObject = rs.getObject(geomColumn);
1766+
assertTrue(asObject instanceof double[][]);
1767+
Array asArray = rs.getArray(geomColumn);
1768+
assertEquals(asArray.getArray(), row);
1769+
assertEquals(asArray.getBaseTypeName(), ClickHouseDataType.Ring.name());
1770+
assertEquals(asArray.getBaseType(), Types.ARRAY);
17711771
}
17721772
}
17731773
}
@@ -1797,14 +1797,14 @@ public void testGeoLineString() throws Exception {
17971797
assertEquals(rsMd.getColumnTypeName(geomColumn), ClickHouseDataType.LineString.name());
17981798
assertEquals(rsMd.getColumnType(geomColumn), Types.ARRAY);
17991799

1800-
while (rs.next()) {
1801-
if (rs.isLast()) {
1802-
assertEquals(rs.getRow(), 1);
1803-
}
1804-
1805-
Object asObject = rs.getObject(geomColumn);
1806-
Array asArray = rs.getArray(geomColumn);
1807-
}
1800+
rs.next();
1801+
assertTrue(rs.isLast());
1802+
Object asObject = rs.getObject(geomColumn);
1803+
assertTrue(asObject instanceof double[][]);
1804+
Array asArray = rs.getArray(geomColumn);
1805+
assertEquals(asArray.getArray(), row);
1806+
assertEquals(asArray.getBaseTypeName(), ClickHouseDataType.LineString.name());
1807+
assertEquals(asArray.getBaseType(), Types.ARRAY);
18081808
}
18091809
}
18101810
}
@@ -1842,14 +1842,14 @@ public void testGeoMultiLineString() throws Exception {
18421842
assertEquals(rsMd.getColumnTypeName(geomColumn), ClickHouseDataType.MultiLineString.name());
18431843
assertEquals(rsMd.getColumnType(geomColumn), Types.ARRAY);
18441844

1845-
while (rs.next()) {
1846-
if (rs.isLast()) {
1847-
assertEquals(rs.getRow(), 1);
1848-
}
1849-
1850-
Object asObject = rs.getObject(geomColumn);
1851-
Array asArray = rs.getArray(geomColumn);
1852-
}
1845+
rs.next();
1846+
assertTrue(rs.isLast());
1847+
Object asObject = rs.getObject(geomColumn);
1848+
assertTrue(asObject instanceof double[][][]);
1849+
Array asArray = rs.getArray(geomColumn);
1850+
assertEquals(asArray.getArray(), row);
1851+
assertEquals(asArray.getBaseTypeName(), ClickHouseDataType.MultiLineString.name());
1852+
assertEquals(asArray.getBaseType(), Types.ARRAY);
18531853
}
18541854
}
18551855
}
@@ -1887,14 +1887,14 @@ public void testGeoPolygon() throws Exception {
18871887
assertEquals(rsMd.getColumnTypeName(geomColumn), ClickHouseDataType.Polygon.name());
18881888
assertEquals(rsMd.getColumnType(geomColumn), Types.ARRAY);
18891889

1890-
while (rs.next()) {
1891-
if (rs.isLast()) {
1892-
assertEquals(rs.getRow(), 1);
1893-
}
1894-
1895-
Object asObject = rs.getObject(geomColumn);
1896-
Array asArray = rs.getArray(geomColumn);
1897-
}
1890+
rs.next();
1891+
assertTrue(rs.isLast());
1892+
Object asObject = rs.getObject(geomColumn);
1893+
assertTrue(asObject instanceof double[][][]);
1894+
Array asArray = rs.getArray(geomColumn);
1895+
assertEquals(asArray.getArray(), row);
1896+
assertEquals(asArray.getBaseTypeName(), ClickHouseDataType.Polygon.name());
1897+
assertEquals(asArray.getBaseType(), Types.ARRAY);
18981898
}
18991899
}
19001900
}
@@ -1948,14 +1948,14 @@ public void testGeoMultiPolygon() throws Exception {
19481948
assertEquals(rsMd.getColumnTypeName(geomColumn), ClickHouseDataType.MultiPolygon.name());
19491949
assertEquals(rsMd.getColumnType(geomColumn), Types.ARRAY);
19501950

1951-
while (rs.next()) {
1952-
if (rs.isLast()) {
1953-
assertEquals(rs.getRow(), 1);
1954-
}
1955-
1956-
Object asObject = rs.getObject(geomColumn);
1957-
Array asArray = rs.getArray(geomColumn);
1958-
}
1951+
rs.next();
1952+
assertTrue(rs.isLast());
1953+
Object asObject = rs.getObject(geomColumn);
1954+
assertTrue(asObject instanceof double[][][][]);
1955+
Array asArray = rs.getArray(geomColumn);
1956+
assertEquals(asArray.getArray(), row);
1957+
assertEquals(asArray.getBaseTypeName(), ClickHouseDataType.MultiPolygon.name());
1958+
assertEquals(asArray.getBaseType(), Types.ARRAY);
19591959
}
19601960
}
19611961
}

0 commit comments

Comments
 (0)