mock_java 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f127d38cf74c7e09293aae9cb76377d1fa67fb8c
-  data.tar.gz: 439e1eb3d925050943ba63d3699dcbd2216745d0
+  metadata.gz: f4136938c37e7ecdc65c9ec81da3f444c4865218
+  data.tar.gz: 5228d377b1022f060c7c04d0f586fa85d7a08d7b
 SHA512:
-  metadata.gz: bb35e74b964829b6bdb4f073a87d9a627f01784543bf6fb02a508f0d34606495aa4cad257cb30f4b19d63badf0673ce22a71dd8e4f3d58b743cca7a41bf0f4fc
-  data.tar.gz: 2437ca360007014082da60758b4bf5382b755a1fdd94ad764a6c345f6ccaa706d046b867a8fe35f126bfc002476563cf4866a408ccb03a63d0a8ce006fd921d7
+  metadata.gz: 9f6eea070f5b55252170a14299eb7c246f35f34bb41a370a6fb9132310501a3a5c319305bcf4c854e58dda0427012d1af0e79d0ff97fea00221f7c69a6ff5549
+  data.tar.gz: 6583a97842600b5bc6795ce981dc3acb0580167b3929837c7c8313693aa790b5a27795cda50a9d5598de1e07d6711ae7528281d9bdf8c92a7e3c232876129ec7

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+## 0.2.0
+  * Improve the mock for java classes with inheritance
+
+## 0.1.0
+  * First release.

data/Rakefile

@@ -9,7 +9,10 @@ end
 desc 'Compile the java classes'
 task :java_compiler do
   puts "Compiling java classes"
-  system('javac spec/java_classes/**/*.java')
+  Dir.glob(File.join('spec', 'java_classes','**','*.java')).each do |file|
+    file.gsub!('spec/java_classes/', '')
+    system("cd spec/java_classes && javac #{file}")
+  end
 end
 
 desc 'Run the test on classes'

data/lib/mock_java/mock_class.rb

@@ -37,8 +37,7 @@ module MockJava
     end
 
     def add_ruby_methods_to(child_class)
-      java_methods = @clazz.java_class.declared_instance_methods
-      java_methods.collect! { |x| [x.name, x.generic_parameter_types.size]}
+      java_methods = load_java_methods @clazz.java_class
 
       ruby_methods = java_methods.inject("") do |s, m|
         method_name  = m[0]
@@ -50,7 +49,7 @@ module MockJava
 
     def create_ruby_method(child_class, method_name, total_params = 0)
       if total_params == 0
-        child_class.class_eval "\n def #{method_name}\n super \nend"
+        child_class.class_eval "def #{method_name}; super; end"
       else
         joined_params = ''
         total_params.times do |t|
@@ -58,10 +57,27 @@ module MockJava
         end
         joined_params.gsub!(/(.*),$/, '\1')
 
-        child_class.class_eval "\n def #{method_name}(#{joined_params}) \n super #{joined_params} \n end"
+        child_class.class_eval "def #{method_name}(#{joined_params}); super #{joined_params}; end"
       end
     end
 
+    def load_java_methods(java_class, child_java_methods = [])
+      java_methods = child_java_methods
+
+      if java_class.name != "java.lang.Object"
+        java_methods = java_class.declared_instance_methods
+        java_methods.collect! { |x| [x.name, x.generic_parameter_types.size]}
+
+        # add the methods from child and parent, remove duplicates
+        java_methods = java_methods + child_java_methods
+        java_methods.uniq!
+
+        java_methods = load_java_methods java_class.superclass, java_methods
+      end
+
+      java_methods
+    end
+
   end
 
 end

data/lib/mock_java/version.rb

@@ -1,3 +1,3 @@
 module MockJava
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/java_classes/test/inheritance/A.java

@@ -0,0 +1,23 @@
+package test.inheritance;
+
+public class A {
+
+	private StringBuilder output = new StringBuilder();
+
+	public void methodA() {
+		addToOutput("Method A");
+	}
+
+	public void runMethod() {
+		hashCode();
+		methodA();
+	}
+
+	protected void addToOutput(String description) {
+		output.append(description).append(" ");
+	}
+
+	public String output() {
+		return output.toString();
+	}
+}

data/spec/java_classes/test/inheritance/B.java

