Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integration tests addition and refactoring #30

Merged
merged 1 commit into from
Jan 17, 2023
Merged

Integration tests addition and refactoring #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 54 additions & 10 deletions integrationtest/src/main/java/software/amazon/timestream/integrationtest/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import com.amazonaws.services.timestreamwrite.model.MeasureValueType;
import com.google.common.collect.ImmutableMap;

import java.util.Map;

/**
Expand All @@ -28,16 +29,9 @@ final class Constants {
static final String TABLE_NAME = "Integration_Test_Table_07";
static final String NON_EXISTENT_TABLE_NAME = "NotExistTableName";
static final String[] DATABASES_NAMES = new String[]{
"FAST_PATH_TEST_DB",
"JDBC_Integration07_Test_DB",
"TestV1",
"devops",
"grafanaPerfDB",
"grafana_db",
"perf07",
"performance07",
"sampleDB",
"testDB"
"Integration_Test_DB01",
"Integration_Test_DB02"
};
static final String[] COLUMN_NAMES = new String[]{
"hostname",
Expand All @@ -56,6 +50,55 @@ final class Constants {
"measure_value::varchar",
};

static final String NO_DB_NO_TB_REGION = "ap-southeast-2";
static final String[] NO_DB_DATABASE_NAMES = new String[]{};
static final String[] NO_TB_TABLE_NAMES = new String[]{};

static final String ONE_DB_NO_TB_REGION = "ap-northeast-1";
static final String[] ONE_DB_NO_TB_DATABASE_NAME = new String[]{
"EmptyDb_1_2.34"
};
static final String[] ONE_DB_NO_TB_TABLE_NAMES = new String[]{};

static final String ONE_DB_ONE_TB_REGION = "eu-central-1";
static final String[] ONE_DB_ONE_TB_DATABASE_NAME = new String[]{
"JDBC_.IntegrationTestDB0088"
};
static final String[] ONE_DB_ONE_TB_TABLE_NAME = new String[]{
"IntegrationTestTable0888",
};

static final String ONE_DB_MUTLI_TB_REGION = "eu-west-1";
static final String[] ONE_DB_MUTLI_TB_DATABASES_NAME = new String[]{
"JDBC_Inte.gration_Te.st_DB_01"
};
static final String[] ONE_DB_MUTLI_TB_TABLE_NAMES = new String[]{
"Inte.gration_Tes_t_Tab_le_03",
"Integ.ration_Te_st_T_able_01",
"Integr.ation_Test_Ta_ble_02"
};

static final String[] MULTI_DB_MUTLI_TB_DATABASES_NAMES = new String[]{
"JD_BC_Int.egration_Test_DB_001",
"JDB.C_Integration-Test_DB_002",
"JD-BC_Integration.Test_DB_003"
};
static final String[] MULTI_DB_MUTLI_TB_TABLE_NAMES1 = new String[]{
"Inte-gration_Tes1t_Table_01_01",
"Inte-gration2_Te-st_Table_01_02",
"Inte-gration_Test_3Ta-ble_01_03"
};
static final String[] MULTI_DB_MUTLI_TB_TABLE_NAMES2 = new String[]{
"Integration-Test_Ta1ble_02_01",
"Integration.-Te-st_Table_02_02"
};
static final String[] MULTI_DB_MUTLI_TB_TABLE_NAMES3 = new String[]{
"JD-BC_Integration-Test_Ta1ble_03_01",
"JD-BC_Integration.-Te-st_Table_03_02",
"JD-BC_Integration--Test2_Table_03_03",
"JD-BC_Integration0-Te-st_Ta.ble_03_04"
};

static final int TABLE_COLUMN_NUM = 9;
static final int TABLE_ROW_SIZE = 4;
static final long HT_TTL_HOURS = 24L;
Expand All @@ -72,5 +115,6 @@ final class Constants {
.put(MeasureValueType.BOOLEAN, BOOLEAN_VALUE)
.build();

private Constants() { }
private Constants() {
}
}
9 changes: 7 additions & 2 deletions ...main/java/software/amazon/timestream/integrationtest/DatabaseMetaDataIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,15 @@ class DatabaseMetaDataIntegrationTest {

@BeforeAll
private static void setUp() {
TableManager.createTable();
TableManager.createDatabases(Constants.DATABASES_NAMES);
TableManager.createTable(Constants.TABLE_NAME, Constants.DATABASE_NAME);
TableManager.writeRecords();
}

@AfterAll
private static void cleanUp() {
TableManager.deleteTable();
TableManager.deleteTable(Constants.TABLE_NAME, Constants.DATABASE_NAME);
TableManager.deleteDatabases(Constants.DATABASES_NAMES);
}

@BeforeEach
Expand All @@ -69,6 +71,7 @@ private void terminate() throws SQLException {

/**
* Test getCatalogs returns empty ResultSet.
*
* @throws SQLException the exception thrown
*/
@Test
Expand All @@ -85,6 +88,7 @@ void testCatalogs() throws SQLException {

/**
* Test getSchemas returns the list of all databases.
*
* @throws SQLException the exception thrown
*/
@Test
Expand All @@ -102,6 +106,7 @@ void testSchemas() throws SQLException {

/**
* Test getSchemas returns database "JDBC_Integration07_Test_DB" when given matching patterns.
*
* @param schemaPattern the schema pattern to be tested
* @throws SQLException the exception thrown
*/
Expand Down
228 changes: 228 additions & 0 deletions ...ware/amazon/timestream/integrationtest/DatabaseMetaDataMultiDBMultiTBIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,228 @@
/*
* Copyright <2020> Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
* A copy of the License is located at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* or in the "license" file accompanying this file. This file is distributed
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
* express or implied. See the License for the specific language governing
* permissions and limitations under the License.
*/

package software.amazon.timestream.integrationtest;

import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
import software.amazon.timestream.jdbc.TimestreamDatabaseMetaData;

import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Properties;

/**
* Integration tests for supported getters in {@link TimestreamDatabaseMetaData}
* Test case: Multiples databases with multiple tables
*/
class DatabaseMetaDataMultiDBMultiTBIntegrationTest {
private DatabaseMetaData metaData;
private Connection connection;
private List<String[]> tables;

@BeforeAll
private static void setUp() {
TableManager.createDatabases(Constants.MULTI_DB_MUTLI_TB_DATABASES_NAMES);
TableManager.createTables(Constants.MULTI_DB_MUTLI_TB_TABLE_NAMES1, Constants.MULTI_DB_MUTLI_TB_DATABASES_NAMES[0]);
TableManager.createTables(Constants.MULTI_DB_MUTLI_TB_TABLE_NAMES2, Constants.MULTI_DB_MUTLI_TB_DATABASES_NAMES[1]);
TableManager.createTables(Constants.MULTI_DB_MUTLI_TB_TABLE_NAMES3, Constants.MULTI_DB_MUTLI_TB_DATABASES_NAMES[2]);
}

@AfterAll
private static void cleanUp() {
TableManager.deleteTables(Constants.MULTI_DB_MUTLI_TB_TABLE_NAMES1, Constants.MULTI_DB_MUTLI_TB_DATABASES_NAMES[0]);
TableManager.deleteTables(Constants.MULTI_DB_MUTLI_TB_TABLE_NAMES2, Constants.MULTI_DB_MUTLI_TB_DATABASES_NAMES[1]);
TableManager.deleteTables(Constants.MULTI_DB_MUTLI_TB_TABLE_NAMES3, Constants.MULTI_DB_MUTLI_TB_DATABASES_NAMES[2]);
TableManager.deleteDatabases(Constants.MULTI_DB_MUTLI_TB_DATABASES_NAMES);
}

@BeforeEach
private void init() throws SQLException {
final Properties p = new Properties();
connection = DriverManager.getConnection(Constants.URL, p);
metaData = connection.getMetaData();
tables = new ArrayList<>();
tables.add(Constants.MULTI_DB_MUTLI_TB_TABLE_NAMES1);
tables.add(Constants.MULTI_DB_MUTLI_TB_TABLE_NAMES2);
tables.add(Constants.MULTI_DB_MUTLI_TB_TABLE_NAMES3);
}

@AfterEach
private void terminate() throws SQLException {
connection.close();
}

/**
* Test getCatalogs returns empty ResultSet.
*
* @throws SQLException the exception thrown
*/
@Test
@DisplayName("Test getCatalogs(). Empty result set should be returned")
void testCatalogs() throws SQLException {
final List<String> catalogsList = new ArrayList<>();
try (ResultSet catalogs = metaData.getCatalogs()) {
while (catalogs.next()) {
catalogsList.add(catalogs.getString("TABLE_CAT"));
}
}
Assertions.assertTrue(catalogsList.isEmpty());
}

/**
* Test getSchemas returns the databases.
*
* @throws SQLException the exception thrown
*/
@Test
@DisplayName("Test retrieving the databases.")
void testSchemas() throws SQLException {
final List<String> databasesList = Arrays.asList(Constants.MULTI_DB_MUTLI_TB_DATABASES_NAMES);
final List<String> schemasList = new ArrayList<>();
try (ResultSet schemas = metaData.getSchemas()) {
while (schemas.next()) {
schemasList.add(schemas.getString("TABLE_SCHEM"));
}
}
Assertions.assertTrue(schemasList.containsAll(databasesList));
}

/**
* Test getTables returns all tables.
*
* @throws SQLException the exception thrown
*/
@Test
@DisplayName("Test getTables returns all tables")
void testTables() throws SQLException {
final List<String> allTables = new ArrayList<>();

// Test all tables from specified database are returned
for (int i = 0; i < tables.size(); i++) {
final List<String> tableList = Arrays.asList(tables.get(i));
allTables.addAll(tableList);
final List<String> returnTableList = new ArrayList<>();
try (ResultSet tables = metaData.getTables(null, Constants.MULTI_DB_MUTLI_TB_DATABASES_NAMES[i], null, null)) {
while (tables.next()) {
returnTableList.add(tables.getString("TABLE_NAME"));
}
}
Assertions.assertTrue(returnTableList.containsAll(tableList));
}

// Test all tables from region are returned when no database is specified
final List<String> returnAllTableList = new ArrayList<>();
try (ResultSet tables = metaData.getTables(null, null, null, null)) {
while (tables.next()) {
returnAllTableList.add(tables.getString("TABLE_NAME"));
}
}
Assertions.assertTrue(returnAllTableList.containsAll(allTables));
}

/**
* Test getSchemas returns databases when given matching patterns.
*
* @param schemaPattern the schema pattern to be tested
* @param index index of database name in Constants.MULTI_DB_MUTLI_TB_DATABASES_NAMES
* @throws SQLException the exception thrown
*/
@ParameterizedTest
@CsvSource(value = {
"%ion!_T%' escape '!, 0",
"%DB_001, 0",
"JDB.C%, 1",
"%DB_002, 1",
"JD-BC%, 2",
"%DB!_003' escape '!, 2",
})
@DisplayName("Test retrieving database name JD_BC_Int.egration_Test_DB_001, JDB.C_Integration-Test_DB_002, JD-BC_Integration.Test_DB_003 with pattern.")
void testGetSchemasWithSchemaPattern(String schemaPattern, int index) throws SQLException {
try (ResultSet schemas = metaData.getSchemas(null, schemaPattern)) {
Assertions.assertTrue(schemas.next());
Assertions.assertEquals(Constants.MULTI_DB_MUTLI_TB_DATABASES_NAMES[index], schemas.getString("TABLE_SCHEM"));
}
}

/**
* Test getTables returns tables from JD-BC_Integration.Test_DB_003 when given matching patterns.
*
* @param tablePattern the table pattern to be tested
* @param schemaPattern the database pattern to be tested
* @param dbIndex index of database. 0 corresponds to Constants.MULTI_DB_MUTLI_TB_TABLE_NAMES1
* @param tbIndex index of table name in specified database
* @throws SQLException the exception thrown
*/
@ParameterizedTest
@CsvSource(value = {
"%_Table_01_01, %ion!_T%' escape '!, 0, 0",
"%-gration2_Te-st%, JD_BC_Int.%, 0, 1",
"_nte-gration_Test_3Ta-ble_0__03, %DB_001, 0, 2",
"%!_02!_01' escape '!, %DB_002, 1, 0",
"%gration.-Te-st%, %ion-T%, 1, 1",
"JD-BC__ntegration-Test_Ta1ble_0__01, %DB!_003' escape '!, 2, 0",
"%.-Te-st_T%, %ion.T%, 2, 1",
"%3_03, JD-BC%, 2, 2",
"%a.ble%' escape '!, %DB!_003' escape '!, 2, 3"
})
@DisplayName("Test retrieving tables from databases when given matching table and schema patterns.")
void testTablesWithTBPatternDBPattern(final String tablePattern, final String schemaPattern, final int dbIndex, final int tbIndex) throws SQLException {
try (ResultSet tableResultSet = metaData.getTables(null, schemaPattern, tablePattern, null)) {
Assertions.assertTrue(tableResultSet.next());
Assertions.assertEquals(tables.get(dbIndex)[tbIndex], tableResultSet.getObject("TABLE_NAME"));
}
}

/**
* Test getTables returns tables from databases when given matching table patterns.
*
* @param tablePattern the table pattern to be tested
* @param dbIndex index of database. 0 corresponds to Constants.MULTI_DB_MUTLI_TB_TABLE_NAMES1
* @param tbIndex index of table name in specified database
* @throws SQLException the exception thrown
*/
@ParameterizedTest
@CsvSource(value = {
"_nte-gration_Tes1t_Table_0__01, 0, 0",
"%_Table_01_02%, 0, 1",
"%-gration_Test%, 0, 2",
"%!_02!_01' escape '!, 1, 0",
"%_Table_02_02, 1, 1",
"%-BC_Integration-Test_Ta1%, 2, 0",
"%.-Te-st_T%, 2, 1",
"%t2!_T%' escape '!, 2, 2",
"%a.ble%' escape '!, 2, 3"
})
@DisplayName("Test retrieving tables from databases when given matching table patterns.")
void testTablesWithTBPattern(final String tablePattern, final int dbIndex, final int tbIndex) throws SQLException {
try (ResultSet tableResultSet = metaData.getTables(null, Constants.MULTI_DB_MUTLI_TB_DATABASES_NAMES[dbIndex], tablePattern, null)) {
Assertions.assertTrue(tableResultSet.next());
Assertions.assertEquals(tables.get(dbIndex)[tbIndex], tableResultSet.getObject("TABLE_NAME"));
}
}
}
Loading