cascading.jruby 0.0.8 → 0.0.9

data/test/test_flow.rb

@@ -31,40 +31,30 @@ class TC_Flow < Test::Unit::TestCase
   end
 
   def test_ambiguous_assembly_names
-    a1, a2, x = nil, nil, nil
-    flow = flow 'flow' do
-      source 'a', tap('test/data/data1.txt')
+    ex = assert_raise AmbiguousNodeNameException do
+      a1, a2, x = nil, nil, nil
+      flow = flow 'flow' do
+        source 'a', tap('test/data/data1.txt')
 
-      a1 = assembly 'a' do
-        pass
-      end
+        a1 = assembly 'a' do
+          pass
+        end
 
-      a2 = assembly 'a' do
-        pass
-      end
+        a2 = assembly 'a' do
+          pass
+        end
 
-      x = assembly 'x' do
-        union 'a'
+        x = assembly 'x' do
+          union 'a'
+        end
       end
     end
-
-    # FIXME: 'a' assemblies and qualified names collide
-    assert_equal 2, flow.children.size
-    assert_equal 'flow.a', a1.qualified_name
-    assert_equal 'flow.a', a2.qualified_name
-
-    # Ordered child names do not collide
-    assert_equal ['a', 'a', 'x'], flow.child_names
-
-    # FIXME: assembly defined last wins
-    assert_equal a2, flow.find_child('a')
-
-    assert_equal 1, x.tail_pipe.heads.size
-    assert_equal a2.head_pipe, x.tail_pipe.heads.first
+    assert_equal "Attempted to add 'flow.a', but node named 'a' already exists", ex.message
   end
 
   def test_ambiguous_branch_names
-    b1, b2, x = nil, nil, nil
+    # You _can_ define ambiguously named branches
+    b1, b2 = nil, nil
     flow = flow 'flow' do
       source 'a', tap('test/data/data1.txt')
       source 'b', tap('test/data/data1.txt')
@@ -79,21 +69,48 @@ class TC_Flow < Test::Unit::TestCase
         pass
       end
 
-      x = assembly 'x' do
-        union 'b'
-      end
+      sink 'b', tap('output/test_ambiguous_branch_names')
     end
 
-    # FIXME: 'b' assemblies collide even though qualified names don't
-    assert_equal 3, flow.children.size
+    assert_equal 2, flow.children.size
     assert_equal 'flow.a.b', b1.qualified_name
     assert_equal 'flow.b', b2.qualified_name
-    assert_equal ['a', 'b', 'x'], flow.child_names
+    assert_equal ['a', 'b'], flow.child_names
+
+    # You _cannot_ look them up using find_child
+    ex = assert_raise AmbiguousNodeNameException do
+      flow.find_child('b')
+    end
+    assert_equal "Ambiguous lookup of child by name 'b'; found 'flow.b', 'flow.a.b'", ex.message
+
+    # Which means you cannot sink them
+    ex = assert_raise AmbiguousNodeNameException do
+      flow.complete # NOTE: We must complete for sink to raise
+    end
+    assert_equal "Ambiguous lookup of child by name 'b'; found 'flow.b', 'flow.a.b'", ex.message
+
+    # And you cannot use them for join or union
+    ex = assert_raise AmbiguousNodeNameException do
+      b1, b2, x = nil, nil, nil
+      flow = flow 'flow' do
+        source 'a', tap('test/data/data1.txt')
+        source 'b', tap('test/data/data1.txt')
+
+        assembly 'a' do
+          b1 = branch 'b' do
+            pass
+          end
+        end
 
-    # FIXME: branch hit by depth-first serach first
-    assert_equal b1, flow.find_child('b')
+        b2 = assembly 'b' do
+          pass
+        end
 
-    assert_equal 1, x.tail_pipe.heads.size
-    assert_equal b1.parent.head_pipe, x.tail_pipe.heads.first
+        x = assembly 'x' do
+          union 'b'
+        end
+      end
+    end
+    assert_equal "Ambiguous lookup of child by name 'b'; found 'flow.b', 'flow.a.b'", ex.message
   end
 end

data/test/test_local_execution.rb

@@ -3,7 +3,7 @@ require 'cascading'
 
 class TC_LocalExecution < Test::Unit::TestCase
   def test_smoke_test_multi_source_tap
-    cascade 'splitter' do
+    cascade 'splitter', :mode => :local do
       flow 'splitter' do
         tap1 = tap 'test/data/data1.txt'
         tap2 = tap 'test/data/data2.txt'
@@ -19,7 +19,7 @@ class TC_LocalExecution < Test::Unit::TestCase
   end
 
   def test_smoke_test_sequence_file_scheme
-    cascade 'smoke' do
+    cascade 'smoke', :mode => :local do
       flow 'smoke' do
         source 'input', tap('test/data/data1.txt')
         assembly 'input' do
@@ -32,7 +32,7 @@ class TC_LocalExecution < Test::Unit::TestCase
   end
 
   def test_splitter
