Release

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
 ## [Unreleased]
+### Fixed
+- [Issue #72](https://github.com/reportportal/agent-java-jbehave/issues/72): Incorrect test count on Before and After stories steps, by @HardNorth
+### Changed
+- Client version updated on [5.2.25](https://github.com/reportportal/client-java/releases/tag/5.2.25), by @HardNorth
 
 ## [5.3.5]
 ### Changed

build.gradle

@@ -39,7 +39,7 @@ repositories {
 }
 
 dependencies {
-    api 'com.epam.reportportal:client-java:5.2.24'
+    api 'com.epam.reportportal:client-java:5.2.25'
     compileOnly ("org.jbehave:jbehave-core:${project.jbehave_version}") {
         exclude group: 'junit'
         exclude group: 'org.junit.vintage'

src/main/java/com/epam/reportportal/jbehave/ReportPortalStoryReporter.java

@@ -91,8 +91,8 @@ public abstract class ReportPortalStoryReporter extends NullStoryReporter {
 	private final Supplier<Launch> launch;
 	private final TestItemTree itemTree;
 
-	private TestItemTree.TestItemLeaf lastStep;
-	private static volatile ItemType currentLifecycleTopItemType;
+	private volatile ItemType currentLifecycleTopItemType;
+	private volatile TestItemTree.TestItemLeaf lastStep;
 	private ItemType currentLifecycleItemType;
 
 	public ReportPortalStoryReporter(final Supplier<Launch> launchSupplier, TestItemTree testItemTree) {
@@ -832,7 +832,6 @@ protected void simulateStep(@Nonnull String step) {
 	 */
 	@Override
 	public void beforeStory(@Nonnull Story story, boolean givenStory) {
-		currentLifecycleTopItemType = ItemType.AFTER_GROUPS;
 		currentLifecycleItemType = ItemType.BEFORE_SUITE;
 		structure.add(new Entity<>(ItemType.STORY, story));
 	}
@@ -897,31 +896,31 @@ public void beforeStep(@Nonnull Step step) {
 		TestItemTree.TestItemLeaf parentItem = retrieveLeaf();
 		if (parentItem == null) {
 			// Before Stories
-			structure.add(new Entity<>(ItemType.TEST,
-					currentLifecycleTopItemType == null ? BEFORE_STORIES : AFTER_STORIES
-			));
-			if (currentLifecycleTopItemType == null) {
+			if (itemTree.getTestItems().isEmpty()) {
 				currentLifecycleTopItemType = ItemType.BEFORE_GROUPS;
+				structure.add(new Entity<>(ItemType.TEST, BEFORE_STORIES));
+			} else {
+				currentLifecycleTopItemType = ItemType.AFTER_GROUPS;
+				structure.add(new Entity<>(ItemType.TEST, AFTER_STORIES));
 			}
 		} else if (parentItem.getType() == ItemType.STORY) {
 			// Before Story
-			structure.add(new Entity<>(ItemType.TEST,
-					currentLifecycleItemType == ItemType.BEFORE_SUITE ? BEFORE_STORY : AFTER_STORY
-			));
+			structure.add(new Entity<>(ItemType.TEST, currentLifecycleItemType == ItemType.BEFORE_SUITE ? BEFORE_STORY : AFTER_STORY));
 		}
-		if (parentItem == null) {
-			ofNullable(retrieveLeaf()).map(i -> startLifecycleMethod(
-					step.getStepAsString(),
-					currentLifecycleTopItemType,
-					i
-			)).ifPresent(stepStack::add);
-			return;
-		}
-		currentLifecycleItemType = ItemType.BEFORE_METHOD;
-		TestItemTree.TestItemLeaf stepLeaf = ofNullable(retrieveLeaf()).map(l -> startStep(step.getStepAsString(), l))
-				.orElse(null);
-		stepStack.add(stepLeaf);
+		TestItemTree.TestItemLeaf stepLeaf = ofNullable(retrieveLeaf()).map(i -> {
+			if (parentItem == null) {
+				return startLifecycleMethod(step.getStepAsString(), currentLifecycleTopItemType, i);
+			} else {
+				if (ItemType.TEST == i.getType()) {
+					return startLifecycleMethod(step.getStepAsString(), currentLifecycleItemType, i);
+				} else {
+					currentLifecycleItemType = ItemType.BEFORE_METHOD;
+					return startStep(step.getStepAsString(), i);
+				}
+			}
+		}).orElse(null);
 		if (stepLeaf != null) {
+			stepStack.add(stepLeaf);
 			lastStep = stepLeaf;
 		}
 	}

src/test/java/com/epam/reportportal/jbehave/BaseTest.java

@@ -75,6 +75,8 @@ public class BaseTest {
 	public static final String ROOT_SUITE_PREFIX = "root_";
 
 	public static final String STEP_PATTERN = "/[STEP:%s]";
+	public static final String BEFORE_STORY_PATTERN = "/[BEFORE_SUITE:%s]";
+	public static final String AFTER_STORY_PATTERN = "/[AFTER_SUITE:%s]";
 	public static final String LIFECYCLE_PATTERN = "/[LIFECYCLE:%s]";
 	public static final String SCENARIO_PATTERN = "/[SCENARIO:%s]";
 

src/test/java/com/epam/reportportal/jbehave/lifecycle/AfterStoryAnnotationFailedTest.java

@@ -106,8 +106,8 @@ public void verify_after_story_annotation_failed_method_reporting() {
 
 		StartTestItemRQ afterStep = startItems.get(3);
 		assertThat(afterStep.getName(), equalTo(AFTER_STORY_NAME));
-		assertThat(afterStep.getCodeRef(), equalTo(afterStoryCodeRef + String.format(STEP_PATTERN, AFTER_STORY_NAME)));
-		assertThat(afterStep.getType(), equalTo(ItemType.STEP.name()));
+		assertThat(afterStep.getCodeRef(), equalTo(afterStoryCodeRef + String.format(AFTER_STORY_PATTERN, AFTER_STORY_NAME)));
+		assertThat(afterStep.getType(), equalTo(ItemType.AFTER_SUITE.name()));
 
 		// Finish items verification
 		ArgumentCaptor<FinishTestItemRQ> finishStepCaptor = ArgumentCaptor.forClass(FinishTestItemRQ.class);

src/test/java/com/epam/reportportal/jbehave/lifecycle/AfterStoryFailedTest.java

@@ -116,9 +116,9 @@ public void verify_after_story_lifecycle_step_failure_reporting() {
 		StartTestItemRQ beforeStoryStart = beforeCaptor.getValue();
 		assertThat(beforeStoryStart.getName(), equalTo(LIFECYCLE_STEP_NAMES[0]));
 		assertThat(beforeStoryStart.getCodeRef(),
-				equalTo(beforeSuiteCodeRef + String.format(STEP_PATTERN, LIFECYCLE_STEP_NAMES[0]))
+				equalTo(beforeSuiteCodeRef + String.format(BEFORE_STORY_PATTERN, LIFECYCLE_STEP_NAMES[0]))
 		);
-		assertThat(beforeStoryStart.getType(), equalTo(ItemType.STEP.name()));
+		assertThat(beforeStoryStart.getType(), equalTo(ItemType.BEFORE_SUITE.name()));
 
 		String scenarioCodeRef = STORY_PATH + String.format(SCENARIO_PATTERN, SCENARIO_NAME);
 		StartTestItemRQ scenarioStart = storyStartItems.get(1);
@@ -165,10 +165,10 @@ public void verify_after_story_lifecycle_step_failure_reporting() {
 
 		StartTestItemRQ afterStoryStepStart = afterCaptor.getValue();
 		String afterStoryStepCodeRef =
-				afterStoryCodeRef + String.format(STEP_PATTERN, LIFECYCLE_STEP_NAMES[LIFECYCLE_STEP_NAMES.length - 1]);
+				afterStoryCodeRef + String.format(AFTER_STORY_PATTERN, LIFECYCLE_STEP_NAMES[LIFECYCLE_STEP_NAMES.length - 1]);
 		assertThat(afterStoryStepStart.getName(), equalTo(LIFECYCLE_STEP_NAMES[LIFECYCLE_STEP_NAMES.length - 1]));
 		assertThat(afterStoryStepStart.getCodeRef(), equalTo(afterStoryStepCodeRef));
-		assertThat(afterStoryStepStart.getType(), equalTo(ItemType.STEP.name()));
+		assertThat(afterStoryStepStart.getType(), equalTo(ItemType.AFTER_SUITE.name()));
 
 		// Finish items verification
 		ArgumentCaptor<FinishTestItemRQ> finishStepCaptor = ArgumentCaptor.forClass(FinishTestItemRQ.class);

src/test/java/com/epam/reportportal/jbehave/lifecycle/AfterStoryTest.java

@@ -109,9 +109,9 @@ public void verify_after_story_lifecycle_step_reporting() {
 		assertThat(afterStep.getName(), equalTo(LIFECYCLE_STEP_NAME));
 		assertThat(
 				afterStep.getCodeRef(),
-				equalTo(afterStoryCodeRef + String.format(STEP_PATTERN, LIFECYCLE_STEP_NAME))
+				equalTo(afterStoryCodeRef + String.format(AFTER_STORY_PATTERN, LIFECYCLE_STEP_NAME))
 		);
-		assertThat(afterStep.getType(), equalTo(ItemType.STEP.name()));
+		assertThat(afterStep.getType(), equalTo(ItemType.AFTER_SUITE.name()));
 
 		// Finish items verification
 		ArgumentCaptor<FinishTestItemRQ> finishStepCaptor = ArgumentCaptor.forClass(FinishTestItemRQ.class);

src/test/java/com/epam/reportportal/jbehave/lifecycle/BeforeScenarioFailedTest.java

@@ -114,9 +114,9 @@ public void verify_before_scenario_lifecycle_step_failure_reporting() {
 		StartTestItemRQ beforeStoryStart = beforeCaptor.getValue();
 		assertThat(beforeStoryStart.getName(), equalTo(LIFECYCLE_STEP_NAMES[0]));
 		assertThat(beforeStoryStart.getCodeRef(),
-				equalTo(beforeSuiteCodeRef + String.format(STEP_PATTERN, LIFECYCLE_STEP_NAMES[0]))
+				equalTo(beforeSuiteCodeRef + String.format(BEFORE_STORY_PATTERN, LIFECYCLE_STEP_NAMES[0]))
 		);
-		assertThat(beforeStoryStart.getType(), equalTo(ItemType.STEP.name()));
+		assertThat(beforeStoryStart.getType(), equalTo(ItemType.BEFORE_SUITE.name()));
 
 		String scenarioCodeRef = STORY_PATH + String.format(SCENARIO_PATTERN, SCENARIO_NAME);
 		StartTestItemRQ scenarioStart = storyStartItems.get(1);
@@ -163,10 +163,10 @@ public void verify_before_scenario_lifecycle_step_failure_reporting() {
 
 		StartTestItemRQ afterStoryStepStart = afterCaptor.getValue();
 		String afterStoryStepCodeRef =
-				afterStoryCodeRef + String.format(STEP_PATTERN, LIFECYCLE_STEP_NAMES[LIFECYCLE_STEP_NAMES.length - 1]);
+				afterStoryCodeRef + String.format(AFTER_STORY_PATTERN, LIFECYCLE_STEP_NAMES[LIFECYCLE_STEP_NAMES.length - 1]);
 		assertThat(afterStoryStepStart.getName(), equalTo(LIFECYCLE_STEP_NAMES[LIFECYCLE_STEP_NAMES.length - 1]));
 		assertThat(afterStoryStepStart.getCodeRef(), equalTo(afterStoryStepCodeRef));
-		assertThat(afterStoryStepStart.getType(), equalTo(ItemType.STEP.name()));
+		assertThat(afterStoryStepStart.getType(), equalTo(ItemType.AFTER_SUITE.name()));
 
 		// Finish items verification
 		ArgumentCaptor<FinishTestItemRQ> finishStepCaptor = ArgumentCaptor.forClass(FinishTestItemRQ.class);

src/test/java/com/epam/reportportal/jbehave/lifecycle/BeforeStepFailedTest.java

@@ -115,9 +115,9 @@ public void verify_before_step_lifecycle_step_failure_reporting() {
 		StartTestItemRQ beforeStoryStart = beforeCaptor.getValue();
 		assertThat(beforeStoryStart.getName(), equalTo(LIFECYCLE_STEP_NAMES[0]));
 		assertThat(beforeStoryStart.getCodeRef(),
-				equalTo(beforeSuiteCodeRef + String.format(STEP_PATTERN, LIFECYCLE_STEP_NAMES[0]))
+				equalTo(beforeSuiteCodeRef + String.format(BEFORE_STORY_PATTERN, LIFECYCLE_STEP_NAMES[0]))
 		);
-		assertThat(beforeStoryStart.getType(), equalTo(ItemType.STEP.name()));
+		assertThat(beforeStoryStart.getType(), equalTo(ItemType.BEFORE_SUITE.name()));
 
 		String scenarioCodeRef = STORY_PATH + String.format(SCENARIO_PATTERN, SCENARIO_NAME);
 		StartTestItemRQ scenarioStart = storyStartItems.get(1);
@@ -158,10 +158,10 @@ public void verify_before_step_lifecycle_step_failure_reporting() {
 
 		StartTestItemRQ afterStoryStepStart = afterCaptor.getValue();
 		String afterStoryStepCodeRef =
-				afterStoryCodeRef + String.format(STEP_PATTERN, LIFECYCLE_STEP_NAMES[LIFECYCLE_STEP_NAMES.length - 1]);
+				afterStoryCodeRef + String.format(AFTER_STORY_PATTERN, LIFECYCLE_STEP_NAMES[LIFECYCLE_STEP_NAMES.length - 1]);
 		assertThat(afterStoryStepStart.getName(), equalTo(LIFECYCLE_STEP_NAMES[LIFECYCLE_STEP_NAMES.length - 1]));
 		assertThat(afterStoryStepStart.getCodeRef(), equalTo(afterStoryStepCodeRef));
-		assertThat(afterStoryStepStart.getType(), equalTo(ItemType.STEP.name()));
+		assertThat(afterStoryStepStart.getType(), equalTo(ItemType.AFTER_SUITE.name()));
 
 		// Finish items verification
 		ArgumentCaptor<FinishTestItemRQ> finishStepCaptor = ArgumentCaptor.forClass(FinishTestItemRQ.class);

src/test/java/com/epam/reportportal/jbehave/lifecycle/BeforeStoryAnnotationFailedTest.java

@@ -100,10 +100,10 @@ public void verify_before_story_annotation_failed_method_reporting() {
 		assertThat(scenarioStart.getType(), equalTo(ItemType.SCENARIO.name()));
 
 		StartTestItemRQ beforeStep = startItems.get(2);
-		String beforeStepCodeRef = beforeStorySuiteCodeRef + String.format(STEP_PATTERN, BEFORE_STORY_NAME);
+		String beforeStepCodeRef = beforeStorySuiteCodeRef + String.format(BEFORE_STORY_PATTERN, BEFORE_STORY_NAME);
 		assertThat(beforeStep.getName(), equalTo(BEFORE_STORY_NAME));
 		assertThat(beforeStep.getCodeRef(), equalTo(beforeStepCodeRef));
-		assertThat(beforeStep.getType(), equalTo(ItemType.STEP.name()));
+		assertThat(beforeStep.getType(), equalTo(ItemType.BEFORE_SUITE.name()));
 
 		StartTestItemRQ step = startItems.get(3);
 		String stepCodeRef = scenarioCodeRef + String.format(STEP_PATTERN, STEP_NAME);

src/test/java/com/epam/reportportal/jbehave/lifecycle/BeforeStoryFailedTest.java

@@ -113,9 +113,9 @@ public void verify_before_story_lifecycle_step_failure_reporting() {
 		StartTestItemRQ beforeStoryStart = beforeCaptor.getValue();
 		assertThat(beforeStoryStart.getName(), equalTo(LIFECYCLE_STEP_NAMES[0]));
 		assertThat(beforeStoryStart.getCodeRef(),
-				equalTo(beforeSuiteCodeRef + String.format(STEP_PATTERN, LIFECYCLE_STEP_NAMES[0]))
+				equalTo(beforeSuiteCodeRef + String.format(BEFORE_STORY_PATTERN, LIFECYCLE_STEP_NAMES[0]))
 		);
-		assertThat(beforeStoryStart.getType(), equalTo(ItemType.STEP.name()));
+		assertThat(beforeStoryStart.getType(), equalTo(ItemType.BEFORE_SUITE.name()));
 
 		String scenarioCodeRef = STORY_PATH + String.format(SCENARIO_PATTERN, SCENARIO_NAME);
 		StartTestItemRQ scenarioStart = storyStartItems.get(1);
@@ -162,10 +162,10 @@ public void verify_before_story_lifecycle_step_failure_reporting() {
 
 		StartTestItemRQ afterStoryStepStart = afterCaptor.getValue();
 		String afterStoryStepCodeRef =
-				afterStoryCodeRef + String.format(STEP_PATTERN, LIFECYCLE_STEP_NAMES[LIFECYCLE_STEP_NAMES.length - 1]);
+				afterStoryCodeRef + String.format(AFTER_STORY_PATTERN, LIFECYCLE_STEP_NAMES[LIFECYCLE_STEP_NAMES.length - 1]);
 		assertThat(afterStoryStepStart.getName(), equalTo(LIFECYCLE_STEP_NAMES[LIFECYCLE_STEP_NAMES.length - 1]));
 		assertThat(afterStoryStepStart.getCodeRef(), equalTo(afterStoryStepCodeRef));
-		assertThat(afterStoryStepStart.getType(), equalTo(ItemType.STEP.name()));
+		assertThat(afterStoryStepStart.getType(), equalTo(ItemType.AFTER_SUITE.name()));
 
 		// Finish items verification
 		ArgumentCaptor<FinishTestItemRQ> finishStepCaptor = ArgumentCaptor.forClass(FinishTestItemRQ.class);

src/test/java/com/epam/reportportal/jbehave/lifecycle/BeforeStoryTest.java

@@ -94,9 +94,9 @@ public void verify_before_story_lifecycle_step_reporting() {
 		StartTestItemRQ beforeStoryStart = beforeCaptor.getValue();
 		assertThat(beforeStoryStart.getName(), equalTo(LIFECYCLE_STEP_NAME));
 		assertThat(beforeStoryStart.getCodeRef(),
-				equalTo(beforeSuiteCodeRef + String.format(STEP_PATTERN, LIFECYCLE_STEP_NAME))
+				equalTo(beforeSuiteCodeRef + String.format(BEFORE_STORY_PATTERN, LIFECYCLE_STEP_NAME))
 		);
-		assertThat(beforeStoryStart.getType(), equalTo(ItemType.STEP.name()));
+		assertThat(beforeStoryStart.getType(), equalTo(ItemType.BEFORE_SUITE.name()));
 
 		String scenarioCodeRef = STORY_PATH + String.format(SCENARIO_PATTERN, SCENARIO_NAME);
 		StartTestItemRQ scenarioStart = startItems.get(1);