NoBug: Re-enable jdbc_all.SqlTracing. Sql Tracing Test (#22169)

* Enabling jdbc tracingsql tests * Adding connector_all test group
javaee · Aug 4, 2017 · 60ed022 · 60ed022
1 parent a2841a4
commit 60ed022
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/build.xml
@@ -138,8 +138,7 @@
 	<ant dir="dmmcf" target="all"/>
 	<ant dir="dmmcf.markconnectionasbad.xa" target="all"/>
 	<ant dir="dmmcf.appclient" target="all"/>
-        <!-- Temporarily disabling this test as there is a Derby compatibility issue-->
-	<!--ant dir="tracingsql" target="all"/-->
+        <ant dir="tracingsql" target="all"/>
 	<ant dir="datasource40" target="all"/>
 	<ant dir="custom-validation" target="all"/>
 	<ant dir="custom-validation-1" target="all"/>

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/sql/create_pointbase.sql
@@ -33,11 +33,11 @@ CREATE TABLE expected_sql_trace (
 );
 
 
-INSERT INTO expected_sql_trace VALUES('org.apache.derby.client.net.NetConnection40', 'prepareStatement', 'select * from customer_stmt_wrapper;1003;1007;');
+INSERT INTO expected_sql_trace VALUES('org.apache.derby.client.net.NetConnection', 'prepareStatement', 'select * from customer_stmt_wrapper;1003;1007;');
 
 INSERT INTO expected_sql_trace VALUES('com.sun.gjc.spi.jdbc40.PreparedStatementWrapper40', 'getConnection', '');
 
-INSERT INTO expected_sql_trace VALUES('org.apache.derby.client.net.NetConnection40', 'prepareStatement', 'INSERT INTO null_entry_table VALUES(?);1003;1007;');
+INSERT INTO expected_sql_trace VALUES('org.apache.derby.client.net.NetConnection', 'prepareStatement', 'INSERT INTO null_entry_table VALUES(?);1003;1007;');
 
 INSERT INTO expected_sql_trace VALUES('com.sun.gjc.spi.jdbc40.PreparedStatementWrapper40', 'setString', '1;');
 

diff --git a/appserver/tests/test_groups/gating b/appserver/tests/test_groups/gating
@@ -26,3 +26,4 @@ persistence_all
 webservice_all
 naming_all
 batch_all
+connector_all