minor changes to synapse unit tests.

Author: VenkatasivareddyTR

athena-synapse/src/test/java/com/amazonaws/athena/connectors/synapse/SynapseMetadataHandlerTest.java

@@ -402,14 +402,14 @@ public void doGetTable()
         when(connection.getMetaData().getURL()).thenReturn("jdbc:sqlserver://hostname;databaseName=fakedatabase");
 
         TableName inputTableName = new TableName(TEST_SCHEMA, TEST_TABLE);
-        when(connection.getCatalog()).thenReturn("testCatalog");
-        when(connection.getMetaData().getColumns("testCatalog", inputTableName.getSchemaName(), inputTableName.getTableName(), null)).thenReturn(resultSet2);
+        when(connection.getCatalog()).thenReturn(TEST_CATALOG);
+        when(connection.getMetaData().getColumns(TEST_CATALOG, inputTableName.getSchemaName(), inputTableName.getTableName(), null)).thenReturn(resultSet2);
 
         GetTableResponse getTableResponse = this.synapseMetadataHandler.doGetTable(
-                blockAllocator, new GetTableRequest(this.federatedIdentity, TEST_QUERY_ID, "testCatalog", inputTableName, Collections.emptyMap()));
+                blockAllocator, new GetTableRequest(this.federatedIdentity, TEST_QUERY_ID, TEST_CATALOG, inputTableName, Collections.emptyMap()));
         assertEquals(expected, getTableResponse.getSchema());
         assertEquals(inputTableName, getTableResponse.getTableName());
-        assertEquals("testCatalog", getTableResponse.getCatalogName());
+        assertEquals(TEST_CATALOG, getTableResponse.getCatalogName());
     }
 
     @Test
@@ -436,20 +436,20 @@ public void doDataTypeConversion()
         when(connection.getMetaData().getURL()).thenReturn("jdbc:sqlserver://hostname-ondemand;databaseName=fakedatabase");
 
         TableName inputTableName = new TableName(TEST_SCHEMA, TEST_TABLE);
-        when(connection.getCatalog()).thenReturn("testCatalog");
-        when(connection.getMetaData().getColumns("testCatalog", inputTableName.getSchemaName(), inputTableName.getTableName(), null)).thenReturn(resultSet2);
+        when(connection.getCatalog()).thenReturn(TEST_CATALOG);
+        when(connection.getMetaData().getColumns(TEST_CATALOG, inputTableName.getSchemaName(), inputTableName.getTableName(), null)).thenReturn(resultSet2);
 
         GetTableResponse getTableResponse = this.synapseMetadataHandler.doGetTable(
-                blockAllocator, new GetTableRequest(this.federatedIdentity, TEST_QUERY_ID, "testCatalog", inputTableName, Collections.emptyMap()));
+                blockAllocator, new GetTableRequest(this.federatedIdentity, TEST_QUERY_ID, TEST_CATALOG, inputTableName, Collections.emptyMap()));
         assertEquals(inputTableName, getTableResponse.getTableName());
-        assertEquals("testCatalog", getTableResponse.getCatalogName());
+        assertEquals(TEST_CATALOG, getTableResponse.getCatalogName());
     }
 
     @Test
     public void doListTables() throws Exception
     {
         BlockAllocator blockAllocator = new BlockAllocatorImpl();
-        ListTablesRequest listTablesRequest = new ListTablesRequest(federatedIdentity, TEST_QUERY_ID, "testCatalog", TEST_SCHEMA, null, 3);
+        ListTablesRequest listTablesRequest = new ListTablesRequest(federatedIdentity, TEST_QUERY_ID, TEST_CATALOG, TEST_SCHEMA, null, 3);
 
         DatabaseMetaData mockDatabaseMetaData = mock(DatabaseMetaData.class);
         ResultSet mockResultSet = mock(ResultSet.class);
@@ -589,15 +589,15 @@ public void testDoDataTypeConversion_withAzureServerless() throws Exception {
             when(connection.getMetaData().getURL()).thenReturn("jdbc:sqlserver://test-ondemand.sql.azuresynapse.net;databaseName=fakedatabase");
 
             TableName inputTableName = new TableName(TEST_SCHEMA, TEST_TABLE);
-            when(connection.getCatalog()).thenReturn("testCatalog");
+            when(connection.getCatalog()).thenReturn(TEST_CATALOG);
 
             GetTableResponse getTableResponse = this.synapseMetadataHandler.doGetTable(
-                    blockAllocator, new GetTableRequest(this.federatedIdentity, TEST_QUERY_ID, "testCatalog", inputTableName, Collections.emptyMap()));
+                    blockAllocator, new GetTableRequest(this.federatedIdentity, TEST_QUERY_ID, TEST_CATALOG, inputTableName, Collections.emptyMap()));
 
             // Compare schemas ignoring order
             assertTrue("Schemas do not match when ignoring order", schemasMatchIgnoringOrder(expected, getTableResponse.getSchema()));
             assertEquals(inputTableName, getTableResponse.getTableName());
-            assertEquals("testCatalog", getTableResponse.getCatalogName());
+            assertEquals(TEST_CATALOG, getTableResponse.getCatalogName());
 
     }
 

athena-synapse/src/test/java/com/amazonaws/athena/connectors/synapse/SynapseRecordHandlerTest.java

@@ -153,13 +153,13 @@ private Split mockSplitWithPartitionProperties(String from, String to, String pa
         ImmutableMap<String, String> properties = ImmutableMap.of(
                 SynapseMetadataHandler.PARTITION_BOUNDARY_FROM, from,
                 SynapseMetadataHandler.PARTITION_NUMBER, partitionNumber,
-                SynapseMetadataHandler.PARTITION_COLUMN, SynapseRecordHandlerTest.TEST_COL1,
+                SynapseMetadataHandler.PARTITION_COLUMN, TEST_COL1,
                 SynapseMetadataHandler.PARTITION_BOUNDARY_TO, to
         );
         when(split.getProperties()).thenReturn(properties);
         when(split.getProperty(eq(SynapseMetadataHandler.PARTITION_BOUNDARY_FROM))).thenReturn(from);
         when(split.getProperty(eq(SynapseMetadataHandler.PARTITION_NUMBER))).thenReturn(partitionNumber);
-        when(split.getProperty(eq(SynapseMetadataHandler.PARTITION_COLUMN))).thenReturn(SynapseRecordHandlerTest.TEST_COL1);
+        when(split.getProperty(eq(SynapseMetadataHandler.PARTITION_COLUMN))).thenReturn(TEST_COL1);
         when(split.getProperty(eq(SynapseMetadataHandler.PARTITION_BOUNDARY_TO))).thenReturn(to);
         return split;
     }
@@ -168,7 +168,7 @@ private ValueSet getSingleValueSet()
     {
         Range range = Mockito.mock(Range.class, Mockito.RETURNS_DEEP_STUBS);
         when(range.isSingleValue()).thenReturn(true);
-        when(range.getLow().getValue()).thenReturn(SynapseRecordHandlerTest.TEST_VARCHAR_VALUE);
+        when(range.getLow().getValue()).thenReturn(TEST_VARCHAR_VALUE);
         ValueSet valueSet = Mockito.mock(SortedRangeSet.class, Mockito.RETURNS_DEEP_STUBS);
         when(valueSet.getRanges().getOrderedRanges()).thenReturn(Collections.singletonList(range));
         return valueSet;