hiptest-publisher 1.13.0 → 1.14.0

data/lib/hiptest-publisher/xml_parser.rb

@@ -122,6 +122,13 @@ module Hiptest
         css_first_content(call, '> annotation'))
     end
 
+    def build_uidcall(uid_call)
+      Hiptest::Nodes::UIDCall.new(
+        css_first_content(uid_call, '> uid'),
+        build_arguments(uid_call),
+        css_first_content(uid_call, '> annotation'))
+    end
+
     def build_arguments(arguments)
       build_node_list(arguments.css('> arguments > argument'))
     end
@@ -198,6 +205,7 @@ module Hiptest
         css_first_content(actionword, '> uid'),
         css_first_content(actionword, '> description'))
     end
+    alias :build_libraryActionword :build_actionword
 
     def build_actionwordSnapshot(actionword)
       Hiptest::Nodes::Actionword.new(
@@ -303,6 +311,19 @@ module Hiptest
       return tp
     end
 
+    def build_actionwordLibraries(libraries)
+      Hiptest::Nodes::Libraries.new(
+        build_node_list(libraries.css('> actionwordLibrary'))
+      )
+    end
+
+    def build_actionwordLibrary(library)
+      Hiptest::Nodes::Library.new(
+        css_first_content(library, '> name'),
+        build_node_list(library.css('> libraryActionwords libraryActionword'))
+      )
+    end
+
     def build_folderSnapshots(folder_snapshots)
       build_testPlan(folder_snapshots, '> folderSnapshot')
     end
@@ -327,7 +348,9 @@ module Hiptest
         build_node(test_plan_node, Hiptest::Nodes::TestPlan),
         build_node(scenarios_node, Hiptest::Nodes::Scenarios),
         build_node(actionwords_node, Hiptest::Nodes::Actionwords),
-        build_node(css_first(project, '> tests'), Hiptest::Nodes::Tests))
+        build_node(css_first(project, '> tests'), Hiptest::Nodes::Tests),
+        build_node(css_first(project, '> actionwordLibraries'), Hiptest::Nodes::Libraries)
+      )
 
       @project.assign_scenarios_to_folders
       return @project

data/lib/templates/cucumber/groovy/actionwords-library/actionword.hbs