@@ -0,0 +1,13 @@
+package test.inheritance;
+
+public class B extends A {
+
+	public void methodB() {
+		addToOutput("Method B");
+	}
+
+	public void runMethod() {
+		methodA();
+		methodB();
+	}
+}

data/spec/java_classes/test/inheritance/C.java

@@ -0,0 +1,14 @@
+package test.inheritance;
+
+public class C extends B {
+
+  public void methodC() {
+		addToOutput("Method C");
+  }
+
+  public void runMethod() {
+	  methodA();
+	  methodB();
+	  methodC();
+  }
+}

data/spec/mock_java/inherited_method_spec.rb

@@ -0,0 +1,88 @@
+require 'spec_helper'
+
+java_import 'test.inheritance.A'
+java_import 'test.inheritance.B'
+java_import 'test.inheritance.C'
+
+describe 'mocking methods on a class with inheritance' do
+  context 'mocking the parent class' do
+    it 'should mock the method' do
+      a = mock_java A
+
+      expect(a).to receive(:methodA).and_return 'mock A'
+      expect(a.methodA).to eq('mock A')
+    end
+  end
+
+  context 'mocking the child class' do
+    it 'should mock the method' do
+      b = mock_java B
+
+      expect(b).to receive(:methodB).and_return 'mock B'
+      expect(b.methodB).to eq('mock B')
+    end
+  end
+
+  context 'mocking the grandchild class' do
+    it 'should mock the method' do
+      c = mock_java C
+
+      expect(c).to receive(:methodC).and_return 'mock C'
+      expect(c.methodC).to eq('mock C')
+    end
+  end
+end
+
+describe 'expecting parents methods to be called on child classes' do
+  context 'for parent class' do
+    let(:a) { mock_java A }
+
+    it 'should not see that method from parent Object class was called' do
+      expect(a).to_not receive(:hashCode)
+    end
+
+    it 'should see that his method was called' do
+      expect(a).to receive(:methodA).and_call_original
+
+      a.runMethod
+      expect(a.output).to eq("Method A ")
+    end
+  end
+
+  context 'for child class' do
+    let(:b) { mock_java B }
+
+    it 'should see that parent method was called' do
+      expect(b).to receive(:methodA).once
+      b.runMethod
+    end
+
+    it 'should see that his method was called' do
+      expect(b).to receive(:methodB).and_call_original
+
+      b.runMethod
+      expect(b.output).to eq("Method A Method B ")
+    end
+  end
+
+  context 'for grandchild class' do
+    let(:c) { mock_java C }
+
+    it 'should see that grandparent method was called' do
+      expect(c).to receive(:methodA).once
+      c.runMethod
+    end
+
+    it 'should see that parent method was called' do
+      expect(c).to receive(:methodB).once
+      c.runMethod
+    end
+
+    it 'should see that his method was called' do
+      expect(c).to receive(:methodC).and_call_original
+
+      c.runMethod
+      expect(c.output).to eq("Method A Method B Method C ")
+    end
+  end
+end

data/spec/mock_java/objects_already_created_spec.rb

@@ -4,14 +4,11 @@ java_import 'test.PublicMethod'
 
 describe 'mocking objects' do
 
-  before(:each) do
-    obj = PublicMethod.new
-    @mock = mock_java obj
-  end
-
   it 'should mock the object' do
-      expect(@mock).to receive(:getPublicMethod).and_return 'mock'
-      expect(@mock.getPublicMethod).to eq('mock')
+    mock = mock_java PublicMethod.new
+
+    expect(mock).to receive(:getPublicMethod).and_return 'mock'
+    expect(mock.getPublicMethod).to eq('mock')
   end
 
 end

data/spec/mock_java/private_method_spec.rb

@@ -4,29 +4,27 @@ java_import 'test.PrivateMethod'
 
 describe 'classes with private methods' do
 
-  before(:each) do
-    @mock = mock_java PrivateMethod
-  end
+  let(:mock) { mock_java PrivateMethod.new }
 
   context 'when is changing behaviour' do
     it 'should mock methods with no parameters' do
-      expect(@mock).to receive(:getPrivateMethod).and_return 'mock'
-      expect(@mock.getPrivateMethod).to eq('mock')
+      expect(mock).to receive(:getPrivateMethod).and_return 'mock'
+      expect(mock.getPrivateMethod).to eq('mock')
     end
 
     it 'should mock methods with 1 parameters' do
