Write test cases to stdout and split into separate Rake tasks

Allow users to redirect output wherever they like rather than hard
coding a file name to use.

Author: CDThomas

Rakefile

@@ -30,9 +30,14 @@ end
 
 require "./lib/cipherstash/client/ordered_string_test_generator"
 
-desc "Generate test cases for orderable strings to be used by other CipherStash clients"
-task :generate_ordered_string_test_cases do
-  CipherStash::Client::OrderedStringTestGenerator.new.run
+desc "Generate test cases for orderise_string to be used by other CipherStash clients"
+task :generate_orderise_string_test_cases do
+  CipherStash::Client::OrderedStringTestGenerator.new.generate_orderise_string_test_cases
+end
+
+desc "Generate test cases for string comparison to be used by other CipherStash clients"
+task :generate_string_comparison_test_cases do
+  CipherStash::Client::OrderedStringTestGenerator.new.generate_string_comparison_test_cases
 end
 
 require 'yard'

lib/cipherstash/client/ordered_string_test_generator.rb

@@ -27,53 +27,17 @@ class OrderedStringTestGenerator
       # beyond what actually gets indexed for ordering but doesn't bloat the test files too much.
       MAX_STRING_LENGTH = 200
 
-      def run
-        create_orderise_string_test_cases
-        create_string_comparison_test_cases
-      end
-
-      private
-
-      def random_ascii_string
-        (0..rand(MAX_STRING_LENGTH - 1)).map { rand(ASCII_CHAR_CODE_MAX + 1).chr }.join
-      end
-
-      def index
-        id = SecureRandom.uuid
-        settings = {
-          "meta" => {
-            "$indexId" => id,
-            "$indexName" => "titleSort",
-            "$prfKey" => SecureRandom.hex(16),
-            "$prpKey" => SecureRandom.hex(16),
-          },
-          "mapping" => {
-            "kind" => "range",
-            "field" => "title",
-            "fieldType"=>"string",
-          }
-        }
-        schema_versions = {:first=>0, :last=>0, :searchable=>true}
-
-        CipherStash::Index.generate(id, settings, schema_versions)
-      end
-
-      def write_cases_to_file(filename, test_cases)
-        File.write(filename, JSON.pretty_generate(test_cases))
-        puts "Created ./" + filename
-      end
-
-      def create_orderise_string_test_cases
+      def generate_orderise_string_test_cases
         orderise_string_cases = (0..(NUM_TEST_CASES - 1)).map do
           str = random_ascii_string
           output = index.__send__ :orderise_string, str
           {input: str, output: output}
         end
 
-        write_cases_to_file("orderise_string_test_cases.json", orderise_string_cases)
+        puts JSON.pretty_generate(orderise_string_cases)
       end
 
-      def create_string_comparison_test_cases
+      def generate_string_comparison_test_cases
         string_comparison_cases = (0..(NUM_TEST_CASES - 1)).map do
           str_a = random_ascii_string
           terms_a = index.__send__ :orderise_string, str_a
@@ -93,7 +57,33 @@ def create_string_comparison_test_cases
           {input: [str_a, str_b], output: output}
         end
 
-        write_cases_to_file("string_comparison_test_cases.json", string_comparison_cases)
+        puts JSON.pretty_generate(string_comparison_cases)
+      end
+
+      private
+
+      def random_ascii_string
+        (0..rand(MAX_STRING_LENGTH - 1)).map { rand(ASCII_CHAR_CODE_MAX + 1).chr }.join
+      end
+
+      def index
+        id = SecureRandom.uuid
+        settings = {
+          "meta" => {
+            "$indexId" => id,
+            "$indexName" => "titleSort",
+            "$prfKey" => SecureRandom.hex(16),
+            "$prpKey" => SecureRandom.hex(16),
+          },
+          "mapping" => {
+            "kind" => "range",
+            "field" => "title",
+            "fieldType"=>"string",
+          }
+        }
+        schema_versions = {:first=>0, :last=>0, :searchable=>true}
+
+        CipherStash::Index.generate(id, settings, schema_versions)
       end
     end
   end