From 6f3ad5d5ffe591533bbb3eeabc4edfe4285d1098 Mon Sep 17 00:00:00 2001 From: timofeevmd Date: Fri, 28 Jun 2024 20:06:53 +0400 Subject: [PATCH 1/2] Dockerfile was added Signed-off-by: timofeevmd --- src/test/java/requests/Queries.java | 45 +++++++++++++++++++++++------ src/test/resources/peers.csv | 10 +++---- 2 files changed, 41 insertions(+), 14 deletions(-) diff --git a/src/test/java/requests/Queries.java b/src/test/java/requests/Queries.java index 04e02c7..be3eb1a 100644 --- a/src/test/java/requests/Queries.java +++ b/src/test/java/requests/Queries.java @@ -15,9 +15,12 @@ public class Queries extends Constants { public static ChainBuilder queryPostFindAllDomains = exec(feed(CSV_FEEDER)).exec(feed(PEERS_FEEDER)) .exec( - http("findAllDomains query") - .post(session -> {return session.getString("peer");}) + .post(session -> { + String route = session.getString("peer") + "query"; + return route; + } + ) .body(ByteArrayBody(session -> { return SignedQuery.Companion.encode(QueryBuilder .findAllDomains() @@ -26,12 +29,20 @@ public class Queries extends Constants { } ) ) - ).exec(http("findAllDomains status").get(Constants.URL_STATUS).check(status().is(200))); + ).exec(http("findAllDomains status").get(session -> { + String route = session.getString("peer") + "status"; + return route; + } + ).check(status().is(200))); public static ChainBuilder queryPostFindAccountsByDomainId = exec(feed(CSV_FEEDER)).exec(feed(PEERS_FEEDER)) .exec( http("findAccountsByDomainId query") - .post(session -> {return session.getString("peer");}) + .post(session -> { + String route = session.getString("peer") + "query"; + return route; + } + ) .body(ByteArrayBody(session -> { return SignedQuery.Companion.encode(QueryBuilder .findAccountsByDomainId(ExtensionsKt.asDomainId(session.getString("domainIdSender"))) @@ -41,12 +52,20 @@ public class Queries extends Constants { ) ) - ).exec(http("findAccountsByDomainId status").get(Constants.URL_STATUS).check(status().is(200))); + ).exec(http("findAccountsByDomainId status").get(session -> { + String route = session.getString("peer") + "status"; + return route; + } + ).check(status().is(200))); public static ChainBuilder queryPostFindAllAssets = exec(feed(CSV_FEEDER)).exec(feed(PEERS_FEEDER)) .exec( http("findAllAssets query") - .post(session -> {return session.getString("peer");}) + .post(session -> { + String route = session.getString("peer") + "query"; + return route; + } + ) .body(ByteArrayBody(session -> { return SignedQuery.Companion.encode(QueryBuilder .findAllAssets() @@ -55,12 +74,18 @@ public class Queries extends Constants { } ) ) - ).exec(http("findAllAssets status").get(Constants.URL_STATUS).check(status().is(200))); + ).exec(http("findAllAssets status").get(session -> { + String route = session.getString("peer") + "status"; + return route; + } + ).check(status().is(200))); public static ChainBuilder queryPostFindAllTransactions = exec(feed(CSV_FEEDER)).exec(feed(PEERS_FEEDER)) .exec( http("findAllTransactions query") - .post(session -> {return session.getString("peer");}) + .post(session -> { + return session.getString("peer"); + }) .body(ByteArrayBody(session -> { return SignedQuery.Companion.encode(QueryBuilder .findAllTransactions(null) @@ -69,5 +94,7 @@ public class Queries extends Constants { } ) ) - ).exec(http("findAllTransactions status").get(Constants.URL_STATUS).check(status().is(200))); + ).exec(http("findAllTransactions status").get(session -> { + return session.getString("status"); + }).check(status().is(200))); } diff --git a/src/test/resources/peers.csv b/src/test/resources/peers.csv index 0af6433..e0f2010 100644 --- a/src/test/resources/peers.csv +++ b/src/test/resources/peers.csv @@ -1,6 +1,6 @@ peer -/peer-0/query -/peer-1/query -/peer-2/query -/peer-3/query -/peer-4/query \ No newline at end of file +/peer-0/ +/peer-1/ +/peer-2/ +/peer-3/ +/peer-4/ \ No newline at end of file From 66bb3ccfda9fa0fdfcf8b89f219175603c2644df Mon Sep 17 00:00:00 2001 From: timofeevmd Date: Mon, 1 Jul 2024 10:57:25 +0400 Subject: [PATCH 2/2] update queries flow Signed-off-by: timofeevmd --- src/test/java/requests/Queries.java | 94 +++++++++++------------------ 1 file changed, 34 insertions(+), 60 deletions(-) diff --git a/src/test/java/requests/Queries.java b/src/test/java/requests/Queries.java index be3eb1a..767e447 100644 --- a/src/test/java/requests/Queries.java +++ b/src/test/java/requests/Queries.java @@ -14,87 +14,61 @@ public class Queries extends Constants { public static ChainBuilder queryPostFindAllDomains = exec(feed(CSV_FEEDER)).exec(feed(PEERS_FEEDER)) - .exec( - http("findAllDomains query") - .post(session -> { - String route = session.getString("peer") + "query"; - return route; - } - ) - .body(ByteArrayBody(session -> { - return SignedQuery.Companion.encode(QueryBuilder - .findAllDomains() - .account(ExtensionsKt.asAccountId(session.getString("anotherDevAccountIdSender"))) - .buildSigned(Constants.ALICE_KEYPAIR).getQuery()); - } - ) - ) - ).exec(http("findAllDomains status").get(session -> { - String route = session.getString("peer") + "status"; - return route; - } - ).check(status().is(200))); + .exec(http("findAllDomains query") + .post(session -> { + return session.getString("peer") + "query"; + }) + .body(ByteArrayBody(session -> { + return SignedQuery.Companion.encode(QueryBuilder + .findAllDomains() + .account(ExtensionsKt.asAccountId(session.getString("anotherDevAccountIdSender"))) + .buildSigned(Constants.ALICE_KEYPAIR).getQuery()); + })) + ); public static ChainBuilder queryPostFindAccountsByDomainId = exec(feed(CSV_FEEDER)).exec(feed(PEERS_FEEDER)) .exec( http("findAccountsByDomainId query") .post(session -> { - String route = session.getString("peer") + "query"; - return route; + return session.getString("peer") + "query"; } ) .body(ByteArrayBody(session -> { - return SignedQuery.Companion.encode(QueryBuilder - .findAccountsByDomainId(ExtensionsKt.asDomainId(session.getString("domainIdSender"))) - .account(ExtensionsKt.asAccountId(session.getString("anotherDevAccountIdSender"))) - .buildSigned(Constants.ALICE_KEYPAIR).getQuery()); - } - ) - ) + return SignedQuery.Companion.encode(QueryBuilder + .findAccountsByDomainId(ExtensionsKt.asDomainId(session.getString("domainIdSender"))) + .account(ExtensionsKt.asAccountId(session.getString("anotherDevAccountIdSender"))) + .buildSigned(Constants.ALICE_KEYPAIR).getQuery()); + })) - ).exec(http("findAccountsByDomainId status").get(session -> { - String route = session.getString("peer") + "status"; - return route; - } - ).check(status().is(200))); + ); public static ChainBuilder queryPostFindAllAssets = exec(feed(CSV_FEEDER)).exec(feed(PEERS_FEEDER)) .exec( http("findAllAssets query") .post(session -> { - String route = session.getString("peer") + "query"; - return route; + return session.getString("peer") + "query"; } ) .body(ByteArrayBody(session -> { - return SignedQuery.Companion.encode(QueryBuilder - .findAllAssets() - .account(ExtensionsKt.asAccountId(session.getString("anotherDevAccountIdSender"))) - .buildSigned(Constants.ALICE_KEYPAIR).getQuery()); - } - ) - ) - ).exec(http("findAllAssets status").get(session -> { - String route = session.getString("peer") + "status"; - return route; - } - ).check(status().is(200))); + return SignedQuery.Companion.encode(QueryBuilder + .findAllAssets() + .account(ExtensionsKt.asAccountId(session.getString("anotherDevAccountIdSender"))) + .buildSigned(Constants.ALICE_KEYPAIR).getQuery()); + })) + ); public static ChainBuilder queryPostFindAllTransactions = exec(feed(CSV_FEEDER)).exec(feed(PEERS_FEEDER)) .exec( http("findAllTransactions query") .post(session -> { - return session.getString("peer"); - }) - .body(ByteArrayBody(session -> { - return SignedQuery.Companion.encode(QueryBuilder - .findAllTransactions(null) - .account(ExtensionsKt.asAccountId(session.getString("anotherDevAccountIdSender}"))) - .buildSigned(Constants.ALICE_KEYPAIR).getQuery()); - } - ) + return session.getString("peer") + "query"; + } ) - ).exec(http("findAllTransactions status").get(session -> { - return session.getString("status"); - }).check(status().is(200))); + .body(ByteArrayBody(session -> { + return SignedQuery.Companion.encode(QueryBuilder + .findAllTransactions(null) + .account(ExtensionsKt.asAccountId(session.getString("anotherDevAccountIdSender}"))) + .buildSigned(Constants.ALICE_KEYPAIR).getQuery()); + })) + ); }