-      expect(@mock).to receive(:getPrivateMethodArg1).and_return 'mock'
-      expect(@mock.getPrivateMethodArg1 'param1').to eq('mock')
+      expect(mock).to receive(:getPrivateMethodArg1).and_return 'mock'
+      expect(mock.getPrivateMethodArg1 'param1').to eq('mock')
     end
 
     it 'should mock methods with 2 parameters' do
-      expect(@mock).to receive(:getPrivateMethodArg2).and_return 'mock'
-      expect(@mock.getPrivateMethodArg2 'param1', 'param2').to eq('mock')
+      expect(mock).to receive(:getPrivateMethodArg2).and_return 'mock'
+      expect(mock.getPrivateMethodArg2 'param1', 'param2').to eq('mock')
     end
 
     it 'should mock methods with varargs parameters' do
-      expect(@mock).to receive(:getPrivateMethodVarargs).and_return 'mock'
-      output = @mock.getPrivateMethodVarargs %w(param1 param2).to_java
+      expect(mock).to receive(:getPrivateMethodVarargs).and_return 'mock'
+      output = mock.getPrivateMethodVarargs %w(param1 param2).to_java
       expect(output).to eq('mock')
     end
   end
@@ -34,25 +32,25 @@ describe 'classes with private methods' do
   context 'when is not changing behaviour'  do
     it 'should raise calling methods with no parameters that are private' do
       expect {
-        @mock.getPrivateMethod.to eq('PrivateMethod')
+        mock.getPrivateMethod.to eq('PrivateMethod')
       }.to raise_error NoMethodError, /no superclass method/
     end
 
     it 'should raise calling methods with 1 parameteres that are private' do
       expect {
-        @mock.getPrivateMethodArg1 'test1'
+        mock.getPrivateMethodArg1 'test1'
       }.to raise_error NoMethodError, /no superclass method/
     end
 
     it 'should raise calling methods with 2 parameteres that are private' do
       expect {
-        @mock.getPrivateMethodArg2 'test1', 'test2'
+        mock.getPrivateMethodArg2 'test1', 'test2'
       }.to raise_error NoMethodError, /no superclass method/
     end
 
     it 'should raise calling methods with varargs params that are private' do
       expect {
-        @mock.getPrivateMethodVarargs(%w(param1 param2).to_java(:string))
+        mock.getPrivateMethodVarargs(%w(param1 param2).to_java(:string))
       }.to raise_error NoMethodError, /no superclass method/
     end
   end

data/spec/mock_java/public_constructor_spec.rb

@@ -6,25 +6,25 @@ describe 'classes with public constructores' do
 
   context 'when using no arguments' do
     it 'should call the parent default constructor' do
-      @mock = mock_java PublicConstructor
-      expect(@mock.getMessage).to eq('Default Constructor')
+      mock = mock_java PublicConstructor
+      expect(mock.getMessage).to eq('Default Constructor')
     end
   end
 
   context 'when using the init arguments' do
     it 'should call the parent constructor with 1 parameters for 1 argument' do
-      @mock = mock_java PublicConstructor, 'mock1'
-      expect(@mock.getMessage).to eq('Constructor 1: mock1')
+      mock = mock_java PublicConstructor, 'mock1'
+      expect(mock.getMessage).to eq('Constructor 1: mock1')
     end
 
     it 'should call the parent constructor with 2 parameters for 2 argument' do
-      @mock = mock_java PublicConstructor, 'mock1', 'mock2'
-      expect(@mock.getMessage).to eq('Constructor 2: mock1 mock2')
+      mock = mock_java PublicConstructor, 'mock1', 'mock2'
+      expect(mock.getMessage).to eq('Constructor 2: mock1 mock2')
     end
 
     it 'should call the parent constructor when using varargs' do
-      @mock = mock_java PublicConstructor, 'mock1', 'mock2', 'mock3'
-      expect(@mock.getMessage).to eq('Constructor Varargs1: [mock1, mock2, mock3]')
+      mock = mock_java PublicConstructor, 'mock1', 'mock2', 'mock3'
+      expect(mock.getMessage).to eq('Constructor Varargs1: [mock1, mock2, mock3]')
     end
   end
 

data/spec/mock_java/public_method_spec.rb

@@ -3,49 +3,47 @@ require 'spec_helper'
 java_import 'test.PublicMethod'
 
 describe 'classes with public methods' do
