Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
  • Loading branch information
kulgg committed Feb 2, 2024
1 parent 3de6262 commit 08810b5
Showing 1 changed file with 5 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,7 @@ class DataSourceQueryParamsTest {
private EdcClient providerClient;
private EdcClient consumerClient;
private MockDataAddressRemote dataAddress;
private final String dateParam = "since=2023-10-13T00:00:00.000Z";
private final String encodedDateParam = "since=2023-10-13T00%3A00%3A00.000Z";
private final String doubleEncodedDateParam = "since=2023-10-13T00%253A00%253A00.000Z";
private final String encodedParam = "a=%25"; // Unencoded param "a=%"
private final String dataOfferId = "my-data-offer-2023-11";

@BeforeEach
Expand Down Expand Up @@ -103,13 +101,10 @@ void setup() {
void testDirectQuerying() {
// arrange
var paramUrl = String.format("%s?{k}={v}", dataAddress.getDataSourceQueryParamsUrl());
var splitParam = dateParam.split("=");
var paramKey = splitParam[0];
var paramValue = splitParam[1];

// act
// assert
validateDataTransferred(paramUrl, encodedDateParam, paramValue, paramKey);
validateDataTransferred(paramUrl, encodedParam, "a", "%");
}

/**
Expand All @@ -121,6 +116,7 @@ void testQueryParamsDoubleEncoded() {
createPolicy();
createAsset();
createContractDefinition();
String doubleEncodedParam = "a=%2525";

// act
var dataOffers = consumerClient.uiApi().getCatalogPageDataOffers(getProtocolEndpoint(providerConnector));
Expand All @@ -129,7 +125,7 @@ void testQueryParamsDoubleEncoded() {
initiateTransfer(negotiation);

// assert
validateDataTransferred(dataAddress.getDataSinkSpyUrl(), doubleEncodedDateParam);
validateDataTransferred(dataAddress.getDataSinkSpyUrl(), doubleEncodedParam);
}

private void createAsset() {
Expand All @@ -140,7 +136,7 @@ private void createAsset() {
Prop.Edc.TYPE, "HttpData",
Prop.Edc.METHOD, "GET",
Prop.Edc.BASE_URL, dataAddress.getDataSourceQueryParamsUrl(),
"https://w3id.org/edc/v0.0.1/ns/queryParams", encodedDateParam
"https://w3id.org/edc/v0.0.1/ns/queryParams", encodedParam
))
.build();

Expand Down

0 comments on commit 08810b5

Please sign in to comment.