Improved tests start time [skip ci]

Andrew Kane
1 parent a3693853
Showing 8 changed files with 37 additions and 5 deletions Show diff stats
test/conversions_test.rb
test/geo_shape_test.rb
test/index_test.rb
test/match_test.rb
test/multi_indices_test.rb
test/query_test.rb
test/search_synonyms_test.rb
test/support/helpers.rb
 require_relative "test_helper"
  
 class ConversionsTest < Minitest::Test
+  def setup
+    super
+    setup_speaker
+  end
+
   def test_conversions
     store [
       {name: "Tomato A", conversions: {"tomato" => 1}},
@@ -2,7 +2,7 @@ require_relative &quot;test_helper&quot;
  
 class GeoShapeTest < Minitest::Test
   def setup
-    Region.destroy_all
+    setup_region
     store [
       {
         name: "Region A",
@@ -3,7 +3,7 @@ require_relative &quot;test_helper&quot;
 class IndexTest < Minitest::Test
   def setup
     super
-    Region.destroy_all
+    setup_region
   end
  
   def test_tokens
 require_relative "test_helper"
  
 class MatchTest < Minitest::Test
+  def setup
+    super
+    setup_speaker
+  end
+
   # exact
  
   def test_match
 require_relative "test_helper"
  
 class MultiIndicesTest < Minitest::Test
+  def setup
+    super
+    setup_speaker
+  end
+
   def test_basic
     store_names ["Product A"]
     store_names ["Product B"], Speaker
 require_relative "test_helper"
  
 class QueryTest < Minitest::Test
+  def setup
+    super
+    setup_speaker
+  end
+
   def test_basic
     store_names ["Milk", "Apple"]
     query = Product.search("milk", body: {query: {match_all: {}}})
 require_relative "test_helper"
  
 class SearchSynonymsTest < Minitest::Test
+  def setup
+    super
+    setup_speaker
+  end
+
   def test_bleach
     store_names ["Clorox Bleach", "Kroger Bleach"]
     assert_search "clorox", ["Clorox Bleach", "Kroger Bleach"]
@@ -11,18 +11,25 @@ class Minitest::Test
  
       Store.reindex
       Animal.reindex
-      Speaker.reindex
-      Region.reindex
     end
  
     Product.destroy_all
     Store.destroy_all
     Animal.destroy_all
-    Speaker.destroy_all
   end
  
   protected
  
+  def setup_region
+    $setup_region ||= (Region.reindex || true)
+    Region.destroy_all
+  end
+
+  def setup_speaker
+    $setup_speaker ||= (Speaker.reindex || true)
+    Speaker.destroy_all
+  end
+
   def store(documents, model = default_model, reindex: true)
     if reindex
       documents.shuffle.each do |document|
1	1	require_relative "test_helper"
2	2
3	3	class ConversionsTest < Minitest::Test
	4	+ def setup
	5	+ super
	6	+ setup_speaker
	7	+ end
	8	+
4	9	def test_conversions
5	10	store [
6	11	{name: "Tomato A", conversions: {"tomato" => 1}},
...	...
...	...	@@ -2,7 +2,7 @@ require_relative "test_helper"
2	2
3	3	class GeoShapeTest < Minitest::Test
4	4	def setup
5		- Region.destroy_all
	5	+ setup_region
6	6	store [
7	7	{
8	8	name: "Region A",
...	...
...	...	@@ -3,7 +3,7 @@ require_relative "test_helper"
3	3	class IndexTest < Minitest::Test
4	4	def setup
5	5	super
6		- Region.destroy_all
	6	+ setup_region
7	7	end
8	8
9	9	def test_tokens
...	...
1	1	require_relative "test_helper"
2	2
3	3	class MatchTest < Minitest::Test
	4	+ def setup
	5	+ super
	6	+ setup_speaker
	7	+ end
	8	+
4	9	# exact
5	10
6	11	def test_match
...	...
1	1	require_relative "test_helper"
2	2
3	3	class MultiIndicesTest < Minitest::Test
	4	+ def setup
	5	+ super
	6	+ setup_speaker
	7	+ end
	8	+
4	9	def test_basic
5	10	store_names ["Product A"]
6	11	store_names ["Product B"], Speaker
...	...
1	1	require_relative "test_helper"
2	2
3	3	class QueryTest < Minitest::Test
	4	+ def setup
	5	+ super
	6	+ setup_speaker
	7	+ end
	8	+
4	9	def test_basic
5	10	store_names ["Milk", "Apple"]
6	11	query = Product.search("milk", body: {query: {match_all: {}}})
...	...
1	1	require_relative "test_helper"
2	2
3	3	class SearchSynonymsTest < Minitest::Test
	4	+ def setup
	5	+ super
	6	+ setup_speaker
	7	+ end
	8	+
4	9	def test_bleach
5	10	store_names ["Clorox Bleach", "Kroger Bleach"]
6	11	assert_search "clorox", ["Clorox Bleach", "Kroger Bleach"]
...	...
...	...	@@ -11,18 +11,25 @@ class Minitest::Test
11	11
12	12	Store.reindex
13	13	Animal.reindex
14		- Speaker.reindex
15		- Region.reindex
16	14	end
17	15
18	16	Product.destroy_all
19	17	Store.destroy_all
20	18	Animal.destroy_all
21		- Speaker.destroy_all
22	19	end
23	20
24	21	protected
25	22
	23	+ def setup_region
	24	+ $setup_region \|\|= (Region.reindex \|\| true)
	25	+ Region.destroy_all
	26	+ end
	27	+
	28	+ def setup_speaker
	29	+ $setup_speaker \|\|= (Speaker.reindex \|\| true)
	30	+ Speaker.destroy_all
	31	+ end
	32	+
26	33	def store(documents, model = default_model, reindex: true)
27	34	if reindex
28	35	documents.shuffle.each do \|document\|
...	...