-  before(:each) do
-    @mock = mock_java PublicMethod
-  end
+  let(:mock) { mock_java PublicMethod }
 
   context 'when is changing behaviour' do
     it 'should mock methods with no parameters' do
-      expect(@mock).to receive(:getPublicMethod).and_return 'mock'
-      expect(@mock.getPublicMethod).to eq('mock')
+      expect(mock).to receive(:getPublicMethod).and_return 'mock'
+      expect(mock.getPublicMethod).to eq('mock')
     end
 
     it 'should mock methods with 1 parameters' do
-      expect(@mock).to receive(:getPublicMethodArg1).and_return 'mock'
-      expect(@mock.getPublicMethodArg1 'param1').to eq('mock')
+      expect(mock).to receive(:getPublicMethodArg1).and_return 'mock'
+      expect(mock.getPublicMethodArg1 'param1').to eq('mock')
     end
 
     it 'should mock methods with 2 parameters' do
-      expect(@mock).to receive(:getPublicMethodArg2).and_return 'mock'
-      expect(@mock.getPublicMethodArg2 'param1', 'param2').to eq('mock')
+      expect(mock).to receive(:getPublicMethodArg2).and_return 'mock'
+      expect(mock.getPublicMethodArg2 'param1', 'param2').to eq('mock')
     end
 
     it 'should mock methods with varargs parameters' do
-      expect(@mock).to receive(:getPublicMethodVarargs).and_return 'mock'
+      expect(mock).to receive(:getPublicMethodVarargs).and_return 'mock'
 
-      output = @mock.getPublicMethodVarargs %w(param1 param2).to_java
+      output = mock.getPublicMethodVarargs %w(param1 param2).to_java
       expect(output).to eq('mock')
     end
   end
 
   context 'when is not changing behaviour' do
     it 'should call the the original methods with no parameters' do
-      expect(@mock.getPublicMethod).to eq('PublicMethod')
+      expect(mock.getPublicMethod).to eq('PublicMethod')
     end
 
     it 'should call original methods with 1 parameters' do
-      expect(@mock.getPublicMethodArg1 'test').to eq('test')
+      expect(mock.getPublicMethodArg1 'test').to eq('test')
     end
 
     it 'should call original methods with 2 parameters' do
-      expect(@mock.getPublicMethodArg2 'test1', 'test2').to eq('test1 test2')
+      expect(mock.getPublicMethodArg2 'test1', 'test2').to eq('test1 test2')
     end
 
     it 'should call original methods with varargs parameters' do
-      output = @mock.getPublicMethodVarargs(%w(param1 param2).to_java(:string))
+      output = mock.getPublicMethodVarargs(%w(param1 param2).to_java(:string))
       expect(output.to_a).to eq(%w(param1 param2))
     end
   end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: mock_java
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Frederico Benevides
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.9'
-  type: :development
+  name: bundler
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 description: mock_java a lib that help to mock java classes in ruby world!
@@ -59,9 +59,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -73,6 +74,10 @@ files:
 - spec/java_classes/test/PrivateMethod.java
 - spec/java_classes/test/PublicConstructor.java
 - spec/java_classes/test/PublicMethod.java
+- spec/java_classes/test/inheritance/A.java
+- spec/java_classes/test/inheritance/B.java
+- spec/java_classes/test/inheritance/C.java
+- spec/mock_java/inherited_method_spec.rb
 - spec/mock_java/objects_already_created_spec.rb
 - spec/mock_java/private_method_spec.rb
 - spec/mock_java/public_constructor_spec.rb
@@ -82,30 +87,34 @@ homepage: http://github.com/fredericobenevides/mock_java
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.4.6
+signing_key:
 specification_version: 4
 summary: Mock java is a lib to mock java classes in the ruby world!
 test_files:
 - spec/java_classes/test/PrivateMethod.java
 - spec/java_classes/test/PublicConstructor.java
 - spec/java_classes/test/PublicMethod.java
+- spec/java_classes/test/inheritance/A.java
+- spec/java_classes/test/inheritance/B.java
+- spec/java_classes/test/inheritance/C.java
+- spec/mock_java/inherited_method_spec.rb
 - spec/mock_java/objects_already_created_spec.rb
 - spec/mock_java/private_method_spec.rb
 - spec/mock_java/public_constructor_spec.rb