sparkql 1.2.5 → 1.3.0

data/test/unit/evaluator_test.rb

@@ -46,7 +46,7 @@ class EvaluatorTest < Test::Unit::TestCase
       assert !sample(filter), "Filter: #{filter}"
     end
   end
-  
+
   # One failing Not expression in a set should always fail. Here we ensure every
   # permutation of one failing
   def test_nots_stay_bad
@@ -56,7 +56,7 @@ class EvaluatorTest < Test::Unit::TestCase
         expressions << "Test Eq #{i == j}"
       end
       # Add the unary not to the front!
-      filter = "Not " + expressions.join(" Not ")
+      filter = "Not #{expressions.join(' Not ')}"
       assert !sample(filter), "Filter: #{filter}"
     end
   end
@@ -97,24 +97,23 @@ class EvaluatorTest < Test::Unit::TestCase
     assert !sample("Test Eq true Not (Not Test Eq false)")
     assert sample("Not (Not Test Eq true)")
     assert sample("Not (Not(Not Test Eq true))")
-    assert !sample("Test Eq false And Test Eq true Not Test Eq false") 
+    assert !sample("Test Eq false And Test Eq true Not Test Eq false")
   end
-  
+
   def test_examples
     # This one is based on a real life example that had problems.
     #
-    # CurrentPrice Bt 130000.00,180000.00 And PropertySubType Eq 'Single Family Residence' And 
-    # SchoolDistrict Eq 'Byron Center','Grandville','Jenison' And MlsStatus Eq 'Active' And 
-    # BathsTotal Bt 1.50,9999.00 And BedsTotal Bt 3,99 And PropertyType Eq 'A' 
-    # Not "Garage"."Garage2" Eq 'No' And "Pool"."OutdoorAbove" Eq true 
+    # CurrentPrice Bt 130000.00,180000.00 And PropertySubType Eq 'Single Family Residence' And
+    # SchoolDistrict Eq 'Byron Center','Grandville','Jenison' And MlsStatus Eq 'Active' And
+    # BathsTotal Bt 1.50,9999.00 And BedsTotal Bt 3,99 And PropertyType Eq 'A'
+    # Not "Garage"."Garage2" Eq 'No' And "Pool"."OutdoorAbove" Eq true
     # And "Pool"."OutdoorInground" Eq true Not "Substructure"."Michigan Basement" Eq true
 
-    assert !sample("Test Eq false And Test Eq true And " + 
-      "Test Eq false And Test Eq true And " + 
-      "Test Eq true And Test Eq true And Test Eq true " + 
-      "Not Test Eq false And Test Eq false " + 
-      "And Test Eq false Not Test Eq false"
-    )
+    assert !sample("Test Eq false And Test Eq true And " \
+      "Test Eq false And Test Eq true And " \
+      "Test Eq true And Test Eq true And Test Eq true " \
+      "Not Test Eq false And Test Eq false " \
+      "And Test Eq false Not Test Eq false")
   end
 
   def test_optimizations
@@ -133,10 +132,10 @@ class EvaluatorTest < Test::Unit::TestCase
     assert !sample("MlsStatus Eq false And PropertyType Eq true And (City Eq true Or City Eq false)")
   end
 
-  def sample filter
+  def sample(filter)
     @parser = Parser.new
     @expressions = @parser.parse(filter)
-    @evaluator = Evaluator.new(BooleanOrBustExpressionResolver.new())
+    @evaluator = Evaluator.new(BooleanOrBustExpressionResolver.new)
     @evaluator.evaluate(@expressions)
   end
 end

data/test/unit/expression_state_test.rb

@@ -7,17 +7,17 @@ class ExpressionStateTest < Test::Unit::TestCase
     @subject = ExpressionState.new
     @parser = Parser.new
   end
-  
+
   def test_needs_join
     filter = '"General Property Description"."Taxes" Lt 500.0'
     process(filter)
     assert @subject.needs_join?
   end
-  
+
   def test_or
     filter = '"General Property Description"."Taxes" Lt 500.0 Or "General Property Description"."Taxes" Gt 400.0'
     process(filter)
-    assert !@subject.needs_join?, "#{@subject.inspect} Expressions:#{ @expressions.inspect}"
+    assert !@subject.needs_join?, "#{@subject.inspect} Expressions:#{@expressions.inspect}"
   end
 
   def test_not
@@ -33,31 +33,31 @@ class ExpressionStateTest < Test::Unit::TestCase
   end
 
   def test_and_or
-    filter = '"General Property Description"."Taxes" Lt 500.0 And "General Property Description"."Taxes2" ' + 
-      'Eq 1.0 Or "General Property Description"."Taxes" Gt 400.0'
+    filter = '"General Property Description"."Taxes" Lt 500.0 And "General Property Description"."Taxes2" ' \
+             'Eq 1.0 Or "General Property Description"."Taxes" Gt 400.0'
     process(filter)
     assert !@subject.needs_join?
   end
 
   def test_or_and
-    filter = '"General Property Description"."Taxes" Lt 500.0 Or "General Property Description"."Taxes" ' +
-      'Gt 400.0 And "General Property Description"."Taxes2" Eq 1.0'
+    filter = '"General Property Description"."Taxes" Lt 500.0 Or "General Property Description"."Taxes" ' \
+             'Gt 400.0 And "General Property Description"."Taxes2" Eq 1.0'
     process(filter)
     assert @subject.needs_join?
   end
-  
+
   def test_or_with_standard_field
     filter = 'Test Eq 0.0 Or "General Property Description"."Taxes" Lt 500.0'
     process(filter)
     assert @subject.needs_join?
   end
-  
+
   # Nesting
   def test_nested_or
     parse '"General Property Description"."Taxes" Lt 5.0 Or ("General Property Description"."Taxes" Gt 4.0)'
     @expressions.each do |ex|
       @subject.push(ex)
-      assert @subject.needs_join?, "#{@subject.inspect} Expression:#{ ex.inspect}"
+      assert @subject.needs_join?, "#{@subject.inspect} Expression:#{ex.inspect}"
     end
   end
 
@@ -70,20 +70,20 @@ class ExpressionStateTest < Test::Unit::TestCase
     @subject.push(@expressions[2])
     assert !@subject.needs_join?
   end
-  
+
   # Nesting
   def test_nested_and
     parse '"Tax"."Taxes" Lt 5.0 Or ("Tax"."Taxes" Gt 4.0 And "Tax"."Taxes" Gt 2.0)'
     @expressions.each do |ex|
       @subject.push(ex)
-      assert @subject.needs_join?, "#{@subject.inspect} Expression:#{ ex.inspect}"
+      assert @subject.needs_join?, "#{@subject.inspect} Expression:#{ex.inspect}"
     end
   end
-  
+
   def parse(filter)
     @expressions = @parser.parse(filter)
   end
-  
+
   def process(filter)
     @expressions = @parser.parse(filter)
     @expressions.each do |ex|
@@ -91,5 +91,4 @@ class ExpressionStateTest < Test::Unit::TestCase
     end
     @expressions
   end
-    
 end