[System.Data.OracleClient] Replace config file lookup of ConnectionString with env var

This is easier with the new nunitlite config file handling.

9 files changed, 11 insertions, 32 deletions

diff --git a/mcs/class/System.Data.OracleClient/README.tests b/mcs/class/System.Data.OracleClient/README.tests
index 431634ee37c..a3ef05590f2 100644
--- a/mcs/class/System.Data.OracleClient/README.tests
+++ b/mcs/class/System.Data.OracleClient/README.tests
@@ -1,10 +1,8 @@
 Some tests located require a connection to Oracle database to execute.
-To configure a connection, copy System.Data.OracleClient_test_default.dll.config.example
-to System.Data.OracleClient_test_default.dll.config and fill in the ConnectionString with appropriate Data Source.
+To configure a connection, set the MONO_TESTS_ORACLE_CONNECTION_STRING environment variable to a connection string like the following:
 
-If no System.Data.OracleClient_test_default.dll.config is present, those tests will be ignored.
+Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=<host ip>)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=<sid>)));uid=<user name>;pwd=<password>;
 
-To test .Net 2.0 profile, copy System.Data.OracleClient_test_default.dll.config
-to System.Data.OracleClient_test_net_2_0.dll.config and launch tests with PROFILE=net_2_0 .
+If the environment variable is not present, those tests will be ignored.
 
 Scripts for populating the database are located in Test/System.Data.OracleClient.jvm (for their usage, consult Test/System.Data.OracleClient.jvm/readme.txt).
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient_test_default.dll.config.example b/mcs/class/System.Data.OracleClient/System.Data.OracleClient_test_default.dll.config.example
deleted file mode 100644
index 03703a71ff1..00000000000
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient_test_default.dll.config.example
+++ /dev/null
@@ -1,5 +0,0 @@
-<configuration>
-	<appSettings>
-		<add key="ConnectionString" value="Data Source=;User ID=GHTDB;Password=GHTDB;" />
-	</appSettings>
-</configuration>
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.Oci/OciDefineHandleTest.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.Oci/OciDefineHandleTest.cs
index 43e77ef1b22..02c12ee3c94 100644
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.Oci/OciDefineHandleTest.cs
+++ b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.Oci/OciDefineHandleTest.cs
@@ -51,7 +51,7 @@ namespace MonoTests.System.Data.OracleClient {
                 [TestFixtureSetUp]
                 public void FixtureSetUp ()
                 {
-                        connection_string = ConfigurationSettings.AppSettings.Get ("ConnectionString");
+                        connection_string = Environment.GetEnvironmentVariable ("MONO_TESTS_ORACLE_CONNECTION_STRING");
                         if(connection_string == null)
                                 Assert.Ignore ("Please consult README.tests.");
                 }
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/GHTDB.ORACLE.sql b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/GHTDB.ORACLE.sql
index a5feb72a00b..70421c51a8d 100755
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/GHTDB.ORACLE.sql
+++ b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/GHTDB.ORACLE.sql
@@ -47,6 +47,7 @@ CREATE USER "GHTDB"
     TEMPORARY TABLESPACE "TEMP" ;
 
 GRANT CONNECT, RESOURCE, CREATE TABLE  TO "GHTDB";
+ALTER USER GHTDB quota unlimited on USERS;
 
 CREATE OR REPLACE  PACKAGE "GHTDB"."GHTPKG"  AS
 	TYPE RCT1 IS REF CURSOR;
@@ -923,6 +924,7 @@ CREATE USER "GHTDB_EX"
     TEMPORARY TABLESPACE "TEMP" ;
 
 GRANT CONNECT, RESOURCE TO "GHTDB_EX";
+ALTER USER GHTDB_EX quota unlimited on USERS;
 
 CREATE OR REPLACE PACKAGE GHTDB_EX.GHTPKG
 AS
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/MonoTests.System.Data.Utils/ConnectedDataProvider.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/MonoTests.System.Data.Utils/ConnectedDataProvider.cs
index 3fd8b632a9f..ebe3de47ce5 100644
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/MonoTests.System.Data.Utils/ConnectedDataProvider.cs
+++ b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/MonoTests.System.Data.Utils/ConnectedDataProvider.cs
@@ -72,7 +72,7 @@ namespace MonoTests.System.Data.Utils {
 
 		public static string ConnectionString {
 			get {
-                                string connection_string = Sys.Configuration.ConfigurationSettings.AppSettings["ConnectionString"];
+                                string connection_string = Environment.GetEnvironmentVariable ("MONO_TESTS_ORACLE_CONNECTION_STRING");
                                 if(connection_string == null)
                                         NUnit.Framework.Assert.Ignore ("Please consult README.tests.");
                                 return connection_string;
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/IDBConnection_For_Oracle.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/IDBConnection_For_Oracle.cs
index 9c638e8252d..f544c351006 100644
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/IDBConnection_For_Oracle.cs
+++ b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/IDBConnection_For_Oracle.cs
@@ -39,14 +39,7 @@ namespace MonoTests.System.Data.OracleClient
 		[SetUp]
 		public void SetUp()
 		{
-			try
-			{
-				_ConnectionString = MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString;
-			}
-			catch(Exception ex)
-			{
-				EndCase(ex);
-			}
+			_ConnectionString = MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString;
 		}
 
 		[TearDown]
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/readme.txt b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/readme.txt
index a9164fb27a7..9c36355d57f 100755
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/readme.txt
+++ b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/readme.txt
@@ -1,15 +1,6 @@
 To run unit test the following should be prepared:
 
-1. Test\System.Data.OracleClient.J2EE.config should contain an ConnectionString setting, i.e.:
-
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-<appSettings>
-    <add key="ConnectionString" value="User ID=ghtdb;Password=ghtdb;Data Source=xp050" />
-  </appSettings>
-</configuration>
-
-2. A target db should be prepared with the relevant structure, following are the instruction for each supported database.
+A target db should be prepared with the relevant structure, following are the instruction for each supported database.
 
 in order to create the testing database, on ORACLE, run:
 Run the scripts with a user wich have administrator permissions. (by default user:system, password:mainsoft).
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient/OracleLobTest.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient/OracleLobTest.cs
index 6b758dea47f..0dfd37e6402 100644
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient/OracleLobTest.cs
+++ b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient/OracleLobTest.cs
@@ -48,7 +48,7 @@ namespace MonoTests.System.Data.OracleClient {
                 [TestFixtureSetUp]
                 public void FixtureSetUp ()
                 {
-                        connection_string = ConfigurationSettings.AppSettings.Get ("ConnectionString");
+                        connection_string = Environment.GetEnvironmentVariable ("MONO_TESTS_ORACLE_CONNECTION_STRING");
                         if(connection_string == null)
                                 Assert.Ignore ("Please consult README.tests.");
                 }
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient/OracleParameterTest.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient/OracleParameterTest.cs
index d625b6bf129..29c2e9022c7 100644
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient/OracleParameterTest.cs
+++ b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient/OracleParameterTest.cs
@@ -52,7 +52,7 @@ namespace MonoTests.System.Data.OracleClient
 		[TestFixtureSetUp]
 		public void FixtureSetUp ()
 		{
-			connection_string = ConfigurationSettings.AppSettings.Get ("ConnectionString");
+			connection_string = Environment.GetEnvironmentVariable ("MONO_TESTS_ORACLE_CONNECTION_STRING");
 		}
 
 		[SetUp]