From e6e9ac3b04a2e0ad8c5012eb218cb34cdb9196d5 Mon Sep 17 00:00:00 2001
From: Karl Southern <karl@theangryangel.co.uk>
Date: Tue, 3 May 2016 15:55:36 +0100
Subject: [PATCH] Addressing tests.

---
 spec/outputs/jdbc_derby_spec.rb  | 30 ++++++++++++++++++++++++++++++
 spec/outputs/jdbc_mysql_spec.rb  |  1 +
 spec/outputs/jdbc_spec.rb        | 29 +----------------------------
 spec/outputs/jdbc_sqlite_spec.rb |  1 +
 4 files changed, 33 insertions(+), 28 deletions(-)
 create mode 100644 spec/outputs/jdbc_derby_spec.rb

diff --git a/spec/outputs/jdbc_derby_spec.rb b/spec/outputs/jdbc_derby_spec.rb
new file mode 100644
index 0000000..3f28a5e
--- /dev/null
+++ b/spec/outputs/jdbc_derby_spec.rb
@@ -0,0 +1,30 @@
+require_relative '../jdbc_spec_helper'
+
+describe "logstash-output-jdbc: derby", if: ENV['JDBC_DERBY_JAR'] do
+
+  include_context "rspec setup"
+  include_context "when initializing"
+  include_context "when outputting messages"
+
+  let(:jdbc_jar_env) do
+    'JDBC_DERBY_JAR'
+  end
+
+  let(:jdbc_drop_table) do
+    nil
+  end
+
+  let(:jdbc_create_table) do
+    "CREATE table #{jdbc_test_table} (created_at timestamp, message varchar(512))"
+  end
+
+  let(:jdbc_settings) do
+    { 
+      "driver_class" => "org.apache.derby.jdbc.EmbeddedDriver",
+      "connection_string" => "jdbc:derby:memory:testdb;create=true",
+      "driver_jar_path" => ENV[jdbc_jar_env],
+      "statement" => [ "insert into logstash_output_jdbc_test (created_at, message) values(?, ?)", "@timestamp", "message" ]
+    }
+  end
+
+end
diff --git a/spec/outputs/jdbc_mysql_spec.rb b/spec/outputs/jdbc_mysql_spec.rb
index 1428437..1e51f2c 100644
--- a/spec/outputs/jdbc_mysql_spec.rb
+++ b/spec/outputs/jdbc_mysql_spec.rb
@@ -2,6 +2,7 @@ require_relative "../jdbc_spec_helper"
 
 describe "logstash-output-jdbc: mysql", if: ENV['JDBC_MYSQL_JAR'] do
 
+  include_context "rspec setup"
   include_context "when initializing"
   include_context "when outputting messages"
 
diff --git a/spec/outputs/jdbc_spec.rb b/spec/outputs/jdbc_spec.rb
index 8dbc2e4..13e8921 100644
--- a/spec/outputs/jdbc_spec.rb
+++ b/spec/outputs/jdbc_spec.rb
@@ -1,32 +1,6 @@
-require_relative '../jdbc_spec_helper'
+require_relative "../jdbc_spec_helper"
 
 describe LogStash::Outputs::Jdbc do
-
-  include_context "rspec setup"
-  include_context "when initializing"
-  include_context "when outputting messages"
-
-  let(:jdbc_jar_env) do
-    'JDBC_DERBY_JAR'
-  end
-
-  let(:jdbc_drop_table) do
-    nil
-  end
-
-  let(:jdbc_create_table) do
-    "CREATE table #{jdbc_test_table} (created_at timestamp, message varchar(512))"
-  end
-
-  let(:jdbc_settings) do
-    { 
-      "driver_class" => "org.apache.derby.jdbc.EmbeddedDriver",
-      "connection_string" => "jdbc:derby:memory:testdb;create=true",
-      "driver_jar_path" => ENV[jdbc_jar_env],
-      "statement" => [ "insert into logstash_output_jdbc_test (created_at, message) values(?, ?)", "@timestamp", "message" ]
-    }
-  end
-
   context 'when initializing' do
 
     it 'shouldn\'t register without a config' do
@@ -36,5 +10,4 @@ describe LogStash::Outputs::Jdbc do
     end
 
   end
-
 end
diff --git a/spec/outputs/jdbc_sqlite_spec.rb b/spec/outputs/jdbc_sqlite_spec.rb
index 746ac08..eab0fb6 100644
--- a/spec/outputs/jdbc_sqlite_spec.rb
+++ b/spec/outputs/jdbc_sqlite_spec.rb
@@ -8,6 +8,7 @@ describe "logstash-output-jdbc: sqlite", if: ENV['JDBC_SQLITE_JAR'] do
     File.delete(JDBC_SQLITE_FILE) if File.exists? JDBC_SQLITE_FILE
   end
 
+  include_context "rspec setup"  
   include_context "when initializing"
   include_context "when outputting messages"