@@ -0,0 +1,2 @@
+def {{{camelize_lower uniq_name }}}({{#if has_parameters?}}{{{join rendered_children.parameters ', '}}}{{/if}}) {{#curly}}{{#indent}}{{> desc}}{{> steps}}{{/indent}}
+{{/curly}}

data/lib/templates/cucumber/groovy/actionwords-library/libraries.hbs

@@ -0,0 +1,9 @@
+package {{{ context.package }}};
+
+class ActionwordLibrary {{#curly}}{{#indent}}{{#each library_names}}
+{{camelize this}}Library get{{camelize this}}Library() {{#curly}}{{#indent}}
+return {{camelize this}}Library.instance;
+{{/indent}}
+{{/curly}}
+{{/each}}{{/indent}}
+{{/curly}}

data/lib/templates/cucumber/groovy/actionwords-library/library.hbs

@@ -0,0 +1,8 @@
+package {{{ context.package }}};
+
+@Singleton
+class {{camelize rendered_children.name}}Library {{#curly}}{{#indent}}{{#each rendered_children.actionwords}}
+{{{this}}}
+{{/each}}
+{{/indent}}
+{{/curly}}

data/lib/templates/cucumber/groovy/actionwords-library/uidcall.hbs

@@ -0,0 +1 @@
+{{#if context.call_prefix}}{{{context.call_prefix}}}.{{/if}}{{{ camelize_lower rendered_children.actionword_name }}}({{{ join rendered_children.all_arguments ', '}}});

data/lib/templates/cucumber/groovy/actionwords/actionwords.hbs

@@ -1,6 +1,6 @@
 package {{{ context.package }}}
 
-class Actionwords {{#curly}}{{#indent}}{{#each rendered_children.actionwords}}
+class Actionwords {{#if uses_library? }}extends ActionwordLibrary{{/if}}{{#curly}}{{#indent}}{{#each rendered_children.actionwords}}
 {{{this}}}
 {{/each}}
 {{/indent}}

data/lib/templates/cucumber/groovy/step-definitions/actionword.hbs

@@ -1,5 +1,5 @@
 {{#if rendered_children.gherkin_annotation }}{{{ rendered_children.gherkin_annotation }}}(~"^{{#escape_backslashes_and_double_quotes}}{{> gherkin_pattern}}{{/escape_backslashes_and_double_quotes}}\$") {{#curly}} {{{ join rendered_children.parameters_ordered_by_pattern ', '}}} ->{{#indent}}
-{{{ context.call_prefix }}}.{{{camelize_lower rendered_children.name}}}({{#if has_parameters?}}{{#join raw_parameter_names ', '}}{{{camelize_lower this}}}{{/join}}{{/if}})
+{{{ context.call_prefix }}}.{{#if has_library?}}get{{{camelize library_name}}}Library().{{/if}}{{{camelize_lower uniq_name}}}({{#if has_parameters?}}{{#join raw_parameter_names ', '}}{{{camelize_lower this}}}{{/join}}{{/if}})
 {{/indent}}
 {{/curly}}
 {{/if}}

data/lib/templates/cucumber/groovy/step-definitions/library.hbs

@@ -0,0 +1,10 @@
+package {{{ context.package }}}
+
+import cucumber.api.DataTable
+
+this.metaClass.mixin(cucumber.api.groovy.EN)
+
+Actionwords {{{ context.call_prefix }}} = new Actionwords()
+
+{{#each rendered_children.actionwords}}{{{this}}}
+{{/each}}

data/lib/templates/gherkin/_call.hbs

@@ -0,0 +1,5 @@
+{{> gherkin_text}}{{#if rendered_children.free_text_arg}}{{#indent}}
+"""
+{{remove_surrounding_quotes rendered_children.free_text_arg }}
+"""{{/indent}}{{/if}}{{#if rendered_children.datatable_arg}}{{#indent}}
+{{remove_surrounding_quotes rendered_children.datatable_arg }}{{/indent}}{{/if}}

data/lib/templates/gherkin/call.hbs

@@ -1,5 +1 @@
-{{> gherkin_text}}{{#if rendered_children.free_text_arg}}{{#indent}}
-"""
-{{remove_surrounding_quotes rendered_children.free_text_arg }}
-"""{{/indent}}{{/if}}{{#if rendered_children.datatable_arg}}{{#indent}}
-{{remove_surrounding_quotes rendered_children.datatable_arg }}{{/indent}}{{/if}}
+{{> call}}

data/lib/templates/gherkin/uidcall.hbs

@@ -0,0 +1 @@
+{{> call}}

data/lib/templates/java/_item_as_function.hbs

@@ -1,4 +1,4 @@
-public void {{{ camelize_lower rendered_children.name }}}({{#if has_parameters?}}{{{join rendered_children.parameters ', '}}}{{/if}}) {{#curly}}
+public void {{{ camelize_lower uniq_name }}}({{#if has_parameters?}}{{{join rendered_children.parameters ', '}}}{{/if}}) {{#curly}}
 {{#clear_empty_lines}}
 {{#indent}}{{#comment '//'}}{{#if has_tags?}}Tags: {{{ join rendered_children.tags ' '}}}
 {{/if}}{{#if has_description?}}{{rendered_children.description}}

data/lib/templates/java/actionwords.hbs

@@ -1,6 +1,6 @@
 package {{{ context.package }}};
 
-public class Actionwords {{#curly}}{{#indent}}
+public class Actionwords {{#if uses_library?}}extends ActionwordLibrary {{/if}}{{#curly}}{{#indent}}
 {{#each rendered_children.actionwords}}
 {{{this}}}
 {{/each}}

data/lib/templates/java/libraries.hbs

@@ -0,0 +1,9 @@
+package {{{ context.package }}};
+
+public class ActionwordLibrary {{#curly}}{{#indent}}{{#each library_names}}
+public {{camelize this}}Library get{{camelize this}}Library() {{#curly}}{{#indent}}
+return new {{camelize this}}Library();
+{{/indent}}
+{{/curly}}
+{{/each}}{{/indent}}
+{{/curly}}

data/lib/templates/java/library.hbs

@@ -0,0 +1,7 @@
+package {{{ context.package }}};
+
+public class {{camelize rendered_children.name}}Library extends ActionwordLibrary {{#curly}}{{#indent}}{{#each rendered_children.actionwords}}
+{{{this}}}
+{{/each}}
+{{/indent}}
+{{/curly}}

data/lib/templates/java/uidcall.hbs

@@ -0,0 +1 @@
+{{#if context.call_prefix}}{{{context.call_prefix}}}.{{/if}}{{#if has_library?}}get{{{camelize rendered_children.library_name}}}Library().{{/if}}{{{ camelize_lower rendered_children.actionword_name }}}({{{ join rendered_children.all_arguments ', '}}});

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.14.0
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-21 00:00:00.000000000 Z
+date: 2018-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -249,23 +249,28 @@ files:
 - lib/config/seleniumide.conf
 - lib/config/specflow.conf
 - lib/hiptest-publisher.rb
-- lib/hiptest-publisher/actionword_indexer.rb
-- lib/hiptest-publisher/call_arguments_adder.rb
 - lib/hiptest-publisher/cli_options_checker.rb
 - lib/hiptest-publisher/client.rb
-- lib/hiptest-publisher/datatable_fixer.rb
-- lib/hiptest-publisher/diff_displayer.rb
 - lib/hiptest-publisher/file_writer.rb
 - lib/hiptest-publisher/formatters/console_formatter.rb
+- lib/hiptest-publisher/formatters/diff_displayer.rb
 - lib/hiptest-publisher/formatters/reporter.rb
 - lib/hiptest-publisher/gherkin_adder.rb
 - lib/hiptest-publisher/handlebars_helper.rb
-- lib/hiptest-publisher/items_orderer.rb
+- lib/hiptest-publisher/indexers/actionword_indexer.rb
+- lib/hiptest-publisher/indexers/actionword_uid_indexer.rb
+- lib/hiptest-publisher/node_modifiers/actionword_uniq_renamer.rb
+- lib/hiptest-publisher/node_modifiers/add_all.rb
+- lib/hiptest-publisher/node_modifiers/call_arguments_adder.rb
+- lib/hiptest-publisher/node_modifiers/datatable_fixer.rb
+- lib/hiptest-publisher/node_modifiers/gherkin_adder.rb
+- lib/hiptest-publisher/node_modifiers/items_orderer.rb
+- lib/hiptest-publisher/node_modifiers/parameter_type_adder.rb
+- lib/hiptest-publisher/node_modifiers/parent_adder.rb
+- lib/hiptest-publisher/node_modifiers/uid_call_reference_adder.rb
 - lib/hiptest-publisher/nodes.rb
 - lib/hiptest-publisher/nodes_walker.rb
 - lib/hiptest-publisher/options_parser.rb
-- lib/hiptest-publisher/parameter_type_adder.rb
-- lib/hiptest-publisher/parent_adder.rb
 - lib/hiptest-publisher/project_grapher.rb
 - lib/hiptest-publisher/render_context_maker.rb
 - lib/hiptest-publisher/renderer.rb
@@ -330,10 +335,15 @@ files:
 - lib/templates/csharp/while.hbs
 - lib/templates/cucumber/actionword.hbs
 - lib/templates/cucumber/actionwords.hbs
+- lib/templates/cucumber/groovy/actionwords-library/actionword.hbs
+- lib/templates/cucumber/groovy/actionwords-library/libraries.hbs
+- lib/templates/cucumber/groovy/actionwords-library/library.hbs
+- lib/templates/cucumber/groovy/actionwords-library/uidcall.hbs
 - lib/templates/cucumber/groovy/actionwords/actionwords.hbs
 - lib/templates/cucumber/groovy/step-definitions/_gherkin_pattern.hbs
 - lib/templates/cucumber/groovy/step-definitions/actionword.hbs
 - lib/templates/cucumber/groovy/step-definitions/actionwords.hbs
+- lib/templates/cucumber/groovy/step-definitions/library.hbs
 - lib/templates/cucumber/groovy/step-definitions/parameter.hbs
 - lib/templates/cucumber/java/actionword.hbs
 - lib/templates/cucumber/java/actionwords.hbs
@@ -344,6 +354,7 @@ files:
 - lib/templates/cucumber/javascript/actionword.hbs
 - lib/templates/cucumber/javascript/actionwords.hbs
 - lib/templates/cucumber/parameter.hbs
+- lib/templates/gherkin/_call.hbs
 - lib/templates/gherkin/_gherkin_text.hbs
 - lib/templates/gherkin/_scenario.hbs
 - lib/templates/gherkin/_scenario_outline_title.hbs
@@ -362,6 +373,7 @@ files:
 - lib/templates/gherkin/stringliteral.hbs
 - lib/templates/gherkin/tag.hbs
 - lib/templates/gherkin/template.hbs
+- lib/templates/gherkin/uidcall.hbs
 - lib/templates/groovy/_body.hbs
 - lib/templates/groovy/_desc.hbs
 - lib/templates/groovy/_scenario.hbs
@@ -409,6 +421,8 @@ files:
 - lib/templates/java/folder.hbs
 - lib/templates/java/ifthen.hbs
 - lib/templates/java/index.hbs
+- lib/templates/java/libraries.hbs
+- lib/templates/java/library.hbs
 - lib/templates/java/list.hbs
 - lib/templates/java/nullliteral.hbs
 - lib/templates/java/parameter.hbs
@@ -431,6 +445,7 @@ files:
 - lib/templates/java/testng/single_test.hbs
 - lib/templates/java/testng/tests.hbs
 - lib/templates/java/tests.hbs
+- lib/templates/java/uidcall.hbs
 - lib/templates/java/variable.hbs
 - lib/templates/java/while.hbs
 - lib/templates/javascript/_body.hbs

data/lib/hiptest-publisher/call_arguments_adder.rb

@@ -1,34 +0,0 @@
-require 'hiptest-publisher/actionword_indexer'
-require 'hiptest-publisher/nodes'
-
-module Hiptest
-  class DefaultArgumentAdder
-    def self.add(project)
-      DefaultArgumentAdder.new(project).update_calls
-    end
-
-    def initialize(project)
-      @project = project
-      @indexer = ActionwordIndexer.new(project)
-    end
-
-    def update_calls
-      @project.each_sub_nodes(Hiptest::Nodes::Call) do |call|
-        aw_data = @indexer.get_index(call.children[:actionword])
-        next if aw_data.nil?
-
-        arguments = {}
-        call.children[:arguments].each do |arg|
-          arguments[arg.children[:name]] = arg.children[:value]
-        end
-
-        call.children[:all_arguments] = aw_data[:parameters].map do |p_name, default_value|
-          Hiptest::Nodes::Argument.new(
-            p_name,
-            arguments.has_key?(p_name) ? arguments[p_name] : default_value
-          )
-        end
-      end
-    end
-  end
-end

data/lib/hiptest-publisher/items_orderer.rb

@@ -1,31 +0,0 @@
-require 'hiptest-publisher/nodes'
-
-module Hiptest
-  class ItemsOrderer
-    def self.add(project, order)
-      Hiptest::ItemsOrderer.new(project).order_items(order)
-    end
-
-    def initialize(project)
-      @project = project
-    end
-
-    def order_items(order)
-      if (order == 'order')
-        @project.each_sub_nodes(Hiptest::Nodes::Folder) do |folder|
-          folder.children[:scenarios].sort_by! {|sc| sc.order_in_parent}
-          folder.children[:subfolders].sort_by! {|f| f.order_in_parent}
-        end
-      end
-
-      if (order == 'alpha')
-        @project.each_sub_nodes(Hiptest::Nodes::Folder) do |folder|
-          folder.children[:scenarios].sort_by! {|sc| sc.children[:name] }
-          folder.children[:subfolders].sort_by! {|f| f.children[:name] }
-        end
-
-        @project.children[:scenarios].children[:scenarios].sort_by! {|sc| sc.children[:name] }
-      end
-    end
-  end
-end