-    flow = flow 'splitter' do
+    flow = flow 'splitter', :mode => :local do
       source 'copy', tap('test/data/data1.txt')
 
       assembly 'copy' do
@@ -47,7 +47,7 @@ class TC_LocalExecution < Test::Unit::TestCase
   end
 
   def test_smoke_test_multi_source_tap
-    cascade 'multi_source_tap' do
+    cascade 'multi_source_tap', :mode => :local do
       flow 'multi_source_tap' do
         tap1 = tap 'test/data/data1.txt'
         tap2 = tap 'test/data/data2.txt'
@@ -64,7 +64,7 @@ class TC_LocalExecution < Test::Unit::TestCase
 
   def test_join1
     join_grouping_fields, join_values_fields = nil, nil
-    cascade 'splitter' do
+    cascade 'splitter', :mode => :local do
       flow 'splitter' do
         source 'data1', tap('test/data/data1.txt')
         source 'data2', tap('test/data/data2.txt')
@@ -101,7 +101,7 @@ class TC_LocalExecution < Test::Unit::TestCase
 
   def test_join2
     join_grouping_fields, join_values_fields = nil, nil
-    flow = flow 'splitter' do
+    flow = flow 'splitter', :mode => :local do
       source 'data1', tap('test/data/data1.txt')
       source 'data2', tap('test/data/data2.txt')
 
@@ -129,7 +129,7 @@ class TC_LocalExecution < Test::Unit::TestCase
 
   def test_union
     union_grouping_fields, union_values_fields = nil, nil
-    cascade 'union' do
+    cascade 'union', :mode => :local do
       flow 'union' do
         source 'data1', tap('test/data/data1.txt')
         source 'data2', tap('test/data/data2.txt')

data/test/test_operations.rb

@@ -13,4 +13,65 @@ class TC_Operations < Test::Unit::TestCase
     first = first_function 'first_field', :ignore => [Java::CascadingTuple::Tuple.new(-1)].to_java(Java::CascadingTuple::Tuple)
     assert_not_nil first
   end
+
+  def test_coerce_to_java_int
+    result = coerce_to_java(1)
+
+    assert_equal Java::JavaLang::Long, result.class
+    assert_equal 1.to_java(java.lang.Long).java_class, result.java_class
+    assert_equal 1.to_java(java.lang.Long), result
+  end
+
+  def test_coerce_to_java_long
+    result = coerce_to_java(32503701600000)
+
+    assert_equal Java::JavaLang::Long, result.class
+    assert_equal 32503701600000.to_java(java.lang.Long).java_class, result.java_class
+    assert_equal 32503701600000.to_java(java.lang.Long), result
+  end
+
+  def test_coerce_to_java_string
+    result = coerce_to_java('a')
+
+    assert_equal Java::JavaLang::String, result.class
+    assert_equal 'a'.to_java(java.lang.String).java_class, result.java_class
+    assert_equal 'a'.to_java(java.lang.String), result
+  end
+
+  def test_coerce_to_java_float
+    result = coerce_to_java(5.4)
+
+    assert_equal Java::JavaLang::Double, result.class
+    assert_equal (5.4).to_java(java.lang.Double).java_class, result.java_class
+    assert_equal (5.4).to_java(java.lang.Double), result
+  end
+
+  def test_coerce_to_java_double
+    result = coerce_to_java(10e100)
+
+    assert_equal Java::JavaLang::Double, result.class
+    assert_equal (10e100).to_java(java.lang.Double).java_class, result.java_class
+    assert_equal (10e100).to_java(java.lang.Double), result
+  end
+
+  def test_coerce_to_java_nil
+    result = coerce_to_java(nil)
+
+    assert_equal NilClass, result.class
+    assert_nil result
+  end
+
+  def test_coerce_to_java_other
+    result = coerce_to_java([1,2,3])
+
+    assert_equal Java::JavaLang::String, result.class
+    assert_equal ''.to_java(java.lang.String).java_class, result.java_class
+    assert_equal '123'.to_java(java.lang.String), result
+  end
+
+  def test_to_java_comparable_array
+    results = to_java_comparable_array([1, 'string', 1.5, nil])
+
+    assert_equal results.map{|i| i.class}, [Fixnum, String, Float, NilClass]
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: cascading.jruby
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
   - Matt Walker
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-15 00:00:00 Z
+date: 2012-08-05 00:00:00 Z
 dependencies: []
 
 description: cascading.jruby is a small DSL above Cascading, written in JRuby
@@ -56,9 +56,11 @@ files:
   - lib/cascading/expr_stub.rb
   - lib/cascading/ext/array.rb
   - lib/cascading/flow.rb
+  - lib/cascading/mode.rb
   - lib/cascading/operations.rb
   - lib/cascading/scope.rb
   - lib/cascading/sub_assembly.rb
+  - lib/cascading/tap.rb
   - samples/branch.rb
   - samples/copy.rb
   - samples/data/data2.txt