Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Next (v1.0.0-rc6) #86

Open
wants to merge 29 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
4e03a5e
Project/Builder Updates
Sep 5, 2020
c53e4be
Added Natural Language Core
Sep 5, 2020
21a6c93
Integrated Natural Lang into Cucumber and Jbehave editors
Sep 5, 2020
8579109
Added additional validation steps to CucumberValidator
Sep 5, 2020
bb16036
Added serenity-cucumber-bdd-screenplay submodule
Sep 6, 2020
180b995
Fixed CucumberProposalProvider and CucumberHyperlinkHelper
Sep 6, 2020
bb49af6
Restored BuilderParticipant in cucumber ui
Sep 6, 2020
d65a299
Added missingScenarioSteps validation step to CucumberValidator
Sep 6, 2020
41fb225
Misc cleanup to osgi metadata
Sep 6, 2020
f164360
Upgraded target definition to eclipse-2020-09
Sep 6, 2020
e2e3c2a
[autoformat]
Sep 7, 2020
05145aa
Reverted target definition back to eclipse 2020-03
Sep 7, 2020
d3b264f
Cleaned up full_example.feature
Sep 7, 2020
1b919b7
Fixed syntax coloring for DocString elements
Sep 7, 2020
3b29139
Fixed Example indentation when table feature is missing
Sep 7, 2020
b227f06
Switched back to original tag syntax + word globs for raw text
Sep 8, 2020
30ed478
Added exec perm to antlrworks
Sep 8, 2020
0a6a301
Removed unsupported syntax from full_example.feature
Sep 8, 2020
f14b8fe
Cleaned up outline view for Cuumber editor
Sep 8, 2020
9ac4681
Upgraded target definition to latest eclipse (2020-06)
Sep 9, 2020
1a6c358
Refactored commons into stepmatcher api/impl
Sep 9, 2020
464df62
Added unmatched step to hello_stepmatcher.feature
Sep 9, 2020
b09802e
JavaAnnotationMatcher now checks first character prior to regex match
Sep 9, 2020
4b29b1c
Improved regex pattern error protection
Sep 10, 2020
008a326
Added example for Cucumber Expressions in cucumber-jvm test project
Sep 10, 2020
e9ca34e
Cleaned up pom/feature files
Sep 13, 2020
bdbae68
Updated CucumberHighlightingTest
Sep 13, 2020
8efff67
Removed debug println statement
Sep 13, 2020
b7f23fd
Added semantic highlighting fallback for failed lexical highlighting
Sep 14, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 33 additions & 32 deletions LaunchNatural.launch
Original file line number Diff line number Diff line change
@@ -1,35 +1,36 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
<booleanAttribute key="append.args" value="true"/>
<booleanAttribute key="askclear" value="true"/>
<booleanAttribute key="automaticAdd" value="true"/>
<booleanAttribute key="automaticValidate" value="false"/>
<stringAttribute key="bad_container_name" value="/org.agileware.natural.cucumber/.launch/"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
<booleanAttribute key="clearConfig" value="true"/>
<booleanAttribute key="clearws" value="false"/>
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/LaunchNatural"/>
<booleanAttribute key="default" value="true"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc:natural/runtime-workspace}"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
<booleanAttribute key="useProduct" value="true"/>
<booleanAttribute key="usefeatures" value="false"/>
<booleanAttribute key="append.args" value="true"/>
<booleanAttribute key="askclear" value="true"/>
<booleanAttribute key="automaticAdd" value="true"/>
<booleanAttribute key="automaticValidate" value="false"/>
<stringAttribute key="bad_container_name" value="/org.agileware.natural.cucumber/.launch/"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
<booleanAttribute key="clearConfig" value="true"/>
<booleanAttribute key="clearws" value="false"/>
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/LaunchNatural"/>
<booleanAttribute key="default" value="true"/>
<booleanAttribute key="generateProfile" value="true"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc:natural/runtime-workspace}"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
<booleanAttribute key="useProduct" value="true"/>
<booleanAttribute key="usefeatures" value="false"/>
</launchConfiguration>
23 changes: 0 additions & 23 deletions org.agileware.natural.common.feature/.project

This file was deleted.

1 change: 0 additions & 1 deletion org.agileware.natural.common.feature/build.properties

This file was deleted.

27 changes: 0 additions & 27 deletions org.agileware.natural.common.feature/feature.xml

This file was deleted.

15 changes: 0 additions & 15 deletions org.agileware.natural.common.feature/pom.xml

This file was deleted.

3 changes: 2 additions & 1 deletion org.agileware.natural.common/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Natural Core SDK
Automatic-Module-Name: org.agileware.natural.common
Bundle-SymbolicName: org.agileware.natural.common
Bundle-Version: 1.3.0.qualifier
Bundle-Version: 1.4.0.qualifier
Bundle-Activator: org.agileware.natural.common.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.17.100";visibility:=reexport,
org.eclipse.jface.text;bundle-version="3.16.200";visibility:=reexport,
Expand Down
2 changes: 1 addition & 1 deletion org.agileware.natural.common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</parent>
<artifactId>org.agileware.natural.common</artifactId>
<packaging>eclipse-plugin</packaging>
<version>1.3.0-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>

<build>
<plugins>
Expand Down
1 change: 0 additions & 1 deletion org.agileware.natural.cucumber.tests/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ source.. = src/,\
bin.includes = .,\
META-INF/
bin.excludes = **/*.xtend
jars.extra.classpath = platform:/plugin/org.agileware.natural.testing/lib/hamcrest-2.2.jar
9 changes: 1 addition & 8 deletions org.agileware.natural.cucumber.tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,5 @@
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>2.2</version>
</dependency>
</dependencies>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,56 @@ class Constants {

public static final String EXAMPLE_FEATURE = '''
#language: en
@release:Release-2
@version:1.0.0
@release: Release-2
@version: 1.0.0
@pet_store
Feature: Add a new pet

In order to sell a pet
As a store owner
I want to add a new pet to the catalog

Background: Add a dog
Given I have the following pet
| name | status |
| Fido | available |
And I add the pet to the store
But the pet is not yet mine
Background: Add a dog
Given I have the following pet
| name | status |
| Fido | available |
And I add the pet to the store
But the pet is not yet mine

@add @fido
Scenario: Add another dog
Then the should be available in the store
@add
@fido
Scenario: Add another dog
Then the should be available in the store

@update @fido
Scenario:
Given the pet is available in the store -9.8
"""
The quick brown fox
Jumps over the lazy dog
"""
When I update the pet with
| name | status |
| Fido | unavailable |
Then the pet should be "unavailable" in the store
@update
@fido
Scenario:
Given the pet is available in the store -9.8
"""
The quick brown fox
Jumps over the lazy dog
"""
When I update the pet with
| name | status |
| Fido | unavailable |
Then the pet should be "unavailable" in the store

@eat-pickles
Scenario Outline: Eating pickles
Given there are <start> pickles
When I eat <eat> pickles
Then I should have <left> pickles
@eat-pickles
Scenario Outline: Eating pickles
Given there are <start> pickles
When I eat <eat> pickles
Then I should have <left> pickles

@hungry
Examples:
| start | eat | left |
| 12 | 10 | 2 |
| 20 | 15 | 5 |
@hungry
Examples:
| start | eat | left |
| 12 | 10 | 2 |
| 20 | 15 | 5 |

@full
Examples: With a title
| start | eat | left |
| 12 | 2 | 10 |
| 20 | 5 | 15 |
@full
Examples: With a title
| start | eat | left |
| 12 | 2 | 10 |
| 20 | 5 | 15 |
'''
}
Loading