From 60ed022332fc24968392217ac5ece9ce430f2ffd Mon Sep 17 00:00:00 2001
From: Pranjal Sahay <pranjal10@users.noreply.github.com>
Date: Fri, 4 Aug 2017 21:12:21 +0530
Subject: [PATCH] NoBug: Re-enable jdbc_all.SqlTracing. Sql Tracing Test 
 (#22169)

* Enabling jdbc tracingsql tests
* Adding connector_all test group
---
 appserver/tests/appserv-tests/devtests/jdbc/build.xml         | 3 +--
 .../devtests/jdbc/tracingsql/sql/create_pointbase.sql         | 4 ++--
 appserver/tests/test_groups/gating                            | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/build.xml
index 1f96ac85419..cad14a332f6 100644
--- 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
index 78e88c47f46..0397a7549ba 100755
--- 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
index a8977bbf533..f7fd3c22e93 100644
--- 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