diff --git a/plugins/rest-plugin/src/test/java/ru/sbtqa/tag/api/JunitTests.java b/plugins/rest-plugin/src/test/java/ru/sbtqa/tag/api/JunitTests.java index 89f97d2b..e024f171 100644 --- a/plugins/rest-plugin/src/test/java/ru/sbtqa/tag/api/JunitTests.java +++ b/plugins/rest-plugin/src/test/java/ru/sbtqa/tag/api/JunitTests.java @@ -8,6 +8,7 @@ import org.junit.Test; import ru.sbtqa.tag.api.annotation.ParameterType; import ru.sbtqa.tag.api.entries.apirequest.WithParamsEndpointEntry; +import ru.sbtqa.tag.api.entries.apirequest.WithParamsPlaceholdersEndpointEntry; import ru.sbtqa.tag.api.entries.fromfeature.FirstRequestFromFeatureEntry; import ru.sbtqa.tag.api.entries.methods.GetEndpointEntry; import ru.sbtqa.tag.api.utils.JettyServiceUtils; @@ -43,6 +44,23 @@ public void getWithParamsTest() { .validate("result with map", parameters); } + @Test + public void getWithParamsPlaceholdersTest() { + Map parameters = new HashMap<>(); + parameters.put("parameter-1", "parameter-value-1"); + parameters.put("parameter-2", "parameter-value-2"); + parameters.put("parameter-3", "Alex"); + parameters.put("header2", "header-value-2"); + + Map resultParameters = new HashMap<>(); + resultParameters.put("query-parameter-name-1", "new-parameter-value-1"); + resultParameters.put("header-parameter-name-1", "[{\"value\":\"parameter-value-2\", \"visible\":true, \"name\":\"Alex\"}]"); + resultParameters.put("header2", "header-value-2"); + + api.send(WithParamsPlaceholdersEndpointEntry.class, parameters) + .validate("result with map placeholders", resultParameters); + } + @Test public void FillOnTheFlyTest() { Map headers = new HashMap<>(); diff --git a/plugins/rest-plugin/src/test/java/ru/sbtqa/tag/api/entries/apirequest/WithParamsPlaceholdersEndpointEntry.java b/plugins/rest-plugin/src/test/java/ru/sbtqa/tag/api/entries/apirequest/WithParamsPlaceholdersEndpointEntry.java index 7d45160b..8add3f24 100644 --- a/plugins/rest-plugin/src/test/java/ru/sbtqa/tag/api/entries/apirequest/WithParamsPlaceholdersEndpointEntry.java +++ b/plugins/rest-plugin/src/test/java/ru/sbtqa/tag/api/entries/apirequest/WithParamsPlaceholdersEndpointEntry.java @@ -26,7 +26,11 @@ public class WithParamsPlaceholdersEndpointEntry extends EndpointEntry { @Validation(title = "result with datatable placeholders") public void validate(DataTable dataTable) { - Map data = dataTable.asMap(String.class, String.class); + validate(dataTable.asMap(String.class, String.class)); + } + + @Validation(title = "result with map placeholders") + public void validate(Map data) { String expectedResult = data.get(Default.QUERY_PARAMETER_NAME_1) + data.get(Default.HEADER_PARAMETER_NAME_1) + data.get("header2"); getResponse().body("result", equalTo(expectedResult)); }