jsinstrument 0.0.12 → 0.0.13

data/lib/jsinstrument/inserting.js

@@ -162,7 +162,14 @@
   }
 
   // register the instrumented lines for current file
-  root.%{js_object_name}.register('%{src_filename}', %{instrumented_lines}, %{instrumented_func_lines});
+  root.%{js_object_name}.register('%{src_filename}',
+    // line coverage
+    %{instrumented_lines},
+    // function coverage
+    %{instrumented_func_lines},
+    // branch coverage
+    %{instrumented_branch_lines}
+  );
 }(this);
 
 

data/lib/jsinstrument/instrumenter.rb

@@ -22,7 +22,7 @@ module JSInstrument
       self.src_filename = filename
       ast = RKelly::Parser.new.parse src
       raise 'Parse source failed.' unless ast
-      ast, instrumented_lines, instrumented_func_lines = instrument_ast ast
+      ast, instrumented_lines, instrumented_func_lines, instrumented_branch_lines = instrument_ast ast
       instrumented_src = ast.to_ecma
 
       inserting = File.open(File.dirname(__FILE__) + '/inserting.js').read
@@ -36,7 +36,8 @@ module JSInstrument
         batch_text: self.batch_text,
         data_compress_method: self.data_compress_method,
         instrumented_lines: instrumented_lines,
-        instrumented_func_lines: instrumented_func_lines
+        instrumented_func_lines: instrumented_func_lines,
+        instrumented_branch_lines: instrumented_branch_lines
       }
 
       (inserting % bindings) + instrumented_src
@@ -48,11 +49,12 @@ module JSInstrument
       ast = RKelly::Visitors::ParentBuilder.new.build ast
       instrumented_lines = Set.new
       instrumented_func_lines = Set.new
+      instrumented_branch_lines = Set.new
       ast.each do |node|
         parent = node.parent
         line = node.line
-        node_classname = node.class.name.split(/::/)[-1].sub('Node', '')
-        parent_classname = parent.class.name.split(/::/)[-1].sub('Node', '')
+        node_classname = get_node_classname node
+        parent_classname = get_node_classname parent
 
         # instrument only if we can get the line no. and we haven't instrumented it
         
@@ -93,6 +95,7 @@ module JSInstrument
             end
           end
         end
+
         # function coverage
         #
         if line and not instrumented_func_lines.member? line
@@ -103,11 +106,31 @@ module JSInstrument
             end
           end
         end
+
+        # branch coverage
+        #
+        if line and not instrumented_branch_lines.member? line
+          if 'If' == parent_classname
+            if 'Block' == node_classname
+              if parent.value.eql? node
+                instrumented_branch_lines.add line
+                insert_hitbranch_in node
+              elsif parent.else.eql? node
+                instrumented_branch_lines.add line
+                insert_hitbranch_in node
+              end
+            end
+          end
+        end
       end
-      [ast, instrumented_lines.sort, instrumented_func_lines.sort]
+      [ast, instrumented_lines.sort, instrumented_func_lines.sort, instrumented_branch_lines.sort]
     end
 
     private
+    def get_node_classname node
+      node.class.name.split(/::/)[-1].sub('Node', '')
+    end
+
     def get_hit_call line, func
       ExpressionStatementNode.new(
         FunctionCallNode.new(
@@ -152,5 +175,9 @@ module JSInstrument
       function_body_node.value.value.unshift get_hit_call(line, "hit_func")
     end
 
+    def insert_hitbranch_in block_node
+      # Block.value(SourceElement).value(array).unshift hit_func
+      block_node.value.value.unshift get_hit_call(block_node.line, "hit_branch")
+    end
   end
 end

data/lib/jsinstrument/version.rb

@@ -1,3 +1,3 @@
 module JSInstrument
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsinstrument
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors: