-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #49 from reportportal/develop
Release
- Loading branch information
Showing
25 changed files
with
288 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -54,7 +54,7 @@ jobs: | |
| java-version: '8' | ||
|
|
||
| - name: Setup git credentials | ||
| uses: oleksiyrudenko/gha-git-credentials@v2.1.1 | ||
| uses: oleksiyrudenko/gha-git-credentials@v2-latest | ||
| with: | ||
| name: 'reportportal.io' | ||
| email: '[email protected]' | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
81 changes: 81 additions & 0 deletions
81
...portportal/spock/description/ConditionNotSatisfiedErrorMessageWithoutDescriptionTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| package com.epam.reportportal.spock.description; | ||
|
|
||
| import com.epam.reportportal.listeners.ItemStatus; | ||
| import com.epam.reportportal.service.ReportPortal; | ||
| import com.epam.reportportal.service.ReportPortalClient; | ||
| import com.epam.reportportal.spock.ReportPortalSpockListener; | ||
| import com.epam.reportportal.spock.features.fail.HelloSpockSpecFailed; | ||
| import com.epam.reportportal.spock.utils.TestExtension; | ||
| import com.epam.reportportal.spock.utils.TestUtils; | ||
| import com.epam.reportportal.util.test.CommonUtils; | ||
| import com.epam.ta.reportportal.ws.model.FinishTestItemRQ; | ||
| import org.apache.commons.lang3.tuple.Pair; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.platform.launcher.listeners.TestExecutionSummary; | ||
| import org.mockito.ArgumentCaptor; | ||
|
|
||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
| import java.util.stream.Stream; | ||
|
|
||
| import static com.epam.reportportal.spock.utils.TestUtils.runClasses; | ||
| import static com.epam.reportportal.spock.utils.TestUtils.standardParameters; | ||
| import static com.epam.reportportal.spock.utils.TestUtils.testExecutor; | ||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.hamcrest.Matchers.equalTo; | ||
| import static org.hamcrest.Matchers.hasSize; | ||
| import static org.hamcrest.Matchers.is; | ||
| import static org.hamcrest.Matchers.nullValue; | ||
| import static org.hamcrest.Matchers.startsWith; | ||
| import static org.mockito.ArgumentMatchers.eq; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.verify; | ||
|
|
||
| public class ConditionNotSatisfiedErrorMessageWithoutDescriptionTest { | ||
|
|
||
| private final String classId = CommonUtils.namedId("class_"); | ||
| private final String methodId = CommonUtils.namedId("method_"); | ||
| private final List<String> nestedSteps = Stream.generate(() -> CommonUtils.namedId("method_")).limit(3).collect(Collectors.toList()); | ||
| private final List<Pair<String, String>> nestedStepsLink = nestedSteps.stream().map(s -> Pair.of(methodId, s)).collect(Collectors.toList()); | ||
|
|
||
| private final ReportPortalClient client = mock(ReportPortalClient.class); | ||
|
|
||
| private static final String ERROR_DESCRIPTION = "Error:\nCondition not satisfied:\nname.size() == length\n| | | |\n| 6 | 7\nScotty false\n"; | ||
|
|
||
|
|
||
| @BeforeEach | ||
| public void setupMock() { | ||
| TestUtils.mockLaunch(client, null, classId, methodId); | ||
| TestUtils.mockNestedSteps(client, nestedStepsLink); | ||
| TestUtils.mockBatchLogging(client); | ||
| TestExtension.listener = new ReportPortalSpockListener(ReportPortal.create(client, standardParameters(), testExecutor())); | ||
| } | ||
|
|
||
| @Test | ||
| public void verify_error_condition_not_satisfied_message_without_description() { | ||
|
|
||
| TestExecutionSummary result = runClasses(HelloSpockSpecFailed.class); | ||
|
|
||
| assertThat(result.getTotalFailureCount(), equalTo(1L)); | ||
|
|
||
| ArgumentCaptor<FinishTestItemRQ> finishNestedStepCaptor = ArgumentCaptor.forClass(FinishTestItemRQ.class); | ||
| nestedSteps.forEach(s -> verify(client).finishTestItem(eq(s), finishNestedStepCaptor.capture())); | ||
|
|
||
| List<FinishTestItemRQ> passedFinishItemStatuses = finishNestedStepCaptor.getAllValues().stream() | ||
| .filter(finishTestItemRQ -> finishTestItemRQ.getStatus().equals(ItemStatus.PASSED.name())) | ||
| .collect(Collectors.toList()); | ||
|
|
||
| assertThat(passedFinishItemStatuses, hasSize(2)); | ||
|
|
||
| passedFinishItemStatuses.forEach(finishTestItemRQ -> assertThat(finishTestItemRQ.getDescription(), is(nullValue()))); | ||
|
|
||
| List<FinishTestItemRQ> failedFinishItemStatuses = finishNestedStepCaptor.getAllValues().stream() | ||
| .filter(finishTestItemRQ -> finishTestItemRQ.getStatus().equals(ItemStatus.FAILED.name())) | ||
| .collect(Collectors.toList()); | ||
|
|
||
| assertThat(failedFinishItemStatuses, hasSize(1)); | ||
|
|
||
| assertThat(failedFinishItemStatuses.iterator().next().getDescription(), startsWith(ERROR_DESCRIPTION)); | ||
| } | ||
| } |
64 changes: 64 additions & 0 deletions
64
...ovy/com/epam/reportportal/spock/description/ExceptionErrorMessageWithDescriptionTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| package com.epam.reportportal.spock.description; | ||
|
|
||
| import com.epam.reportportal.listeners.ItemStatus; | ||
| import com.epam.reportportal.service.ReportPortal; | ||
| import com.epam.reportportal.service.ReportPortalClient; | ||
| import com.epam.reportportal.spock.ReportPortalSpockListener; | ||
| import com.epam.reportportal.spock.features.fail.FailsInDifferentMethod; | ||
| import com.epam.reportportal.spock.utils.TestExtension; | ||
| import com.epam.reportportal.spock.utils.TestUtils; | ||
| import com.epam.reportportal.util.test.CommonUtils; | ||
| import com.epam.ta.reportportal.ws.model.FinishTestItemRQ; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.platform.launcher.listeners.TestExecutionSummary; | ||
| import org.mockito.ArgumentCaptor; | ||
|
|
||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
| import java.util.stream.Stream; | ||
|
|
||
| import static com.epam.reportportal.spock.utils.TestUtils.runClasses; | ||
| import static com.epam.reportportal.spock.utils.TestUtils.standardParameters; | ||
| import static com.epam.reportportal.spock.utils.TestUtils.testExecutor; | ||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.hamcrest.Matchers.*; | ||
| import static org.mockito.ArgumentMatchers.eq; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.verify; | ||
|
|
||
| public class ExceptionErrorMessageWithDescriptionTest { | ||
|
|
||
| private final String launchId = CommonUtils.namedId("launch_"); | ||
| private final String classId = CommonUtils.namedId("class_"); | ||
| private final List<String> methodIds = Stream.generate(() -> CommonUtils.namedId("method_")).limit(1).collect(Collectors.toList()); | ||
|
|
||
| private final ReportPortalClient client = mock(ReportPortalClient.class); | ||
|
|
||
| private static final String ERROR_DESCRIPTION_EXCEPTION = "Setup: \n\n---\n\nError:\njava.lang.IllegalStateException: Some test flow failure"; | ||
|
|
||
| @BeforeEach | ||
| public void setupMock() { | ||
| TestUtils.mockLaunch(client, launchId, classId, methodIds); | ||
| TestUtils.mockBatchLogging(client); | ||
| TestExtension.listener = new ReportPortalSpockListener(ReportPortal.create(client, standardParameters(), testExecutor())); | ||
| } | ||
|
|
||
| @Test | ||
| public void verify_error_exception_message_with_description() { | ||
| TestExecutionSummary result = runClasses(FailsInDifferentMethod.class); | ||
|
|
||
| assertThat(result.getTotalFailureCount(), equalTo(1L)); | ||
|
|
||
| ArgumentCaptor<FinishTestItemRQ> finishStepCaptor = ArgumentCaptor.forClass(FinishTestItemRQ.class); | ||
|
|
||
| methodIds.forEach(s -> verify(client).finishTestItem(eq(s), finishStepCaptor.capture())); | ||
|
|
||
| List<FinishTestItemRQ> failedFinishItemStatuses = finishStepCaptor.getAllValues().stream() | ||
| .filter(fis -> fis.getStatus().equals(ItemStatus.FAILED.name())) | ||
| .collect(Collectors.toList()); | ||
|
|
||
| assertThat(failedFinishItemStatuses, hasSize(1)); | ||
| assertThat(failedFinishItemStatuses.iterator().next().getDescription(), startsWith(ERROR_DESCRIPTION_EXCEPTION)); | ||
| } | ||
| } |
65 changes: 65 additions & 0 deletions
65
.../epam/reportportal/spock/description/ExceptionWithoutErrorMessageWithDescriptionTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| package com.epam.reportportal.spock.description; | ||
|
|
||
| import com.epam.reportportal.listeners.ItemStatus; | ||
| import com.epam.reportportal.service.ReportPortal; | ||
| import com.epam.reportportal.service.ReportPortalClient; | ||
| import com.epam.reportportal.spock.ReportPortalSpockListener; | ||
| import com.epam.reportportal.spock.features.fail.FailWithExceptionWithoutMessage; | ||
| import com.epam.reportportal.spock.utils.TestExtension; | ||
| import com.epam.reportportal.spock.utils.TestUtils; | ||
| import com.epam.reportportal.util.test.CommonUtils; | ||
| import com.epam.ta.reportportal.ws.model.FinishTestItemRQ; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.platform.launcher.listeners.TestExecutionSummary; | ||
| import org.mockito.ArgumentCaptor; | ||
|
|
||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
| import java.util.stream.Stream; | ||
|
|
||
| import static com.epam.reportportal.spock.utils.TestUtils.runClasses; | ||
| import static com.epam.reportportal.spock.utils.TestUtils.standardParameters; | ||
| import static com.epam.reportportal.spock.utils.TestUtils.testExecutor; | ||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.hamcrest.Matchers.*; | ||
| import static org.mockito.ArgumentMatchers.eq; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.verify; | ||
|
|
||
| public class ExceptionWithoutErrorMessageWithDescriptionTest { | ||
|
|
||
| private final String launchId = CommonUtils.namedId("launch_"); | ||
| private final String classId = CommonUtils.namedId("class_"); | ||
| private final List<String> methodIds = Stream.generate(() -> CommonUtils.namedId("method_")).limit(1).collect(Collectors.toList()); | ||
|
|
||
| private final ReportPortalClient client = mock(ReportPortalClient.class); | ||
|
|
||
| private static final String ERROR_DESCRIPTION_EXCEPTION = "Setup: \nWhen: \nThen: \n\n---\n\nError:\njava.util.NoSuchElementException"; | ||
|
|
||
| @BeforeEach | ||
| public void setupMock() { | ||
| TestUtils.mockLaunch(client, launchId, classId, methodIds); | ||
| TestUtils.mockBatchLogging(client); | ||
| TestExtension.listener = new ReportPortalSpockListener(ReportPortal.create(client, standardParameters(), testExecutor())); | ||
| } | ||
|
|
||
| @Test | ||
| public void verify_exception_without_error_message_with_description() { | ||
| TestExecutionSummary result = runClasses(FailWithExceptionWithoutMessage.class); | ||
|
|
||
| assertThat(result.getTotalFailureCount(), equalTo(1L)); | ||
|
|
||
| ArgumentCaptor<FinishTestItemRQ> finishStepCaptor = ArgumentCaptor.forClass(FinishTestItemRQ.class); | ||
|
|
||
| methodIds.forEach(s -> verify(client).finishTestItem(eq(s), finishStepCaptor.capture())); | ||
|
|
||
| List<FinishTestItemRQ> failedFinishItemStatuses = finishStepCaptor.getAllValues() | ||
| .stream() | ||
| .filter(fis -> fis.getStatus().equals(ItemStatus.FAILED.name())) | ||
| .collect(Collectors.toList()); | ||
|
|
||
| assertThat(failedFinishItemStatuses, hasSize(1)); | ||
| assertThat(failedFinishItemStatuses.iterator().next().getDescription(), startsWith(ERROR_DESCRIPTION_EXCEPTION)); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.