3 files changed, 5 insertions, 28 deletions
diff --git a/config/database.yml.example b/config/database.yml.example
index 2f38d81ef..f72844a07 100644
--- a/config/database.yml.example
+++ b/config/database.yml.example
@@ -29,23 +29,16 @@ test:
 
 test_pgsql:
   adapter: postgresql
-  database: redmine
+  database: redmine_test
   host: localhost
   username: postgres
   password: "postgres"
 
-test_oracle:
-  adapter: oci
-  host: 192.168.0.14
-  username: rails_test
-  password: "rails"
-  
-test_sqlserver:
-  adapter: sqlserver
-  host: localhost,1157
-  database: redmine_test
+test_sqlite3:
+  adapter: sqlite3
+  dbfile: db/test.db
   
 demo:
   adapter: sqlite3
-  dbfile: db/redmine_demo.db
+  dbfile: db/demo.db
   
diff --git a/config/environments/test_oracle.rb b/config/environments/test_oracle.rb
deleted file mode 100644
index 0eb1cd6c1..000000000
--- a/config/environments/test_oracle.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# Settings specified here will take precedence over those in config/environment.rb
-
-# The test environment is used exclusively to run your application's
-# test suite.  You never need to work with it otherwise.  Remember that
-# your test database is "scratch space" for the test suite and is wiped
-# and recreated between test runs.  Don't rely on the data there!
-config.cache_classes = false
-
-# Log error messages when you accidentally call methods on nil.
-config.whiny_nils    = true
-
-# Show full error reports and disable caching
-config.action_controller.consider_all_requests_local = true
-config.action_controller.perform_caching             = false
-
-config.action_mailer.delivery_method = :test
-\ No newline at end of file
diff --git a/config/environments/test_sqlserver.rb b/config/environments/test_sqlite3.rb
index 35bb19bee..35bb19bee 100644
--- a/config/environments/test_sqlserver.rb
+++ b/config/environments/test_sqlite3.rb