From 780dd4fa7c8563b7080ee3be708775518c14ae26 Mon Sep 17 00:00:00 2001 From: Lozana Enbah Date: Thu, 9 Mar 2023 14:38:40 +0300 Subject: [PATCH 1/7] changes --- pom.xml | 46 ++++++++++++++++++ src/main/java/helpers/DataHelper.java | 4 ++ src/test/java/getRequests/GetTestCases.java | 26 ++++++++++ src/test/java/postRequests/PostTestCase.java | 43 ++++++++++++++++ target/classes/helpers/DataHelper.class | Bin 0 -> 271 bytes .../getRequests/GetTestCases.class | Bin 0 -> 2142 bytes .../postRequests/PostTestCase.class | Bin 0 -> 2452 bytes 7 files changed, 119 insertions(+) create mode 100644 pom.xml create mode 100644 src/main/java/helpers/DataHelper.java create mode 100644 src/test/java/getRequests/GetTestCases.java create mode 100644 src/test/java/postRequests/PostTestCase.java create mode 100644 target/classes/helpers/DataHelper.class create mode 100644 target/test-classes/getRequests/GetTestCases.class create mode 100644 target/test-classes/postRequests/PostTestCase.class diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..6b8168c --- /dev/null +++ b/pom.xml @@ -0,0 +1,46 @@ + + + 4.0.0 + + groupId + code-challenge + 1.0-SNAPSHOT + + 11 + 11 + + + + + org.bitbucket.mawdoo3 + mawdoo3-automation-test + 1.27.0 + + + + io.rest-assured + rest-assured + 4.5.1 + test + + + + + org.json + json + 20160810 + + + + com.googlecode.json-simple + json-simple + 1.1.1 + + + + + + + \ No newline at end of file diff --git a/src/main/java/helpers/DataHelper.java b/src/main/java/helpers/DataHelper.java new file mode 100644 index 0000000..ba7a3f3 --- /dev/null +++ b/src/main/java/helpers/DataHelper.java @@ -0,0 +1,4 @@ +package helpers; + +public class DataHelper { +} diff --git a/src/test/java/getRequests/GetTestCases.java b/src/test/java/getRequests/GetTestCases.java new file mode 100644 index 0000000..9939ff7 --- /dev/null +++ b/src/test/java/getRequests/GetTestCases.java @@ -0,0 +1,26 @@ +package getRequests; + +import io.restassured.RestAssured; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; +import org.json.simple.JSONObject; +import org.testng.annotations.Test; + +import static io.restassured.RestAssured.given; + +public class GetTestCases { + + + @Test + public void testPostMethod() { + RestAssured.baseURI = "https://www.almosafer.com/api/enigma/search"; + + given() + .header("Authorization","eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.NGdyNzFSeHU5WS9LQ2gxdkZSL2NNZGx0OW5Sbnl3VXlFS0NGQmhqRy9wYzBzaG03MUJlbStWb0JjNUd0amN4akdWRWdCbnRjS1g2aUVrZmZ6alZNL1lpK09ER0Y1azJ5T0VGNUZRZzc0RUtHeTdkSXpwYnhJck5Ld3dXVmxRWG9GYXo0QmpTNDhlMzErNUlGM3NDQmMzaGFNM0V3d24wTGk0d2NmTG9LSFFhTGRnYVdGM0lLVTQyMXpCcjFYTEVuNGN1RmFnNWltNG5OMFBGY0gzT1JiMUpXYTBDNkhvcm1SZXdMbWxnbGxsMW5qbU5FMy9sam1VSGZEbUo4NG5jS2xFdTBabWlJK2RBcXNQZ0dnVDNwbEFVVVF5bDMyNVBzejh4TCs1MmFERXUrNzNuUnJvcFcyeGlqREtwb25reUZLZi83UlFoR0g5UVA4UFlyOTlDK3J0YlplTVp0Vm5heU05NU9aS2xsdTVBcDFWdmZhcWdKRFNScjcvRkd6Znk1NkJpS0JhYTVIZzQwaENpbkdKbk1pQT09.n7aHpl6an_A-EdW3I_rHsxBUBdAL3lh1QK-Z3SFJd3s") + .when() + .get("/poll/12273209-a6ea-479b-b234-349b949ad0ba") + .then() + .log().all().assertThat().statusCode(200); + } + +} diff --git a/src/test/java/postRequests/PostTestCase.java b/src/test/java/postRequests/PostTestCase.java new file mode 100644 index 0000000..3f5ad9a --- /dev/null +++ b/src/test/java/postRequests/PostTestCase.java @@ -0,0 +1,43 @@ +package postRequests; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; +import org.json.simple.JSONObject; +import org.testng.annotations.Test; + +import static io.restassured.RestAssured.given; + +public class PostTestCase { + + @Test + public void testPostMethod() { + RestAssured.baseURI = "https://www.almosafer.com/api/enigma/search"; + /*JSONObject requestBody = new JSONObject(); + requestBody.put("checkIn", "2023-03-23"); + requestBody.put("checkOut", "2023-03-24"); + requestBody.put("checkOut", "2023-03-24"); + requestBody.put("adultsCount","2"); + requestBody.put("kidsAges","2"); + requestBody.put("searchInfo", "null"); + requestBody.put("crossSellDetail", "null"); + requestBody.put("placeId", "ChIJr4F5XbhfGxUR6GXc-MAwHGM");*/ + + given() + + .header("Authorization", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.NGdyNzFSeHU5WS9LQ2gxdkZSL2NNZGx0OW5Sbnl3VXlFS0NGQmhqRy9wYzBzaG03MUJlbStWb0JjNUd0amN4akdWRWdCbnRjS1g2aUVrZmZ6alZNL1lpK09ER0Y1azJ5T0VGNUZRZzc0RUtHeTdkSXpwYnhJck5Ld3dXVmxRWG9GYXo0QmpTNDhlMzErNUlGM3NDQmMzaGFNM0V3d24wTGk0d2NmTG9LSFFhTGRnYVdGM0lLVTQyMXpCcjFYTEVuNGN1RmFnNWltNG5OMFBGY0gzT1JiMUpXYTBDNkhvcm1SZXdMbWxnbGxsMW5qbU5FMy9sam1VSGZEbUo4NG5jS2xFdTBabWlJK2RBcXNQZ0dnVDNwbEFVVVF5bDMyNVBzejh4TCs1MmFERXUrNzNuUnJvcFcyeGlqREtwb25reUZLZi83UlFoR0g5UVA4UFlyOTlDK3J0YlplTVp0Vm5heU05NU9aS2xsdTVBcDFWdmZhcWdKRFNScjcvRkd6Znk1NkJpS0JhYTVIZzQwaENpbkdKbk1pQT09.n7aHpl6an_A-EdW3I_rHsxBUBdAL3lh1QK-Z3SFJd3s' ") + .body("{\n" + + " \"checkIn\": \"2023-03-23\",\n" + + " \"checkOut\": \"2023-03-24\",\n" + + " \"roomsInfo\": [\n" + + " {\n" + + " \"adultsCount\": 2,\n" + + " \"kidsAges\": []\n" + + " }\n" + + " ],\n" + + " \"searchInfo\": null,\n" + + " \"crossSellDetail\": null,\n" + + " \"placeId\": \"ChIJr4F5XbhfGxUR6GXc-MAwHGM\"\n" + + "}").post("/async") + .then().log().all().assertThat().statusCode(200); + + } +} diff --git a/target/classes/helpers/DataHelper.class b/target/classes/helpers/DataHelper.class new file mode 100644 index 0000000000000000000000000000000000000000..ee3e36c72c830335ad548c71b87a28059347f37a GIT binary patch literal 271 zcmZWj%?`m}5S*?4P^BVXzzqjIIuI8k4h;w5{7D1Z6k58n@nbA zcQ*TaKb`;vXxJ#BW}$AuC72@>t87dtb-EjZK1sHc;QA_-i_0;P=~@I4J54_cMYIvA z%JtXOv%NYKTK--}Cz+nTsmR2<;6sAFN-k+AXDZLTzfu1nuEK#1gU|ja35|Tgi$uKh wmcc=W8QReJ>AZ-WlZ+-Suh4+eyMu0QXs{Sfw!wiiqf>AL71*o@RYncY2lJ~pwg3PC literal 0 HcmV?d00001 diff --git a/target/test-classes/getRequests/GetTestCases.class b/target/test-classes/getRequests/GetTestCases.class new file mode 100644 index 0000000000000000000000000000000000000000..7f7e811d4e7b5aca17dfb1f921d98a5462b34541 GIT binary patch literal 2142 zcmbVNS$Eq+6u!z*r-{3zg)UHN%a*nzk{2a)TMFK!*pbJzHrwK%XSCFktu2xq$NnGu z5DpIz&Vj=thabgZiACb zjDp3D`zi%X)xfkUxFk5fg~pz4MKac1Vp$gg1G_4YoK!zCE+w`TQ*cWdScz!ukF7X~ zY2Hd?GO6O&il0z$F(JzHAWm9VVh1J#H^s4^IG&|Cu|uHBz8@qwaRQ$p-4=pqK&Kx5 zfX1gQbc#s8R;6GZ85ZZHl&-uQX={iNa2Bq?dlWphlO&8E)AVFA*}|?D#Q3EZZ5e?_ z!}K z4PRu9YGb=G3VUj`S=vIpIYl#0vUU}=E0u&!esE}xG)c%Kr16JLyUR+t?-taa%SjC4 zJD$BSPD_*itTMwqQ)nqoSC^8m&NPQeF&XTkA|9Dtv1?X!UmQxgK^`k=q3}t>K%$*zQp%?0n_n9 z8P#mJHLFKRarssO)jD2_aN$skQ440iIFb1gW9E@3^CdyzI9ujLzpt8ni*W^2?o3;~ zuxbpszFb$wh(|fm<9yV06U4La7FXf>%wQ(xnodgzdwsc5LnHgZ@N$yYGh2H1(AW9H zxYcF%b%o_x(^8DRoGS5JT~~r4!5B*UL(Y^dSns;cy}Vd4dZ?o@rmxn}M6YwIs&cGe zYfX__nOQ@-C|BcL%j4=|Pl?bBjTOInU~tCN;@y3*o=o&S8(E4bXwIX8;&Oq=3|K`i z7ZuK(wq>`rS7(`=(_?ui_djG=KLj?8V% zALY=f8A?pk?#pUJn{_6*jzWE8?&+gk*pZpimcN5{Lw6hdFUp&Bvs-Aqh<4+{ic&Gl zLcz6joxM%1AaPBzK#JgUdX;GxlM-m_L(51q@FWXQ;j1h>OYi6dIt*Nw&gJtvg*;Q* z#M>6$Ebf%_O+8;IZWf9qy;Lk=lhH{*d=1}FaK{Pgh*S`c<8fq}={zL$X3^rwBnxGz zkiz-5|5WTcCQj1QKXs`>Ed%u|a8SttpNd^*P;lelngMAPui+D{qTDvQW81-fRz67z&Wsd3fPVN!fP;bXc^8+$C%eF+0(ocNv|4-f9{=~NOQC;Y+4Zo z?#5Y4uUL+c>B+ZeP5+PU(!@@;x=1of!Sgr7{x6Zv9CACHcUh7P(zjFm?X#);$LS3x ze(JyI27`BY7lJ{0CM10RwWD}j&=W6`4D7n(0U%e{iW1qzBr~hzMknL=_{rMYXq-v* z+kpSx4cvvRuZbf8)T2*0!7A)M{tQE z>z7ZIEA#OR{C))M3(!5KaSv8V$jh({>qK59fv>?GA~#5Q2Cf4l1WzfpPbhwPvVq%k Lx*rj_03ZJadf9VX literal 0 HcmV?d00001 diff --git a/target/test-classes/postRequests/PostTestCase.class b/target/test-classes/postRequests/PostTestCase.class new file mode 100644 index 0000000000000000000000000000000000000000..8fc1526b95a40f843f42d2addb26c96c514e44e1 GIT binary patch literal 2452 zcmbVO>2uRY6o1NrLt+Y~2UnrNJqSl)`ARTQT3=G^SPItVgJGD}5li;!h$P3cJNy;> zOFI3~rZesIW2b*qrz^*hlmJuM4{zVTx9_(gVYk7hx8I;ARB49NNmJllY%pk zEXN8TQ!u-FTcKdC>ldm%FH$DIgjb%dN&s%}*KUP~#}^6NaSkN7bo8e4L%Ddy{qboW5-cf@*{=R52Hz0=Hzs)I91 z3o|0kvklwa6Gr)Adt4kNmdwomJ6-j>*WU1S(jVg;wI=qyL$ zx*|13T+1tIJ*F*HlmXB3DZyqOzKKJg&FyeZk!{o6v6QM=ob0vQQnAeU&3(;IiJg|t zsm%jNWe)}Cl@PfQ;$x>Q7J6W6xWLQ!k+jSj6lN|_(3 z6-H4MCa0FU5w8@-M$gPjr69%GOhstPK0oFMvQyjF7;R**cu%N=Lp7cA4Y^bASobqB zW?X^p=47Ril^HzRk#KoCQ={A1!;<3Bik&kJna=TY9uXdaE-6K=%rteoV`@!(TVQxm z>uLK!U*G6B{S@D?c_Lji+mcf4j2lB#;XSplZ>#;3*O2J^y0eM4JiLLN=Y_S3-po{= z`&+?5Q7-C*dIp=R#`an#BQiBT6Wm&%;6iknlNgaC*in0i7RKP)I6Q{$C@S{D;tFXA z%`~)r)k!>9Nu=p?W{u9Qr89|pC!9Nj@IT({ORw*`Ho3#QE^$Ad1Vo5OxRDmM1kwjM z3`#D^RWdDo1bpNp-oB*=g{~1q2+v+YyqIXurX-H?Yr2jz!1yIO-wguMz_@IL$if8T zgww-FGpafBzJ~&-Ur7{<94!t-C{eIt zxk;Z?3KRqb-_Rr7BXz|{3R5KxWvGw>@wRyi!j_K0sKy;p@-aCkFqiG=B@F~EnrzxGV9Nor;PfwdZjO(20>LUu+H>~=BfYG5) z@Z=4E|A+Lc3$x=*UM8}w$)icq!SF-LL}X_cNp^$-lGxEZzqwjHwaxDWe)%|Lzw--FKTX`1i99ngo`ow!j~`8dt8k5sDEOQN&rE`Ugt>{Yu{`rL%>D{<%k#@; zW`Bp+AuP Date: Thu, 9 Mar 2023 16:01:59 +0300 Subject: [PATCH 2/7] changes --- src/main/java/helpers/ConfigReader.java | 35 +++++++++ src/main/java/helpers/DataHelper.java | 68 ++++++++++++++++++ src/main/java/jasonData/PostJasonData.java | 18 +++++ src/main/resources/config.properties | 2 + src/main/resources/test | 0 src/test/java/getRequests/GetTestCases.java | 8 ++- src/test/java/postRequests/PostTestCase.java | 38 +++++----- src/test/resources/TestData.xml | 18 +++++ target/classes/config.properties | 2 + target/classes/helpers/ConfigReader.class | Bin 0 -> 1881 bytes target/classes/helpers/DataHelper.class | Bin 271 -> 3037 bytes target/classes/jasonData/PostJasonData.class | Bin 0 -> 418 bytes target/classes/test | 0 target/test-classes/TestData.xml | 18 +++++ .../getRequests/GetTestCases.class | Bin 2142 -> 1654 bytes .../postRequests/PostTestCase.class | Bin 2452 -> 2383 bytes 16 files changed, 186 insertions(+), 21 deletions(-) create mode 100644 src/main/java/helpers/ConfigReader.java create mode 100644 src/main/java/jasonData/PostJasonData.java create mode 100644 src/main/resources/config.properties create mode 100644 src/main/resources/test create mode 100644 src/test/resources/TestData.xml create mode 100644 target/classes/config.properties create mode 100644 target/classes/helpers/ConfigReader.class create mode 100644 target/classes/jasonData/PostJasonData.class create mode 100644 target/classes/test create mode 100644 target/test-classes/TestData.xml diff --git a/src/main/java/helpers/ConfigReader.java b/src/main/java/helpers/ConfigReader.java new file mode 100644 index 0000000..1a5d7a9 --- /dev/null +++ b/src/main/java/helpers/ConfigReader.java @@ -0,0 +1,35 @@ +package helpers; + +import org.jetbrains.annotations.NotNull; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.util.Properties; + + public class ConfigReader { + + private ConfigReader() { + } + public static String readConfig(String key, String filePath) { + File file = new File(filePath); + return getPropValue(key, file); + } + @NotNull + private static String getPropValue(String key, File file) { + Properties properties = new Properties(); + try { + FileReader fileReader = new FileReader(file); + BufferedReader bufferedReader = new BufferedReader(fileReader); + properties.load(bufferedReader); + } catch (FileNotFoundException var5) { + var5.printStackTrace(); + } catch (Exception var6) { + throw new RuntimeException(var6); + } + return properties.getProperty(key); + } + + } + diff --git a/src/main/java/helpers/DataHelper.java b/src/main/java/helpers/DataHelper.java index ba7a3f3..31bfbc0 100644 --- a/src/main/java/helpers/DataHelper.java +++ b/src/main/java/helpers/DataHelper.java @@ -1,4 +1,72 @@ package helpers; +import org.openqa.selenium.JavascriptExecutor; + +import java.io.File; +import java.security.SecureRandom; +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.util.Date; + +import static com.utils.PropReader.readConfig; +import static com.utils.readers.XMLFileReader.getElementTextByTagName; + public class DataHelper { + public static String getRandString(int vinLength) { + String chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"; + StringBuilder salt = new StringBuilder(); + SecureRandom random = new SecureRandom(); + while (salt.length() < vinLength) { + int index = (int) (random.nextFloat() * chars.length()); + salt.append(chars.charAt(index)); + } + return salt.toString(); + } + public static String getRandArabicString(int vinLength) { + String chars = "ابتثجحخدذرزسشصضطظعغفقكلمنهوي١٢٣٤٥٦٧٨٩٠"; + StringBuilder salt = new StringBuilder(); + SecureRandom random = new SecureRandom(); + while (salt.length() < vinLength) { + int index = (int) (random.nextFloat() * chars.length()); + salt.append(chars.charAt(index)); + } + return salt.toString(); + } + public static int getRandNumber(int number) { + int randomNumber = (int) Math.floor(Math.random() * number); + if (randomNumber == 0) { + return 1; + } + return randomNumber; + } + public static String getTestData(String testKey) { + String dataFile = readConfig("datafile"); + return getElementTextByTagName(dataFile, testKey); + } + + public static String getTodaysDate() { + SimpleDateFormat formatter = new SimpleDateFormat("dd-MM-yyyy"); + Date date = new Date(); + return formatter.format(date); + } + + public static String getSpecificDate(String d ) { + SimpleDateFormat formatter = new SimpleDateFormat("dd-MM-yyyy"); + Date date1 = new Date(d); + return formatter.format(date1); + } + + public static String getRandomPhoneNUmber() { + String chars = "1234567890"; + StringBuilder salt = new StringBuilder(); + SecureRandom random = new SecureRandom(); + while (salt.length() < 7) { // length of the random string. + int index = (int) (random.nextFloat() * chars.length()); + salt.append(chars.charAt(index)); + } + return "0096279" + salt; + } + + } + diff --git a/src/main/java/jasonData/PostJasonData.java b/src/main/java/jasonData/PostJasonData.java new file mode 100644 index 0000000..52ad40f --- /dev/null +++ b/src/main/java/jasonData/PostJasonData.java @@ -0,0 +1,18 @@ +package jasonData; + +import helpers.DataHelper; +import org.json.simple.JSONObject; + +import static javax.swing.text.DefaultStyledDocument.ElementSpec.ContentType; + +public class PostJasonData { + + public void postBody(String checkOut ){ + + + + + + + } +} diff --git a/src/main/resources/config.properties b/src/main/resources/config.properties new file mode 100644 index 0000000..f737c1e --- /dev/null +++ b/src/main/resources/config.properties @@ -0,0 +1,2 @@ +baseURL=https://www.almosafer.com +datafile=src/test/resources/ \ No newline at end of file diff --git a/src/main/resources/test b/src/main/resources/test new file mode 100644 index 0000000..e69de29 diff --git a/src/test/java/getRequests/GetTestCases.java b/src/test/java/getRequests/GetTestCases.java index 9939ff7..dc1b395 100644 --- a/src/test/java/getRequests/GetTestCases.java +++ b/src/test/java/getRequests/GetTestCases.java @@ -1,5 +1,7 @@ package getRequests; +import com.utils.PropReader; +import helpers.DataHelper; import io.restassured.RestAssured; import io.restassured.RestAssured; import io.restassured.http.ContentType; @@ -13,12 +15,12 @@ public class GetTestCases { @Test public void testPostMethod() { - RestAssured.baseURI = "https://www.almosafer.com/api/enigma/search"; + RestAssured.baseURI = PropReader.readConfig("baseURL"); given() - .header("Authorization","eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.NGdyNzFSeHU5WS9LQ2gxdkZSL2NNZGx0OW5Sbnl3VXlFS0NGQmhqRy9wYzBzaG03MUJlbStWb0JjNUd0amN4akdWRWdCbnRjS1g2aUVrZmZ6alZNL1lpK09ER0Y1azJ5T0VGNUZRZzc0RUtHeTdkSXpwYnhJck5Ld3dXVmxRWG9GYXo0QmpTNDhlMzErNUlGM3NDQmMzaGFNM0V3d24wTGk0d2NmTG9LSFFhTGRnYVdGM0lLVTQyMXpCcjFYTEVuNGN1RmFnNWltNG5OMFBGY0gzT1JiMUpXYTBDNkhvcm1SZXdMbWxnbGxsMW5qbU5FMy9sam1VSGZEbUo4NG5jS2xFdTBabWlJK2RBcXNQZ0dnVDNwbEFVVVF5bDMyNVBzejh4TCs1MmFERXUrNzNuUnJvcFcyeGlqREtwb25reUZLZi83UlFoR0g5UVA4UFlyOTlDK3J0YlplTVp0Vm5heU05NU9aS2xsdTVBcDFWdmZhcWdKRFNScjcvRkd6Znk1NkJpS0JhYTVIZzQwaENpbkdKbk1pQT09.n7aHpl6an_A-EdW3I_rHsxBUBdAL3lh1QK-Z3SFJd3s") + .header("Authorization", DataHelper.getTestData("bearerToken")) .when() - .get("/poll/12273209-a6ea-479b-b234-349b949ad0ba") + .get("/api/enigma/search/poll/12273209-a6ea-479b-b234-349b949ad0ba") .then() .log().all().assertThat().statusCode(200); } diff --git a/src/test/java/postRequests/PostTestCase.java b/src/test/java/postRequests/PostTestCase.java index 3f5ad9a..c99e69b 100644 --- a/src/test/java/postRequests/PostTestCase.java +++ b/src/test/java/postRequests/PostTestCase.java @@ -1,6 +1,9 @@ package postRequests; +import com.utils.PropReader; +import helpers.DataHelper; import io.restassured.RestAssured; import io.restassured.http.ContentType; +import jasonData.PostJasonData; import org.json.simple.JSONObject; import org.testng.annotations.Test; @@ -10,21 +13,24 @@ public class PostTestCase { @Test public void testPostMethod() { - RestAssured.baseURI = "https://www.almosafer.com/api/enigma/search"; - /*JSONObject requestBody = new JSONObject(); - requestBody.put("checkIn", "2023-03-23"); - requestBody.put("checkOut", "2023-03-24"); - requestBody.put("checkOut", "2023-03-24"); - requestBody.put("adultsCount","2"); - requestBody.put("kidsAges","2"); - requestBody.put("searchInfo", "null"); - requestBody.put("crossSellDetail", "null"); - requestBody.put("placeId", "ChIJr4F5XbhfGxUR6GXc-MAwHGM");*/ - + RestAssured.baseURI = PropReader.readConfig("baseURL"); + JSONObject requestBody = new JSONObject(); + requestBody.put("checkIn", DataHelper.getTodaysDate()); + requestBody.put("checkOut", DataHelper.getTestData("checkOut")); + requestBody.put("adultsCount",DataHelper.getTestData("adultsCount")); + requestBody.put("kidsAges",DataHelper.getTestData("kidsAges")); + requestBody.put("searchInfo", DataHelper.getTestData("searchInfo")); + requestBody.put("crossSellDetail", DataHelper.getTestData("crossSellDetail")); + requestBody.put("placeId", DataHelper.getTestData("placeId")); given() + .contentType(ContentType.JSON) + .header("Authorization", DataHelper.getTestData("bearerToken")) + .body(requestBody.toJSONString()).post("/api/enigma/search/async") + .then().log().all().assertThat().statusCode(200); - .header("Authorization", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.NGdyNzFSeHU5WS9LQ2gxdkZSL2NNZGx0OW5Sbnl3VXlFS0NGQmhqRy9wYzBzaG03MUJlbStWb0JjNUd0amN4akdWRWdCbnRjS1g2aUVrZmZ6alZNL1lpK09ER0Y1azJ5T0VGNUZRZzc0RUtHeTdkSXpwYnhJck5Ld3dXVmxRWG9GYXo0QmpTNDhlMzErNUlGM3NDQmMzaGFNM0V3d24wTGk0d2NmTG9LSFFhTGRnYVdGM0lLVTQyMXpCcjFYTEVuNGN1RmFnNWltNG5OMFBGY0gzT1JiMUpXYTBDNkhvcm1SZXdMbWxnbGxsMW5qbU5FMy9sam1VSGZEbUo4NG5jS2xFdTBabWlJK2RBcXNQZ0dnVDNwbEFVVVF5bDMyNVBzejh4TCs1MmFERXUrNzNuUnJvcFcyeGlqREtwb25reUZLZi83UlFoR0g5UVA4UFlyOTlDK3J0YlplTVp0Vm5heU05NU9aS2xsdTVBcDFWdmZhcWdKRFNScjcvRkd6Znk1NkJpS0JhYTVIZzQwaENpbkdKbk1pQT09.n7aHpl6an_A-EdW3I_rHsxBUBdAL3lh1QK-Z3SFJd3s' ") - .body("{\n" + + } +} +/*"{\n" + " \"checkIn\": \"2023-03-23\",\n" + " \"checkOut\": \"2023-03-24\",\n" + " \"roomsInfo\": [\n" + @@ -36,8 +42,4 @@ public void testPostMethod() { " \"searchInfo\": null,\n" + " \"crossSellDetail\": null,\n" + " \"placeId\": \"ChIJr4F5XbhfGxUR6GXc-MAwHGM\"\n" + - "}").post("/async") - .then().log().all().assertThat().statusCode(200); - - } -} + "}"*/ \ No newline at end of file diff --git a/src/test/resources/TestData.xml b/src/test/resources/TestData.xml new file mode 100644 index 0000000..fbefbc4 --- /dev/null +++ b/src/test/resources/TestData.xml @@ -0,0 +1,18 @@ + + + + eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.NGdyNzFSeHU5WS9LQ2gxdkZSL2NNZGx0OW5Sbnl3VXlFS0NGQmhqRy9wYzBzaG03MUJlbStWb0JjNUd0amN4akdWRWdCbnRjS1g2aUVrZmZ6alZNL1lpK09ER0Y1azJ5T0VGNUZRZzc0RUtHeTdkSXpwYnhJck5Ld3dXVmxRWG9GYXo0QmpTNDhlMzErNUlGM3NDQmMzaGFNM0V3d24wTGk0d2NmTG9LSFFhTGRnYVdGM0lLVTQyMXpCcjFYTEVuNGN1RmFnNWltNG5OMFBGY0gzT1JiMUpXYTBDNkhvcm1SZXdMbWxnbGxsMW5qbU5FMy9sam1VSGZEbUo4NG5jS2xFdTBabWlJK2RBcXNQZ0dnVDNwbEFVVVF5bDMyNVBzejh4TCs1MmFERXUrNzNuUnJvcFcyeGlqREtwb25reUZLZi83UlFoR0g5UVA4UFlyOTlDK3J0YlplTVp0Vm5heU05NU9aS2xsdTVBcDFWdmZhcWdKRFNScjcvRkd6Znk1NkJpS0JhYTVIZzQwaENpbkdKbk1pQT09.n7aHpl6an_A-EdW3I_rHsxBUBdAL3lh1QK-Z3SFJd3s + + + + 2023-03-23 + 2023-03-24 + 2 + 2 + null + null + ChIJr4F5XbhfGxUR6GXc-MAwHGM + + + + \ No newline at end of file diff --git a/target/classes/config.properties b/target/classes/config.properties new file mode 100644 index 0000000..f737c1e --- /dev/null +++ b/target/classes/config.properties @@ -0,0 +1,2 @@ +baseURL=https://www.almosafer.com +datafile=src/test/resources/ \ No newline at end of file diff --git a/target/classes/helpers/ConfigReader.class b/target/classes/helpers/ConfigReader.class new file mode 100644 index 0000000000000000000000000000000000000000..bb69e19e0b4a39cc4a293fc86ca8865a72fb7e08 GIT binary patch literal 1881 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 delta 125 zcmcaB-p?d@>ff$?3=9nB3<6vX%nZEj41DYi{1aPaC!c4MXJ%nwogBcT5zL^-zyy>9 z0Y)GM3Ij>O$Y_r@+C&L!a$~qp@;zx1Bxh8QFkY`T9*)`#6jX`F(EPV1Nc#h zb6SJ|Vaa!X@80vB{r>U#2H+T5AsXoT==#_sG*48n%qgMKI~Wt(b3KuSjacRKy1Gwf zaVwIHnQp98k&Q*6EMAhXnW>Vn7tckh^9x}_bfZgi^@Rq6;DL!VJ$WK*_gMERqD`~9@<%}kN4hFfd8z6-el$3;@)lfpgx!CJAhf?P9VT;`8tlX2 zPq51YKN=p#CZmWmarO>hK+kpA=h&>t00Ey{3jtOTG9s+jj5YUpJC^%x?9|4cMR94g N)-|ki + + + eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.NGdyNzFSeHU5WS9LQ2gxdkZSL2NNZGx0OW5Sbnl3VXlFS0NGQmhqRy9wYzBzaG03MUJlbStWb0JjNUd0amN4akdWRWdCbnRjS1g2aUVrZmZ6alZNL1lpK09ER0Y1azJ5T0VGNUZRZzc0RUtHeTdkSXpwYnhJck5Ld3dXVmxRWG9GYXo0QmpTNDhlMzErNUlGM3NDQmMzaGFNM0V3d24wTGk0d2NmTG9LSFFhTGRnYVdGM0lLVTQyMXpCcjFYTEVuNGN1RmFnNWltNG5OMFBGY0gzT1JiMUpXYTBDNkhvcm1SZXdMbWxnbGxsMW5qbU5FMy9sam1VSGZEbUo4NG5jS2xFdTBabWlJK2RBcXNQZ0dnVDNwbEFVVVF5bDMyNVBzejh4TCs1MmFERXUrNzNuUnJvcFcyeGlqREtwb25reUZLZi83UlFoR0g5UVA4UFlyOTlDK3J0YlplTVp0Vm5heU05NU9aS2xsdTVBcDFWdmZhcWdKRFNScjcvRkd6Znk1NkJpS0JhYTVIZzQwaENpbkdKbk1pQT09.n7aHpl6an_A-EdW3I_rHsxBUBdAL3lh1QK-Z3SFJd3s + + + + 2023-03-23 + 2023-03-24 + 2 + 2 + null + null + ChIJr4F5XbhfGxUR6GXc-MAwHGM + + + + \ No newline at end of file diff --git a/target/test-classes/getRequests/GetTestCases.class b/target/test-classes/getRequests/GetTestCases.class index 7f7e811d4e7b5aca17dfb1f921d98a5462b34541..5d90701df8acb1155d8536ca9ec6ab580ab6b332 100644 GIT binary patch delta 670 zcmYLHO>+`K5Pbs+1G`HC8|Lp14)1mMboacTnIFkNYW>^aPhS9BM^#1~GclZ% zF^jo4=5bCYScqXUhOCSwoaeZp;39M%F2#`Z`7*~91tYl1aZN!I%L?_n;afL-xW$n_ zc=5eEfk_5lGdiMLE^(}=xQznG9Tj&`RB;ch42j~N+q50?jp3TM#h}!L;RvT9qvbdvF8F8|Y6r%)f z;EV;F!ciaT5S|a!%pgW5YlLZxVw{vr&=;DdZ<4_>rcfcBL#5S$(vyQZP6ev@X`&F$ F`~&hOb*}&b delta 1168 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 Date: Thu, 9 Mar 2023 16:02:45 +0300 Subject: [PATCH 3/7] changes --- src/test/java/getRequests/GetTestCases.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/test/java/getRequests/GetTestCases.java b/src/test/java/getRequests/GetTestCases.java index dc1b395..9a6bf55 100644 --- a/src/test/java/getRequests/GetTestCases.java +++ b/src/test/java/getRequests/GetTestCases.java @@ -3,9 +3,6 @@ import com.utils.PropReader; import helpers.DataHelper; import io.restassured.RestAssured; -import io.restassured.RestAssured; -import io.restassured.http.ContentType; -import org.json.simple.JSONObject; import org.testng.annotations.Test; import static io.restassured.RestAssured.given; From 7ec3f4717ff8725b93f85c9816040499e7d44336 Mon Sep 17 00:00:00 2001 From: Lozana Enbah Date: Thu, 9 Mar 2023 18:44:16 +0300 Subject: [PATCH 4/7] changes --- pom.xml | 38 +++++- src/test/java/getRequests/GetTestCases.java | 14 +- src/test/java/postRequests/PostTestCase.java | 53 +++++++ src/test/resources/TestData.xml | 129 +++++++++++++++++- target/test-classes/TestData.xml | 129 +++++++++++++++++- .../getRequests/GetTestCases.class | Bin 1654 -> 1946 bytes .../postRequests/PostTestCase.class | Bin 2383 -> 3235 bytes 7 files changed, 356 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 6b8168c..b47464a 100644 --- a/pom.xml +++ b/pom.xml @@ -38,9 +38,43 @@ json-simple 1.1.1 + + + io.qameta.allure + allure-java-commons + 2.21.0 + + + + io.qameta.allure + allure-junit4 + 2.17.3 + https://almosafer.testops.cloud/ + + + + com.fasterxml.jackson.core + jackson-core + 2.14.1 + + + + io.qameta.allure + allure-rest-assured + 2.21.0 + + + + org.apache.maven.reporting + maven-reporting-impl + 3.1.0 + - - \ No newline at end of file + + + + + diff --git a/src/test/java/getRequests/GetTestCases.java b/src/test/java/getRequests/GetTestCases.java index 9a6bf55..308e8c5 100644 --- a/src/test/java/getRequests/GetTestCases.java +++ b/src/test/java/getRequests/GetTestCases.java @@ -11,7 +11,7 @@ public class GetTestCases { @Test - public void testPostMethod() { + public void testGetMethod() { RestAssured.baseURI = PropReader.readConfig("baseURL"); given() @@ -21,5 +21,17 @@ public void testPostMethod() { .then() .log().all().assertThat().statusCode(200); } + @Test + public void testGetLastSearchMethod() { + RestAssured.baseURI = PropReader.readConfig("baseURL"); + + given() + .header("Authorization", DataHelper.getTestData("bearerToken")) + .when() + .get("/api/v3/flights/flight/search?query=RUH-JED/2023-03-09/2023-03-10/Economy/1Adult") + .then() + .log().all().assertThat().statusCode(200); + } + } diff --git a/src/test/java/postRequests/PostTestCase.java b/src/test/java/postRequests/PostTestCase.java index c99e69b..997bf6b 100644 --- a/src/test/java/postRequests/PostTestCase.java +++ b/src/test/java/postRequests/PostTestCase.java @@ -29,7 +29,60 @@ public void testPostMethod() { .then().log().all().assertThat().statusCode(200); } + + @Test + public void testFlightPostMethod() { + RestAssured.baseURI = PropReader.readConfig("baseURL"); + + given() + .contentType(ContentType.JSON) + .header("Authorization", DataHelper.getTestData("bearerToken")) + .body(DataHelper.getTestData("FlightTest")).post("/api/v3/flights/flight/async-search-result") + .then().log().all().assertThat().statusCode(200);} + + @Test + public void testAccommodationSearchPostMethod() { + RestAssured.baseURI = PropReader.readConfig("baseURL"); + + given() + .contentType(ContentType.JSON) + .header("Authorization", DataHelper.getTestData("bearerToken")) + .body("{\n" + + " \"searchCriteria\": [\n" + + " {\n" + + " \"lookupTypeId\": 2,\n" + + " \"lookupId\": [\n" + + " 9\n" + + " ]\n" + + " }\n" + + " ],\n" + + " \"checkIn\": \"2023-03-09\",\n" + + " \"checkOut\": \"2023-04-02\",\n" + + " \"sortBy\": \"rank\",\n" + + " \"sortOrder\": \"DESC\",\n" + + " \"rankType\": \"dynamic\",\n" + + " \"pageNo\": 1,\n" + + " \"pageSize\": 10\n" + + "}").post("/api/accommodation/property/search") + .then().log().all().assertThat().statusCode(200); + + } + + } + + + + + + + + + + + + +//Body /*"{\n" + " \"checkIn\": \"2023-03-23\",\n" + " \"checkOut\": \"2023-03-24\",\n" + diff --git a/src/test/resources/TestData.xml b/src/test/resources/TestData.xml index fbefbc4..1e3d819 100644 --- a/src/test/resources/TestData.xml +++ b/src/test/resources/TestData.xml @@ -5,14 +5,139 @@ - 2023-03-23 - 2023-03-24 + 2023-03-09 + 2023-03-10 2 2 null null ChIJr4F5XbhfGxUR6GXc-MAwHGM + + + + { + "next": { + "nid": "1678374939166849018", + "get": [ + { + "cid": "ce0f09a8", + "info": { + "uid": "cont-amd-sau", + "code": "AMD", + "chnr": 0 + } + }, + { + "cid": "6e3ffa60", + "info": { + "uid": "default", + "code": "ONE", + "chnr": "XY" + } + }, + { + "cid": "96558587", + "info": { + "uid": "default", + "code": "ONE", + "chnr": "F3" + } + }, + { + "cid": "853313c7", + "info": { + "uid": "default", + "code": "ONE", + "chnr": "E5" + } + }, + { + "cid": "dfb6e2a5", + "info": { + "uid": "default", + "code": "ONE", + "chnr": "G9" + } + }, + { + "cid": "5f289a7", + "info": { + "uid": "cont-tf-sau", + "code": "TFN", + "chnr": "FZ" + } + }, + { + "cid": "e2618a55", + "info": { + "uid": "cont-tf-sau", + "code": "TFN", + "chnr": "J9" + } + }, + { + "cid": "ddd63d1a", + "info": { + "uid": "cont-tf-sau", + "code": "TFN", + "chnr": "OV" + } + }, + { + "cid": "786b932c", + "info": { + "uid": "cont-tf-sau", + "code": "TFN", + "chnr": "W6" + } + } + ], + "let": [], + "hashedKey": "7540d54d21b892e831795e4837f778eb" + }, + "request": { + "searchType": "Roundtrip", + "isRoundTrip": true, + "leg": [ + { + "index": 0, + "originId": "RUH", + "destinationId": "JED", + "departure": "2023-03-09", + "nearByOriginId": false, + "nearByDestinationId": false, + "preferredCabin": "Economy", + "nonstop": false + }, + { + "index": 1, + "originId": "JED", + "destinationId": "RUH", + "departure": "2023-03-10", + "nearByOriginId": false, + "nearByDestinationId": false, + "preferredCabin": "Economy", + "nonstop": false + } + ], + "preferredAirline": [], + "pax": { + "adult": 1, + "totalSeats": 1, + "child": 0, + "infant": 0 + }, + "query": "RUH-JED/2023-03-09/2023-03-10/Economy/1Adult", + "ticketingType": "multi", + "cabin": "Economy" + } + } + + + + + \ No newline at end of file diff --git a/target/test-classes/TestData.xml b/target/test-classes/TestData.xml index fbefbc4..02d807b 100644 --- a/target/test-classes/TestData.xml +++ b/target/test-classes/TestData.xml @@ -5,14 +5,139 @@ - 2023-03-23 - 2023-03-24 + 2023-03-09 + 2023-03-10 2 2 null null ChIJr4F5XbhfGxUR6GXc-MAwHGM + + + + { + "next": { + "nid": "1678374939166849018", + "get": [ + { + "cid": "ce0f09a8", + "info": { + "uid": "cont-amd-sau", + "code": "AMD", + "chnr": 0 + } + }, + { + "cid": "6e3ffa60", + "info": { + "uid": "default", + "code": "ONE", + "chnr": "XY" + } + }, + { + "cid": "96558587", + "info": { + "uid": "default", + "code": "ONE", + "chnr": "F3" + } + }, + { + "cid": "853313c7", + "info": { + "uid": "default", + "code": "ONE", + "chnr": "E5" + } + }, + { + "cid": "dfb6e2a5", + "info": { + "uid": "default", + "code": "ONE", + "chnr": "G9" + } + }, + { + "cid": "5f289a7", + "info": { + "uid": "cont-tf-sau", + "code": "TFN", + "chnr": "FZ" + } + }, + { + "cid": "e2618a55", + "info": { + "uid": "cont-tf-sau", + "code": "TFN", + "chnr": "J9" + } + }, + { + "cid": "ddd63d1a", + "info": { + "uid": "cont-tf-sau", + "code": "TFN", + "chnr": "OV" + } + }, + { + "cid": "786b932c", + "info": { + "uid": "cont-tf-sau", + "code": "TFN", + "chnr": "W6" + } + } + ], + "let": [], + "hashedKey": "7540d54d21b892e831795e4837f778eb" + }, + "request": { + "searchType": "Roundtrip", + "isRoundTrip": true, + "leg": [ + { + "index": 0, + "originId": "RUH", + "destinationId": "JED", + "departure": "2023-03-09", + "nearByOriginId": false, + "nearByDestinationId": false, + "preferredCabin": "Economy", + "nonstop": false + }, + { + "index": 1, + "originId": "JED", + "destinationId": "RUH", + "departure": "2023-03-10", + "nearByOriginId": false, + "nearByDestinationId": false, + "preferredCabin": "Economy", + "nonstop": false + } + ], + "preferredAirline": [], + "pax": { + "adult": 1, + "totalSeats": 1, + "child": 0, + "infant": 0 + }, + "query": "RUH-JED/2023-03-09/2023-03-10/Economy/1Adult", + "ticketingType": "multi", + "cabin": "Economy" + } + } + + + + + \ No newline at end of file diff --git a/target/test-classes/getRequests/GetTestCases.class b/target/test-classes/getRequests/GetTestCases.class index 5d90701df8acb1155d8536ca9ec6ab580ab6b332..15cd2f6faab4a02db59706c801c273368f650d51 100644 GIT binary patch delta 643 zcmaixOHUI~7>3`|(w<>@w4g!(xs-AdDCP8`+ytRQ1#4?-vDNL+4zx{akvWi%nD`sW z>{JQx51Hc?U>S)KPhA|!E zc+!puOzI?48p0Z;bwn`3A$^D<=15#a!ttjZ&wRL#S&lg$Ixz3U0v4V0+>s>>%N#El zyi2uaO;K=9OqLkh)>;*l!GH2O&F?AGQXA&U?^I9VI;xCesV&nuC|9$lsO)@3{zPeh_L7H(rKDpTcFv$c0DW68>4L!D<`qwah+-MaI+ z!9WKj?WLI{XXKu#Z(wH>T<9b9Uj5YZn6kJoKtBd(#xO|DF7(566o$W!lD_0NLs3G4fHFBHY9lD1GKexb0122pz)k7`K~1RS>cS1rK;0d0 zVY#4+vSjZ@pT;HS>0lMT_|DMh{HOZ#ao1l{`E`E!6PTftqMcEXu@vLnYUeh0Qi8i4 z_dK#Ga@^NE@Og-JnDBVy?4)MOr<2E;CqCUw`=T}Lyr&M&G|!KADqd$4HlsqldGu!` zwrb?CkF-LUgJxLTUf0YS=2_4z8eXtuc*!e8$I|C$uimJB4Weqjrtr&Q&U+UK`#xl{p(6RBc$R?tThvQxqzD_8|VPvdOo+ zQw+yjZJGG&s^=Nj*-+#pkxLsk$!iLREjA3>4(};`|B)EKQs|XUxsyO44-sZ0vSO9k zw(JS&TkE=Cm~16GxGuiAC}4m=i4;T9oFEfVBzN+zb`($8BfLfzy;9dFUyznHXPBm+ XqNrTzl>Y17kRCVXW=nHem|)}|9M?tF diff --git a/target/test-classes/postRequests/PostTestCase.class b/target/test-classes/postRequests/PostTestCase.class index 2d2c84822e07a3683fbfb39075a160a12ce6fe82..95e4913682c5e9f43e353826d0600bda0a674949 100644 GIT binary patch literal 3235 zcmbtWS$ES`5dLm93rA!Tfk4<2(?CK9O2QThO`A9@p(dem2&ELLEZ^8lWJySJT0?2+ z-XG8((3d{-sqHxs!)Z?+d-|h#I#*I`XJIM$_(*eS?#z5McV@2s`S$-b1PxS1}`D zR>HLy-WRJmp_mrbyoBrGy%58VX6(ZUG2Cp%0eskuTlh#&x5eX*gu4tA4KNZMJ>(3&zVK2t1YxI3?9OyVdhTi475%{9b2VmA1B!(-T+a%|6^ z zote!naos2FJ#$6NHwt{g@C`PgJUs< zoQymShOXxaMQVDU>&w$t3`;VWVah1LVvqv%Y|)otW0CTtWs9coC2h(8NtcbRH<9BM zciao`PFssM9hL6do|opPImLa=Fv+}QYC4}LNDl7B;L7me$5529f=?K>PZa4KT;qNa zI=RV^HSW&a%bY;8iSSfYql|`UAmdY%WZV}pAK){F-KypoDz}VWK~qB{s^*m}UB*Lv z&d_bxs!JKxJg?~Tte_n_F0Rf+gp4onh+*J)`xZ3QpmPy*R#o{DU&ZjXjBoHr#<$|} z9lobjEC$Cb4xHg=fNbT28Zy1;9ikfyp$-xp$|_@{58~bQON8vCYxtaMJ8`c2R=^js zaEGA8FJapDa?zPDIh0%4H*&19u|^z-swM(WdYoOi_jYCVFraRSrV>$IknzOG(8!6w zA^M+9)C#FOs?w8#LnCWa&vyOEl90KYwOq@cb+gpX8JP-9Z>sYTx~X;_fn z9M=dU9i~e}(zX_j9K+$hRJ9b-zH3;yvHs00YPAh@L^b12gtb@c&}lKiHkl)4o|^>Q zQ>UojE(bI(^P#Hlq<8EwtN4}lfF85(oO zifF)714X1f@y3_TmoZ`?`7 zhBp{{IRcs^dabjCzL&ary*QilQMH)0nU4x&bLMYtX1$(Y*|$ahLPwO$OmKT$+5*Ju z*>4d2!fMZ}&`_DrYm}KdT`7K%u0!#Ga;9&3Q<`67cr6HK4>+Aw9;n8v{yQiLatLq-8~}(A$;m6}m-fsnD%TYlUu8+9G-t?Y}`O zV@Dm74rM2C>;J&6GCCVD@EE(x*h7M@khixUe_>x4`x(6tlyQ)ujP7XB6TI8;cNvK~ z+^B{;j#dh#4HDYvsh|rxa2OpJ!A^`*?yjH{3)qbe_RzOZ7w%y%KBrI4AF&@#aWF{L zt}q=@s@m`ihA>Pi8zIXgr6+;}o?J^HehN+l$gCys1z{?ODCjWGx85YqE&(v ziyM-0GVVX4vwK34Wm1ykrh&*#<+9U5#e(D(V+M9+vN%)7r{;>Y1q0kcGub%BZHqgS zX=W_$N@kgJUz`2)_qZ>4pj+iBxWCP4U6F?dad%wA1CmF~yD?vH(_@}kJe53SUh-VS z3re4s{BQij8`MAQV`88NSJr@ z-(a#-zkppPm`*qij;!$&PD71{op6muoJf@~;C!UfW2K4HaP}9%~I1V;*q>kM@da^;lOS5q@~AH%V7laLb`opB}zhjS63@!-sj#7PhJ- QdX%e|?5(WSr_f~Ee`~;K!vFvP From 06029210b2c49e31041635fe113ec71608dafc5c Mon Sep 17 00:00:00 2001 From: Lozana Enbah Date: Thu, 9 Mar 2023 19:14:00 +0300 Subject: [PATCH 5/7] changes --- src/test/java/postRequests/PostTestCase.java | 20 ++---------------- src/test/resources/TestData.xml | 4 ++-- target/test-classes/TestData.xml | 8 +++---- .../postRequests/PostTestCase.class | Bin 3235 -> 4858 bytes 4 files changed, 8 insertions(+), 24 deletions(-) diff --git a/src/test/java/postRequests/PostTestCase.java b/src/test/java/postRequests/PostTestCase.java index 997bf6b..12398a1 100644 --- a/src/test/java/postRequests/PostTestCase.java +++ b/src/test/java/postRequests/PostTestCase.java @@ -37,7 +37,7 @@ public void testFlightPostMethod() { given() .contentType(ContentType.JSON) .header("Authorization", DataHelper.getTestData("bearerToken")) - .body(DataHelper.getTestData("FlightTest")).post("/api/v3/flights/flight/async-search-result") + .body("{\"next\":{\"nid\":\"1678377041043203541\",\"get\":[{\"cid\":\"ce0f09a8\",\"info\":{\"uid\":\"cont-amd-sau\",\"code\":\"AMD\",\"chnr\":0}},{\"cid\":\"5f289a7\",\"info\":{\"uid\":\"cont-tf-sau\",\"code\":\"TFN\",\"chnr\":\"FZ\"}},{\"cid\":\"e2618a55\",\"info\":{\"uid\":\"cont-tf-sau\",\"code\":\"TFN\",\"chnr\":\"J9\"}},{\"cid\":\"ddd63d1a\",\"info\":{\"uid\":\"cont-tf-sau\",\"code\":\"TFN\",\"chnr\":\"OV\"}},{\"cid\":\"786b932c\",\"info\":{\"uid\":\"cont-tf-sau\",\"code\":\"TFN\",\"chnr\":\"W6\"}},{\"cid\":\"6e3ffa60\",\"info\":{\"uid\":\"default\",\"code\":\"ONE\",\"chnr\":\"XY\"}},{\"cid\":\"96558587\",\"info\":{\"uid\":\"default\",\"code\":\"ONE\",\"chnr\":\"F3\"}},{\"cid\":\"853313c7\",\"info\":{\"uid\":\"default\",\"code\":\"ONE\",\"chnr\":\"E5\"}},{\"cid\":\"dfb6e2a5\",\"info\":{\"uid\":\"default\",\"code\":\"ONE\",\"chnr\":\"G9\"}}],\"let\":[],\"hashedKey\":\"7540d54d21b892e831795e4837f778eb\"},\"request\":{\"searchType\":\"Roundtrip\",\"isRoundTrip\":true,\"leg\":[{\"index\":0,\"originId\":\"RUH\",\"destinationId\":\"JED\",\"departure\":\"2023-03-09\",\"nearByOriginId\":false,\"nearByDestinationId\":false,\"preferredCabin\":\"Economy\",\"nonstop\":false},{\"index\":1,\"originId\":\"JED\",\"destinationId\":\"RUH\",\"departure\":\"2023-03-10\",\"nearByOriginId\":false,\"nearByDestinationId\":false,\"preferredCabin\":\"Economy\",\"nonstop\":false}],\"preferredAirline\":[],\"pax\":{\"adult\":1,\"totalSeats\":1,\"child\":0,\"infant\":0},\"query\":\"RUH-JED/"+DataHelper.getTestData("checkIn")+"/"+DataHelper.getTestData("checkOut")+"/Economy/1Adult\",\"ticketingType\":\"multi\",\"cabin\":\"Economy\"}}").post("/api/v3/flights/flight/async-search-result") .then().log().all().assertThat().statusCode(200);} @Test @@ -47,23 +47,7 @@ public void testAccommodationSearchPostMethod() { given() .contentType(ContentType.JSON) .header("Authorization", DataHelper.getTestData("bearerToken")) - .body("{\n" + - " \"searchCriteria\": [\n" + - " {\n" + - " \"lookupTypeId\": 2,\n" + - " \"lookupId\": [\n" + - " 9\n" + - " ]\n" + - " }\n" + - " ],\n" + - " \"checkIn\": \"2023-03-09\",\n" + - " \"checkOut\": \"2023-04-02\",\n" + - " \"sortBy\": \"rank\",\n" + - " \"sortOrder\": \"DESC\",\n" + - " \"rankType\": \"dynamic\",\n" + - " \"pageNo\": 1,\n" + - " \"pageSize\": 10\n" + - "}").post("/api/accommodation/property/search") + .body("{\"searchCriteria\":[{\"lookupTypeId\":2,\"lookupId\":[9]}],\"checkIn\":\"2023-03-09\",\"checkOut\":\"2023-04-02\",\"sortBy\":\"rank\",\"sortOrder\":\"DESC\",\"rankType\":\"dynamic\",\"pageNo\":1,\"pageSize\":10}").post("/api/accommodation/property/search") .then().log().all().assertThat().statusCode(200); } diff --git a/src/test/resources/TestData.xml b/src/test/resources/TestData.xml index 1e3d819..6fb88a0 100644 --- a/src/test/resources/TestData.xml +++ b/src/test/resources/TestData.xml @@ -5,8 +5,8 @@ - 2023-03-09 - 2023-03-10 + 2023-03-11 + 2023-03-12 2 2 null diff --git a/target/test-classes/TestData.xml b/target/test-classes/TestData.xml index 02d807b..6fb88a0 100644 --- a/target/test-classes/TestData.xml +++ b/target/test-classes/TestData.xml @@ -5,8 +5,8 @@ - 2023-03-09 - 2023-03-10 + 2023-03-11 + 2023-03-12 2 2 null @@ -15,7 +15,7 @@ - + { "next": { "nid": "1678374939166849018", @@ -133,7 +133,7 @@ "cabin": "Economy" } } - + diff --git a/target/test-classes/postRequests/PostTestCase.class b/target/test-classes/postRequests/PostTestCase.class index 95e4913682c5e9f43e353826d0600bda0a674949..9fb4bc8962e618834db34f84c2b6fee40eec9ff6 100644 GIT binary patch literal 4858 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 From 79d0ea42d3a2d71b1cee6205664da1637f2cd4b1 Mon Sep 17 00:00:00 2001 From: Lozana Enbah Date: Sat, 11 Mar 2023 01:31:15 +0300 Subject: [PATCH 6/7] changes --- ...8c7f-43f8-89de-50b5b9d25bd3-container.json | 1 + ...0696-4c79-a0e7-f34d95922a13-container.json | 1 + ...cfd3-4ff4-b89d-acc88fda3504-container.json | 1 + ...77ae-4575-9a1e-ecf3cbb033fa-container.json | 1 + ...1645-4c22-b12e-d8a3f626b406-container.json | 1 + ...c69a-474b-8b56-98b71eecbed8-container.json | 1 + ...8116-4f1c-a9a1-fc8dca7e6f1e-container.json | 1 + ...2370-45df-a2da-0696d5a3df38-container.json | 1 + ...f115-4ee8-9f57-1fe83c48ce8e-container.json | 1 + ...acc6-41f9-8f63-0d3825857407-container.json | 1 + ...be9f-42d4-9f40-58e77b0945c0-container.json | 1 + ...b324-4f77-8ad0-8fe3172df6c3-container.json | 1 + ...987a-42b2-85cb-ce04dc472912-container.json | 1 + ...331f-416c-8145-947a4f98aa92-container.json | 1 + ...2f34-40fd-b5c0-f59bc33d231c-container.json | 1 + ...eea6-4f40-ae08-8955aa8a8e15-container.json | 1 + ...bdac-4c4a-b01f-edf22358ab78-container.json | 1 + ...be87-4e47-ab7e-a6897a654dce-container.json | 1 + ...6d00-4041-bbb1-18384e12fce2-container.json | 1 + ...a4c5-4f8d-8645-c79920aff8f5-container.json | 1 + ...bf2a-4a16-b1f7-e381b3c30c45-container.json | 1 + ...90d1-471f-96dd-a5d7e4486be3-container.json | 1 + ...dbbe-4e1e-83c6-f899a26af317-container.json | 1 + ...72aa-4d42-b88c-7c8a30e79335-container.json | 1 + ...9783-497a-be67-444df85c84e4-container.json | 1 + ...4c17-49a4-9d01-b9d54352c60e-container.json | 1 + ...e775-4fc0-a2cf-71424486951a-container.json | 1 + ...a579-4dd0-8842-b6b144d8bb09-container.json | 1 + ...2921-44de-895a-ec4613a06de5-container.json | 1 + ...baac-46e0-9a6e-e4bcf845652e-container.json | 1 + ...d661-4416-8fd0-b5c7b9e491d7-container.json | 1 + .../{ => com}/getRequests/GetTestCases.java | 2 +- .../{ => com}/postRequests/PostTestCase.java | 2 +- src/test/resources/TestResult.xml | 13 +++++++++++++ target/test-classes/TestResult.xml | 13 +++++++++++++ .../{ => com}/getRequests/GetTestCases.class | Bin 1946 -> 1954 bytes .../{ => com}/postRequests/PostTestCase.class | Bin 4858 -> 4866 bytes 37 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 allure-results/07e4ab49-8c7f-43f8-89de-50b5b9d25bd3-container.json create mode 100644 allure-results/08bad41c-0696-4c79-a0e7-f34d95922a13-container.json create mode 100644 allure-results/1d7c4ff0-cfd3-4ff4-b89d-acc88fda3504-container.json create mode 100644 allure-results/2d22655d-77ae-4575-9a1e-ecf3cbb033fa-container.json create mode 100644 allure-results/2e9bde5b-1645-4c22-b12e-d8a3f626b406-container.json create mode 100644 allure-results/32f752e6-c69a-474b-8b56-98b71eecbed8-container.json create mode 100644 allure-results/418dad99-8116-4f1c-a9a1-fc8dca7e6f1e-container.json create mode 100644 allure-results/41e3d966-2370-45df-a2da-0696d5a3df38-container.json create mode 100644 allure-results/4362e816-f115-4ee8-9f57-1fe83c48ce8e-container.json create mode 100644 allure-results/5a87088e-acc6-41f9-8f63-0d3825857407-container.json create mode 100644 allure-results/63ee30d3-be9f-42d4-9f40-58e77b0945c0-container.json create mode 100644 allure-results/6ae04ab4-b324-4f77-8ad0-8fe3172df6c3-container.json create mode 100644 allure-results/8024181f-987a-42b2-85cb-ce04dc472912-container.json create mode 100644 allure-results/92b2eb6e-331f-416c-8145-947a4f98aa92-container.json create mode 100644 allure-results/92bab13b-2f34-40fd-b5c0-f59bc33d231c-container.json create mode 100644 allure-results/9777e266-eea6-4f40-ae08-8955aa8a8e15-container.json create mode 100644 allure-results/a58776f1-bdac-4c4a-b01f-edf22358ab78-container.json create mode 100644 allure-results/a870fae5-be87-4e47-ab7e-a6897a654dce-container.json create mode 100644 allure-results/a8ee029c-6d00-4041-bbb1-18384e12fce2-container.json create mode 100644 allure-results/b1f179f3-a4c5-4f8d-8645-c79920aff8f5-container.json create mode 100644 allure-results/b2995727-bf2a-4a16-b1f7-e381b3c30c45-container.json create mode 100644 allure-results/b3e1425a-90d1-471f-96dd-a5d7e4486be3-container.json create mode 100644 allure-results/b88f6a1f-dbbe-4e1e-83c6-f899a26af317-container.json create mode 100644 allure-results/c456e334-72aa-4d42-b88c-7c8a30e79335-container.json create mode 100644 allure-results/d3c6c756-9783-497a-be67-444df85c84e4-container.json create mode 100644 allure-results/d5019417-4c17-49a4-9d01-b9d54352c60e-container.json create mode 100644 allure-results/e5269c09-e775-4fc0-a2cf-71424486951a-container.json create mode 100644 allure-results/eb9c3dcc-a579-4dd0-8842-b6b144d8bb09-container.json create mode 100644 allure-results/ee38f440-2921-44de-895a-ec4613a06de5-container.json create mode 100644 allure-results/f6a3a76f-baac-46e0-9a6e-e4bcf845652e-container.json create mode 100644 allure-results/f9dc9696-d661-4416-8fd0-b5c7b9e491d7-container.json rename src/test/java/{ => com}/getRequests/GetTestCases.java (97%) rename src/test/java/{ => com}/postRequests/PostTestCase.java (99%) create mode 100644 src/test/resources/TestResult.xml create mode 100644 target/test-classes/TestResult.xml rename target/test-classes/{ => com}/getRequests/GetTestCases.class (89%) rename target/test-classes/{ => com}/postRequests/PostTestCase.class (93%) diff --git a/allure-results/07e4ab49-8c7f-43f8-89de-50b5b9d25bd3-container.json b/allure-results/07e4ab49-8c7f-43f8-89de-50b5b9d25bd3-container.json new file mode 100644 index 0000000..05398b0 --- /dev/null +++ b/allure-results/07e4ab49-8c7f-43f8-89de-50b5b9d25bd3-container.json @@ -0,0 +1 @@ +{"uuid":"07e4ab49-8c7f-43f8-89de-50b5b9d25bd3","name":"com.getRequests.GetTestCases","children":[],"befores":[],"afters":[],"start":1678380257236,"stop":1678380257427} \ No newline at end of file diff --git a/allure-results/08bad41c-0696-4c79-a0e7-f34d95922a13-container.json b/allure-results/08bad41c-0696-4c79-a0e7-f34d95922a13-container.json new file mode 100644 index 0000000..6777a04 --- /dev/null +++ b/allure-results/08bad41c-0696-4c79-a0e7-f34d95922a13-container.json @@ -0,0 +1 @@ +{"uuid":"08bad41c-0696-4c79-a0e7-f34d95922a13","name":"com.postRequests.PostTestCase","children":[],"befores":[],"afters":[],"start":1678380491353,"stop":1678380491520} \ No newline at end of file diff --git a/allure-results/1d7c4ff0-cfd3-4ff4-b89d-acc88fda3504-container.json b/allure-results/1d7c4ff0-cfd3-4ff4-b89d-acc88fda3504-container.json new file mode 100644 index 0000000..861b680 --- /dev/null +++ b/allure-results/1d7c4ff0-cfd3-4ff4-b89d-acc88fda3504-container.json @@ -0,0 +1 @@ +{"uuid":"1d7c4ff0-cfd3-4ff4-b89d-acc88fda3504","name":"AlmosaferTest","children":["f6a3a76f-baac-46e0-9a6e-e4bcf845652e"],"befores":[],"afters":[],"start":1678380257233,"stop":1678380257442} \ No newline at end of file diff --git a/allure-results/2d22655d-77ae-4575-9a1e-ecf3cbb033fa-container.json b/allure-results/2d22655d-77ae-4575-9a1e-ecf3cbb033fa-container.json new file mode 100644 index 0000000..512910c --- /dev/null +++ b/allure-results/2d22655d-77ae-4575-9a1e-ecf3cbb033fa-container.json @@ -0,0 +1 @@ +{"uuid":"2d22655d-77ae-4575-9a1e-ecf3cbb033fa","name":"AlmosaferTest","children":["4362e816-f115-4ee8-9f57-1fe83c48ce8e"],"befores":[],"afters":[],"start":1678380182297,"stop":1678380182480} \ No newline at end of file diff --git a/allure-results/2e9bde5b-1645-4c22-b12e-d8a3f626b406-container.json b/allure-results/2e9bde5b-1645-4c22-b12e-d8a3f626b406-container.json new file mode 100644 index 0000000..a177436 --- /dev/null +++ b/allure-results/2e9bde5b-1645-4c22-b12e-d8a3f626b406-container.json @@ -0,0 +1 @@ +{"uuid":"2e9bde5b-1645-4c22-b12e-d8a3f626b406","name":"AlmosaferTest","children":["32f752e6-c69a-474b-8b56-98b71eecbed8"],"befores":[],"afters":[],"start":1678380208160,"stop":1678380208336} \ No newline at end of file diff --git a/allure-results/32f752e6-c69a-474b-8b56-98b71eecbed8-container.json b/allure-results/32f752e6-c69a-474b-8b56-98b71eecbed8-container.json new file mode 100644 index 0000000..107d24b --- /dev/null +++ b/allure-results/32f752e6-c69a-474b-8b56-98b71eecbed8-container.json @@ -0,0 +1 @@ +{"uuid":"32f752e6-c69a-474b-8b56-98b71eecbed8","name":" Smoke Test","children":[],"befores":[],"afters":[],"start":1678380208161,"stop":1678380208273} \ No newline at end of file diff --git a/allure-results/418dad99-8116-4f1c-a9a1-fc8dca7e6f1e-container.json b/allure-results/418dad99-8116-4f1c-a9a1-fc8dca7e6f1e-container.json new file mode 100644 index 0000000..3ba8701 --- /dev/null +++ b/allure-results/418dad99-8116-4f1c-a9a1-fc8dca7e6f1e-container.json @@ -0,0 +1 @@ +{"uuid":"418dad99-8116-4f1c-a9a1-fc8dca7e6f1e","name":"com.postRequests.PostTestCase","children":[],"befores":[],"afters":[],"start":1678380394166,"stop":1678380394387} \ No newline at end of file diff --git a/allure-results/41e3d966-2370-45df-a2da-0696d5a3df38-container.json b/allure-results/41e3d966-2370-45df-a2da-0696d5a3df38-container.json new file mode 100644 index 0000000..876b3ae --- /dev/null +++ b/allure-results/41e3d966-2370-45df-a2da-0696d5a3df38-container.json @@ -0,0 +1 @@ +{"uuid":"41e3d966-2370-45df-a2da-0696d5a3df38","name":"AlmosaferTest","children":["a58776f1-bdac-4c4a-b01f-edf22358ab78"],"befores":[],"afters":[],"start":1678380280093,"stop":1678380280288} \ No newline at end of file diff --git a/allure-results/4362e816-f115-4ee8-9f57-1fe83c48ce8e-container.json b/allure-results/4362e816-f115-4ee8-9f57-1fe83c48ce8e-container.json new file mode 100644 index 0000000..03e2edb --- /dev/null +++ b/allure-results/4362e816-f115-4ee8-9f57-1fe83c48ce8e-container.json @@ -0,0 +1 @@ +{"uuid":"4362e816-f115-4ee8-9f57-1fe83c48ce8e","name":" Smoke Test","children":[],"befores":[],"afters":[],"start":1678380182300,"stop":1678380182410} \ No newline at end of file diff --git a/allure-results/5a87088e-acc6-41f9-8f63-0d3825857407-container.json b/allure-results/5a87088e-acc6-41f9-8f63-0d3825857407-container.json new file mode 100644 index 0000000..e4e569b --- /dev/null +++ b/allure-results/5a87088e-acc6-41f9-8f63-0d3825857407-container.json @@ -0,0 +1 @@ +{"uuid":"5a87088e-acc6-41f9-8f63-0d3825857407","name":"com.postRequests.PostTestCase","children":[],"befores":[],"afters":[],"start":1678380257236,"stop":1678380257437} \ No newline at end of file diff --git a/allure-results/63ee30d3-be9f-42d4-9f40-58e77b0945c0-container.json b/allure-results/63ee30d3-be9f-42d4-9f40-58e77b0945c0-container.json new file mode 100644 index 0000000..a3fcdac --- /dev/null +++ b/allure-results/63ee30d3-be9f-42d4-9f40-58e77b0945c0-container.json @@ -0,0 +1 @@ +{"uuid":"63ee30d3-be9f-42d4-9f40-58e77b0945c0","name":"com.postRequests.PostTestCase","children":[],"befores":[],"afters":[],"start":1678380092655,"stop":1678380092933} \ No newline at end of file diff --git a/allure-results/6ae04ab4-b324-4f77-8ad0-8fe3172df6c3-container.json b/allure-results/6ae04ab4-b324-4f77-8ad0-8fe3172df6c3-container.json new file mode 100644 index 0000000..8acf60d --- /dev/null +++ b/allure-results/6ae04ab4-b324-4f77-8ad0-8fe3172df6c3-container.json @@ -0,0 +1 @@ +{"uuid":"6ae04ab4-b324-4f77-8ad0-8fe3172df6c3","name":"AlmosaferTest","children":["c456e334-72aa-4d42-b88c-7c8a30e79335"],"befores":[],"afters":[],"start":1678380092653,"stop":1678380092940} \ No newline at end of file diff --git a/allure-results/8024181f-987a-42b2-85cb-ce04dc472912-container.json b/allure-results/8024181f-987a-42b2-85cb-ce04dc472912-container.json new file mode 100644 index 0000000..a721bab --- /dev/null +++ b/allure-results/8024181f-987a-42b2-85cb-ce04dc472912-container.json @@ -0,0 +1 @@ +{"uuid":"8024181f-987a-42b2-85cb-ce04dc472912","name":"com.getRequests.GetTestCases","children":[],"befores":[],"afters":[],"start":1678380208162,"stop":1678380208325} \ No newline at end of file diff --git a/allure-results/92b2eb6e-331f-416c-8145-947a4f98aa92-container.json b/allure-results/92b2eb6e-331f-416c-8145-947a4f98aa92-container.json new file mode 100644 index 0000000..ba7dc1c --- /dev/null +++ b/allure-results/92b2eb6e-331f-416c-8145-947a4f98aa92-container.json @@ -0,0 +1 @@ +{"uuid":"92b2eb6e-331f-416c-8145-947a4f98aa92","name":"com.getRequests.GetTestCases","children":[],"befores":[],"afters":[],"start":1678380280096,"stop":1678380280278} \ No newline at end of file diff --git a/allure-results/92bab13b-2f34-40fd-b5c0-f59bc33d231c-container.json b/allure-results/92bab13b-2f34-40fd-b5c0-f59bc33d231c-container.json new file mode 100644 index 0000000..8651ca7 --- /dev/null +++ b/allure-results/92bab13b-2f34-40fd-b5c0-f59bc33d231c-container.json @@ -0,0 +1 @@ +{"uuid":"92bab13b-2f34-40fd-b5c0-f59bc33d231c","name":"com.getRequests.GetTestCases","children":[],"befores":[],"afters":[],"start":1678380309359,"stop":1678380309509} \ No newline at end of file diff --git a/allure-results/9777e266-eea6-4f40-ae08-8955aa8a8e15-container.json b/allure-results/9777e266-eea6-4f40-ae08-8955aa8a8e15-container.json new file mode 100644 index 0000000..1c0d295 --- /dev/null +++ b/allure-results/9777e266-eea6-4f40-ae08-8955aa8a8e15-container.json @@ -0,0 +1 @@ +{"uuid":"9777e266-eea6-4f40-ae08-8955aa8a8e15","name":"com.getRequests.GetTestCases","children":[],"befores":[],"afters":[],"start":1678380394166,"stop":1678380394383} \ No newline at end of file diff --git a/allure-results/a58776f1-bdac-4c4a-b01f-edf22358ab78-container.json b/allure-results/a58776f1-bdac-4c4a-b01f-edf22358ab78-container.json new file mode 100644 index 0000000..77d6137 --- /dev/null +++ b/allure-results/a58776f1-bdac-4c4a-b01f-edf22358ab78-container.json @@ -0,0 +1 @@ +{"uuid":"a58776f1-bdac-4c4a-b01f-edf22358ab78","name":" Smoke Test","children":[],"befores":[],"afters":[],"start":1678380280095,"stop":1678380280222} \ No newline at end of file diff --git a/allure-results/a870fae5-be87-4e47-ab7e-a6897a654dce-container.json b/allure-results/a870fae5-be87-4e47-ab7e-a6897a654dce-container.json new file mode 100644 index 0000000..36bd5b5 --- /dev/null +++ b/allure-results/a870fae5-be87-4e47-ab7e-a6897a654dce-container.json @@ -0,0 +1 @@ +{"uuid":"a870fae5-be87-4e47-ab7e-a6897a654dce","name":"com.getRequests.GetTestCases","children":[],"befores":[],"afters":[],"start":1678380092655,"stop":1678380092926} \ No newline at end of file diff --git a/allure-results/a8ee029c-6d00-4041-bbb1-18384e12fce2-container.json b/allure-results/a8ee029c-6d00-4041-bbb1-18384e12fce2-container.json new file mode 100644 index 0000000..1c547ca --- /dev/null +++ b/allure-results/a8ee029c-6d00-4041-bbb1-18384e12fce2-container.json @@ -0,0 +1 @@ +{"uuid":"a8ee029c-6d00-4041-bbb1-18384e12fce2","name":"com.postRequests.PostTestCase","children":[],"befores":[],"afters":[],"start":1678380182302,"stop":1678380182476} \ No newline at end of file diff --git a/allure-results/b1f179f3-a4c5-4f8d-8645-c79920aff8f5-container.json b/allure-results/b1f179f3-a4c5-4f8d-8645-c79920aff8f5-container.json new file mode 100644 index 0000000..e985920 --- /dev/null +++ b/allure-results/b1f179f3-a4c5-4f8d-8645-c79920aff8f5-container.json @@ -0,0 +1 @@ +{"uuid":"b1f179f3-a4c5-4f8d-8645-c79920aff8f5","name":" Smoke Test","children":[],"befores":[],"afters":[],"start":1678380491353,"stop":1678380491458} \ No newline at end of file diff --git a/allure-results/b2995727-bf2a-4a16-b1f7-e381b3c30c45-container.json b/allure-results/b2995727-bf2a-4a16-b1f7-e381b3c30c45-container.json new file mode 100644 index 0000000..d11d463 --- /dev/null +++ b/allure-results/b2995727-bf2a-4a16-b1f7-e381b3c30c45-container.json @@ -0,0 +1 @@ +{"uuid":"b2995727-bf2a-4a16-b1f7-e381b3c30c45","name":"com.postRequests.PostTestCase","children":[],"befores":[],"afters":[],"start":1678380280096,"stop":1678380280283} \ No newline at end of file diff --git a/allure-results/b3e1425a-90d1-471f-96dd-a5d7e4486be3-container.json b/allure-results/b3e1425a-90d1-471f-96dd-a5d7e4486be3-container.json new file mode 100644 index 0000000..3390f43 --- /dev/null +++ b/allure-results/b3e1425a-90d1-471f-96dd-a5d7e4486be3-container.json @@ -0,0 +1 @@ +{"uuid":"b3e1425a-90d1-471f-96dd-a5d7e4486be3","name":"com.postRequests.PostTestCase","children":[],"befores":[],"afters":[],"start":1678380208162,"stop":1678380208330} \ No newline at end of file diff --git a/allure-results/b88f6a1f-dbbe-4e1e-83c6-f899a26af317-container.json b/allure-results/b88f6a1f-dbbe-4e1e-83c6-f899a26af317-container.json new file mode 100644 index 0000000..6cdda4a --- /dev/null +++ b/allure-results/b88f6a1f-dbbe-4e1e-83c6-f899a26af317-container.json @@ -0,0 +1 @@ +{"uuid":"b88f6a1f-dbbe-4e1e-83c6-f899a26af317","name":"com.getRequests.GetTestCases","children":[],"befores":[],"afters":[],"start":1678380491353,"stop":1678380491514} \ No newline at end of file diff --git a/allure-results/c456e334-72aa-4d42-b88c-7c8a30e79335-container.json b/allure-results/c456e334-72aa-4d42-b88c-7c8a30e79335-container.json new file mode 100644 index 0000000..06c7eb4 --- /dev/null +++ b/allure-results/c456e334-72aa-4d42-b88c-7c8a30e79335-container.json @@ -0,0 +1 @@ +{"uuid":"c456e334-72aa-4d42-b88c-7c8a30e79335","name":" Smoke Test","children":[],"befores":[],"afters":[],"start":1678380092654,"stop":1678380092866} \ No newline at end of file diff --git a/allure-results/d3c6c756-9783-497a-be67-444df85c84e4-container.json b/allure-results/d3c6c756-9783-497a-be67-444df85c84e4-container.json new file mode 100644 index 0000000..0baab78 --- /dev/null +++ b/allure-results/d3c6c756-9783-497a-be67-444df85c84e4-container.json @@ -0,0 +1 @@ +{"uuid":"d3c6c756-9783-497a-be67-444df85c84e4","name":"AlmosaferTest","children":["f9dc9696-d661-4416-8fd0-b5c7b9e491d7"],"befores":[],"afters":[],"start":1678380394164,"stop":1678380394392} \ No newline at end of file diff --git a/allure-results/d5019417-4c17-49a4-9d01-b9d54352c60e-container.json b/allure-results/d5019417-4c17-49a4-9d01-b9d54352c60e-container.json new file mode 100644 index 0000000..53f5e80 --- /dev/null +++ b/allure-results/d5019417-4c17-49a4-9d01-b9d54352c60e-container.json @@ -0,0 +1 @@ +{"uuid":"d5019417-4c17-49a4-9d01-b9d54352c60e","name":"Default Suite","children":["e5269c09-e775-4fc0-a2cf-71424486951a"],"befores":[],"afters":[],"start":1678380309356,"stop":1678380309516} \ No newline at end of file diff --git a/allure-results/e5269c09-e775-4fc0-a2cf-71424486951a-container.json b/allure-results/e5269c09-e775-4fc0-a2cf-71424486951a-container.json new file mode 100644 index 0000000..054d052 --- /dev/null +++ b/allure-results/e5269c09-e775-4fc0-a2cf-71424486951a-container.json @@ -0,0 +1 @@ +{"uuid":"e5269c09-e775-4fc0-a2cf-71424486951a","name":"code-challenge","children":[],"befores":[],"afters":[],"start":1678380309358,"stop":1678380309457} \ No newline at end of file diff --git a/allure-results/eb9c3dcc-a579-4dd0-8842-b6b144d8bb09-container.json b/allure-results/eb9c3dcc-a579-4dd0-8842-b6b144d8bb09-container.json new file mode 100644 index 0000000..870dd96 --- /dev/null +++ b/allure-results/eb9c3dcc-a579-4dd0-8842-b6b144d8bb09-container.json @@ -0,0 +1 @@ +{"uuid":"eb9c3dcc-a579-4dd0-8842-b6b144d8bb09","name":"com.getRequests.GetTestCases","children":[],"befores":[],"afters":[],"start":1678380182302,"stop":1678380182465} \ No newline at end of file diff --git a/allure-results/ee38f440-2921-44de-895a-ec4613a06de5-container.json b/allure-results/ee38f440-2921-44de-895a-ec4613a06de5-container.json new file mode 100644 index 0000000..8300c4a --- /dev/null +++ b/allure-results/ee38f440-2921-44de-895a-ec4613a06de5-container.json @@ -0,0 +1 @@ +{"uuid":"ee38f440-2921-44de-895a-ec4613a06de5","name":"AlmosaferTest","children":["b1f179f3-a4c5-4f8d-8645-c79920aff8f5"],"befores":[],"afters":[],"start":1678380491352,"stop":1678380491527} \ No newline at end of file diff --git a/allure-results/f6a3a76f-baac-46e0-9a6e-e4bcf845652e-container.json b/allure-results/f6a3a76f-baac-46e0-9a6e-e4bcf845652e-container.json new file mode 100644 index 0000000..ae1e5b4 --- /dev/null +++ b/allure-results/f6a3a76f-baac-46e0-9a6e-e4bcf845652e-container.json @@ -0,0 +1 @@ +{"uuid":"f6a3a76f-baac-46e0-9a6e-e4bcf845652e","name":" Smoke Test","children":[],"befores":[],"afters":[],"start":1678380257235,"stop":1678380257357} \ No newline at end of file diff --git a/allure-results/f9dc9696-d661-4416-8fd0-b5c7b9e491d7-container.json b/allure-results/f9dc9696-d661-4416-8fd0-b5c7b9e491d7-container.json new file mode 100644 index 0000000..db0a1bf --- /dev/null +++ b/allure-results/f9dc9696-d661-4416-8fd0-b5c7b9e491d7-container.json @@ -0,0 +1 @@ +{"uuid":"f9dc9696-d661-4416-8fd0-b5c7b9e491d7","name":" Smoke Test","children":[],"befores":[],"afters":[],"start":1678380394165,"stop":1678380394294} \ No newline at end of file diff --git a/src/test/java/getRequests/GetTestCases.java b/src/test/java/com/getRequests/GetTestCases.java similarity index 97% rename from src/test/java/getRequests/GetTestCases.java rename to src/test/java/com/getRequests/GetTestCases.java index 308e8c5..35c4c3c 100644 --- a/src/test/java/getRequests/GetTestCases.java +++ b/src/test/java/com/getRequests/GetTestCases.java @@ -1,4 +1,4 @@ -package getRequests; +package com.getRequests; import com.utils.PropReader; import helpers.DataHelper; diff --git a/src/test/java/postRequests/PostTestCase.java b/src/test/java/com/postRequests/PostTestCase.java similarity index 99% rename from src/test/java/postRequests/PostTestCase.java rename to src/test/java/com/postRequests/PostTestCase.java index 12398a1..9fd18b5 100644 --- a/src/test/java/postRequests/PostTestCase.java +++ b/src/test/java/com/postRequests/PostTestCase.java @@ -1,4 +1,4 @@ -package postRequests; +package com.postRequests; import com.utils.PropReader; import helpers.DataHelper; import io.restassured.RestAssured; diff --git a/src/test/resources/TestResult.xml b/src/test/resources/TestResult.xml new file mode 100644 index 0000000..c94130b --- /dev/null +++ b/src/test/resources/TestResult.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/test-classes/TestResult.xml b/target/test-classes/TestResult.xml new file mode 100644 index 0000000..c94130b --- /dev/null +++ b/target/test-classes/TestResult.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/test-classes/getRequests/GetTestCases.class b/target/test-classes/com/getRequests/GetTestCases.class similarity index 89% rename from target/test-classes/getRequests/GetTestCases.class rename to target/test-classes/com/getRequests/GetTestCases.class index 15cd2f6faab4a02db59706c801c273368f650d51..c2b9fdcf59b41b04667a388deb3f18adf76559f1 100644 GIT binary patch delta 32 mcmbQmzleXr8a6qf5l=l}o! diff --git a/target/test-classes/postRequests/PostTestCase.class b/target/test-classes/com/postRequests/PostTestCase.class similarity index 93% rename from target/test-classes/postRequests/PostTestCase.class rename to target/test-classes/com/postRequests/PostTestCase.class index 9fb4bc8962e618834db34f84c2b6fee40eec9ff6..ef6bd8245e7e1c490a481693f36bc3c8fe52601f 100644 GIT binary patch delta 31 lcmeyR+N3t&Et|Yga(=G<#`lYvS!F@2iSH#huVL}y0|3t&3{n69 delta 25 hcmZot`=vVJEt9m*8en|TDHE&t^&I0|0n|2qypl From 57c4a948146811ac7216e7cbd79b1af21c5bb1b2 Mon Sep 17 00:00:00 2001 From: Lozana Enbah Date: Sat, 11 Mar 2023 02:56:38 +0300 Subject: [PATCH 7/7] changes --- ...71de-4df5-997a-4368edd4062c-container.json | 1 + ...c793-48f3-abe4-1736346f509c-container.json | 1 + ...6756-4542-8f1c-6419a7b6cf32-container.json | 1 + ...61f9-4198-b24c-1afe961cbaaf-container.json | 1 + ...4be0-4de7-9aa4-3f4483eda75e-container.json | 1 + ...4721-42f4-a87f-e1124deeba93-container.json | 1 + ...9cc3-4dd2-bbc2-d83412574bf0-container.json | 1 + ...1de2-436e-9d7b-267675eb4f58-container.json | 1 + ...f12b-4b39-9829-c57c1fe22845-container.json | 1 + ...2f81-4d2b-902c-2f1811386984-container.json | 1 + ...c2f2-4008-be39-7fe8a3165799-container.json | 1 + ...8448-4d98-8b6c-05235cd7139c-container.json | 1 + ...9a07-48b0-8bbe-88b20ce82f05-container.json | 1 + pom.xml | 6 --- src/main/java/helpers/DataHelper.java | 43 +----------------- .../java/com/getRequests/GetTestCases.java | 4 ++ .../java/com/postRequests/PostTestCase.java | 2 +- src/test/resources/TestData.xml | 4 +- target/classes/helpers/DataHelper.class | Bin 3037 -> 1160 bytes target/test-classes/TestData.xml | 4 +- .../com/getRequests/GetTestCases.class | Bin 1954 -> 1954 bytes .../com/postRequests/PostTestCase.class | Bin 4866 -> 4872 bytes 22 files changed, 24 insertions(+), 52 deletions(-) create mode 100644 allure-results/1664ccb7-71de-4df5-997a-4368edd4062c-container.json create mode 100644 allure-results/3524f1d1-c793-48f3-abe4-1736346f509c-container.json create mode 100644 allure-results/3ba22ece-6756-4542-8f1c-6419a7b6cf32-container.json create mode 100644 allure-results/4f42020c-61f9-4198-b24c-1afe961cbaaf-container.json create mode 100644 allure-results/559a4ff7-4be0-4de7-9aa4-3f4483eda75e-container.json create mode 100644 allure-results/6b5db8cf-4721-42f4-a87f-e1124deeba93-container.json create mode 100644 allure-results/72cdf5b3-9cc3-4dd2-bbc2-d83412574bf0-container.json create mode 100644 allure-results/76331d88-1de2-436e-9d7b-267675eb4f58-container.json create mode 100644 allure-results/8c052f90-f12b-4b39-9829-c57c1fe22845-container.json create mode 100644 allure-results/996803d6-2f81-4d2b-902c-2f1811386984-container.json create mode 100644 allure-results/e53288f0-c2f2-4008-be39-7fe8a3165799-container.json create mode 100644 allure-results/f3121a72-8448-4d98-8b6c-05235cd7139c-container.json create mode 100644 allure-results/f364c356-9a07-48b0-8bbe-88b20ce82f05-container.json diff --git a/allure-results/1664ccb7-71de-4df5-997a-4368edd4062c-container.json b/allure-results/1664ccb7-71de-4df5-997a-4368edd4062c-container.json new file mode 100644 index 0000000..6afc26f --- /dev/null +++ b/allure-results/1664ccb7-71de-4df5-997a-4368edd4062c-container.json @@ -0,0 +1 @@ +{"uuid":"1664ccb7-71de-4df5-997a-4368edd4062c","name":"code-challenge","children":[],"befores":[],"afters":[],"start":1678491180656,"stop":1678491180750} \ No newline at end of file diff --git a/allure-results/3524f1d1-c793-48f3-abe4-1736346f509c-container.json b/allure-results/3524f1d1-c793-48f3-abe4-1736346f509c-container.json new file mode 100644 index 0000000..9f1cb1a --- /dev/null +++ b/allure-results/3524f1d1-c793-48f3-abe4-1736346f509c-container.json @@ -0,0 +1 @@ +{"uuid":"3524f1d1-c793-48f3-abe4-1736346f509c","name":"com.getRequests.GetTestCases","children":[],"befores":[],"afters":[],"start":1678491008260,"stop":1678491008389} \ No newline at end of file diff --git a/allure-results/3ba22ece-6756-4542-8f1c-6419a7b6cf32-container.json b/allure-results/3ba22ece-6756-4542-8f1c-6419a7b6cf32-container.json new file mode 100644 index 0000000..5bcbe42 --- /dev/null +++ b/allure-results/3ba22ece-6756-4542-8f1c-6419a7b6cf32-container.json @@ -0,0 +1 @@ +{"uuid":"3ba22ece-6756-4542-8f1c-6419a7b6cf32","name":"Default Suite","children":["6b5db8cf-4721-42f4-a87f-e1124deeba93"],"befores":[],"afters":[],"start":1678491008259,"stop":1678491008395} \ No newline at end of file diff --git a/allure-results/4f42020c-61f9-4198-b24c-1afe961cbaaf-container.json b/allure-results/4f42020c-61f9-4198-b24c-1afe961cbaaf-container.json new file mode 100644 index 0000000..899b2ae --- /dev/null +++ b/allure-results/4f42020c-61f9-4198-b24c-1afe961cbaaf-container.json @@ -0,0 +1 @@ +{"uuid":"4f42020c-61f9-4198-b24c-1afe961cbaaf","name":"com.getRequests.GetTestCases","children":[],"befores":[],"afters":[],"start":1678491180656,"stop":1678491181834} \ No newline at end of file diff --git a/allure-results/559a4ff7-4be0-4de7-9aa4-3f4483eda75e-container.json b/allure-results/559a4ff7-4be0-4de7-9aa4-3f4483eda75e-container.json new file mode 100644 index 0000000..097b457 --- /dev/null +++ b/allure-results/559a4ff7-4be0-4de7-9aa4-3f4483eda75e-container.json @@ -0,0 +1 @@ +{"uuid":"559a4ff7-4be0-4de7-9aa4-3f4483eda75e","name":"com.postRequests.PostTestCase","children":[],"befores":[],"afters":[],"start":1678488531680,"stop":1678488531917} \ No newline at end of file diff --git a/allure-results/6b5db8cf-4721-42f4-a87f-e1124deeba93-container.json b/allure-results/6b5db8cf-4721-42f4-a87f-e1124deeba93-container.json new file mode 100644 index 0000000..f782f9e --- /dev/null +++ b/allure-results/6b5db8cf-4721-42f4-a87f-e1124deeba93-container.json @@ -0,0 +1 @@ +{"uuid":"6b5db8cf-4721-42f4-a87f-e1124deeba93","name":"code-challenge","children":[],"befores":[],"afters":[],"start":1678491008260,"stop":1678491008342} \ No newline at end of file diff --git a/allure-results/72cdf5b3-9cc3-4dd2-bbc2-d83412574bf0-container.json b/allure-results/72cdf5b3-9cc3-4dd2-bbc2-d83412574bf0-container.json new file mode 100644 index 0000000..b6af836 --- /dev/null +++ b/allure-results/72cdf5b3-9cc3-4dd2-bbc2-d83412574bf0-container.json @@ -0,0 +1 @@ +{"uuid":"72cdf5b3-9cc3-4dd2-bbc2-d83412574bf0","name":"com.getRequests.GetTestCases","children":[],"befores":[],"afters":[],"start":1678488531680,"stop":1678488531909} \ No newline at end of file diff --git a/allure-results/76331d88-1de2-436e-9d7b-267675eb4f58-container.json b/allure-results/76331d88-1de2-436e-9d7b-267675eb4f58-container.json new file mode 100644 index 0000000..e0c760a --- /dev/null +++ b/allure-results/76331d88-1de2-436e-9d7b-267675eb4f58-container.json @@ -0,0 +1 @@ +{"uuid":"76331d88-1de2-436e-9d7b-267675eb4f58","name":"Default Suite","children":["e53288f0-c2f2-4008-be39-7fe8a3165799"],"befores":[],"afters":[],"start":1678491764649,"stop":1678491764803} \ No newline at end of file diff --git a/allure-results/8c052f90-f12b-4b39-9829-c57c1fe22845-container.json b/allure-results/8c052f90-f12b-4b39-9829-c57c1fe22845-container.json new file mode 100644 index 0000000..e31258b --- /dev/null +++ b/allure-results/8c052f90-f12b-4b39-9829-c57c1fe22845-container.json @@ -0,0 +1 @@ +{"uuid":"8c052f90-f12b-4b39-9829-c57c1fe22845","name":" Smoke Test","children":[],"befores":[],"afters":[],"start":1678488531679,"stop":1678488531853} \ No newline at end of file diff --git a/allure-results/996803d6-2f81-4d2b-902c-2f1811386984-container.json b/allure-results/996803d6-2f81-4d2b-902c-2f1811386984-container.json new file mode 100644 index 0000000..fa8556f --- /dev/null +++ b/allure-results/996803d6-2f81-4d2b-902c-2f1811386984-container.json @@ -0,0 +1 @@ +{"uuid":"996803d6-2f81-4d2b-902c-2f1811386984","name":"com.getRequests.GetTestCases","children":[],"befores":[],"afters":[],"start":1678491764651,"stop":1678491764797} \ No newline at end of file diff --git a/allure-results/e53288f0-c2f2-4008-be39-7fe8a3165799-container.json b/allure-results/e53288f0-c2f2-4008-be39-7fe8a3165799-container.json new file mode 100644 index 0000000..911dfcb --- /dev/null +++ b/allure-results/e53288f0-c2f2-4008-be39-7fe8a3165799-container.json @@ -0,0 +1 @@ +{"uuid":"e53288f0-c2f2-4008-be39-7fe8a3165799","name":"code-challenge","children":[],"befores":[],"afters":[],"start":1678491764651,"stop":1678491764744} \ No newline at end of file diff --git a/allure-results/f3121a72-8448-4d98-8b6c-05235cd7139c-container.json b/allure-results/f3121a72-8448-4d98-8b6c-05235cd7139c-container.json new file mode 100644 index 0000000..f028816 --- /dev/null +++ b/allure-results/f3121a72-8448-4d98-8b6c-05235cd7139c-container.json @@ -0,0 +1 @@ +{"uuid":"f3121a72-8448-4d98-8b6c-05235cd7139c","name":"Default Suite","children":["1664ccb7-71de-4df5-997a-4368edd4062c"],"befores":[],"afters":[],"start":1678491180655,"stop":1678491181849} \ No newline at end of file diff --git a/allure-results/f364c356-9a07-48b0-8bbe-88b20ce82f05-container.json b/allure-results/f364c356-9a07-48b0-8bbe-88b20ce82f05-container.json new file mode 100644 index 0000000..d6523fa --- /dev/null +++ b/allure-results/f364c356-9a07-48b0-8bbe-88b20ce82f05-container.json @@ -0,0 +1 @@ +{"uuid":"f364c356-9a07-48b0-8bbe-88b20ce82f05","name":"AlmosaferTest","children":["8c052f90-f12b-4b39-9829-c57c1fe22845"],"befores":[],"afters":[],"start":1678488531678,"stop":1678488531924} \ No newline at end of file diff --git a/pom.xml b/pom.xml index b47464a..c5efa19 100644 --- a/pom.xml +++ b/pom.xml @@ -64,12 +64,6 @@ allure-rest-assured 2.21.0 - - - org.apache.maven.reporting - maven-reporting-impl - 3.1.0 - diff --git a/src/main/java/helpers/DataHelper.java b/src/main/java/helpers/DataHelper.java index 31bfbc0..21c1346 100644 --- a/src/main/java/helpers/DataHelper.java +++ b/src/main/java/helpers/DataHelper.java @@ -1,44 +1,15 @@ package helpers; -import org.openqa.selenium.JavascriptExecutor; -import java.io.File; -import java.security.SecureRandom; import java.text.SimpleDateFormat; -import java.time.LocalDate; + import java.util.Date; import static com.utils.PropReader.readConfig; import static com.utils.readers.XMLFileReader.getElementTextByTagName; public class DataHelper { - public static String getRandString(int vinLength) { - String chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"; - StringBuilder salt = new StringBuilder(); - SecureRandom random = new SecureRandom(); - while (salt.length() < vinLength) { - int index = (int) (random.nextFloat() * chars.length()); - salt.append(chars.charAt(index)); - } - return salt.toString(); - } - public static String getRandArabicString(int vinLength) { - String chars = "ابتثجحخدذرزسشصضطظعغفقكلمنهوي١٢٣٤٥٦٧٨٩٠"; - StringBuilder salt = new StringBuilder(); - SecureRandom random = new SecureRandom(); - while (salt.length() < vinLength) { - int index = (int) (random.nextFloat() * chars.length()); - salt.append(chars.charAt(index)); - } - return salt.toString(); - } - public static int getRandNumber(int number) { - int randomNumber = (int) Math.floor(Math.random() * number); - if (randomNumber == 0) { - return 1; - } - return randomNumber; - } + public static String getTestData(String testKey) { String dataFile = readConfig("datafile"); return getElementTextByTagName(dataFile, testKey); @@ -56,16 +27,6 @@ public static String getSpecificDate(String d ) { return formatter.format(date1); } - public static String getRandomPhoneNUmber() { - String chars = "1234567890"; - StringBuilder salt = new StringBuilder(); - SecureRandom random = new SecureRandom(); - while (salt.length() < 7) { // length of the random string. - int index = (int) (random.nextFloat() * chars.length()); - salt.append(chars.charAt(index)); - } - return "0096279" + salt; - } } diff --git a/src/test/java/com/getRequests/GetTestCases.java b/src/test/java/com/getRequests/GetTestCases.java index 35c4c3c..2a78c9e 100644 --- a/src/test/java/com/getRequests/GetTestCases.java +++ b/src/test/java/com/getRequests/GetTestCases.java @@ -2,7 +2,9 @@ import com.utils.PropReader; import helpers.DataHelper; +import io.qameta.allure.restassured.AllureRestAssured; import io.restassured.RestAssured; +import io.restassured.response.Response; import org.testng.annotations.Test; import static io.restassured.RestAssured.given; @@ -34,4 +36,6 @@ public void testGetLastSearchMethod() { } + + } diff --git a/src/test/java/com/postRequests/PostTestCase.java b/src/test/java/com/postRequests/PostTestCase.java index 9fd18b5..518b586 100644 --- a/src/test/java/com/postRequests/PostTestCase.java +++ b/src/test/java/com/postRequests/PostTestCase.java @@ -47,7 +47,7 @@ public void testAccommodationSearchPostMethod() { given() .contentType(ContentType.JSON) .header("Authorization", DataHelper.getTestData("bearerToken")) - .body("{\"searchCriteria\":[{\"lookupTypeId\":2,\"lookupId\":[9]}],\"checkIn\":\"2023-03-09\",\"checkOut\":\"2023-04-02\",\"sortBy\":\"rank\",\"sortOrder\":\"DESC\",\"rankType\":\"dynamic\",\"pageNo\":1,\"pageSize\":10}").post("/api/accommodation/property/search") + .body("{\"searchCriteria\":[{\"lookupTypeId\":2,\"lookupId\":[9]}],\"checkIn\":\""+DataHelper.getTestData("checkIn")+"\",\"checkOut\":\""+DataHelper.getTestData("checkOut")+"\",\"sortBy\":\"rank\",\"sortOrder\":\"DESC\",\"rankType\":\"dynamic\",\"pageNo\":1,\"pageSize\":10}").post("/api/accommodation/property/search") .then().log().all().assertThat().statusCode(200); } diff --git a/src/test/resources/TestData.xml b/src/test/resources/TestData.xml index 6fb88a0..2e2ba35 100644 --- a/src/test/resources/TestData.xml +++ b/src/test/resources/TestData.xml @@ -5,8 +5,8 @@ - 2023-03-11 - 2023-03-12 + 2023-03-20 + 2023-03-25 2 2 null diff --git a/target/classes/helpers/DataHelper.class b/target/classes/helpers/DataHelper.class index 2c1d69442e9baa2d270a0461162c27ca920608dc..fac63bb3b98116c82742d68847d8f76e13eb8d11 100644 GIT binary patch delta 533 zcmZut%TB^j6r7ev%cT~r$WsMHd=wPls2fAVPE1_5VPQ-YF~P7zwyaFtn#TXojSxxv z05^VtG5R6Kxy9hdHo5ma=FH4J@A2Ev;p_MF3xF~X1jdlpu_&;FWq}pg8VWj!0s*XQ zSQF5Zmq|%RtgLI;xVt%Xzm$q%xfM0)=G1%lP0h@jh$zr6oVIh>Y&A4&8rVWi!?uAP z?7APmV$wuefqCV0oYHl>*(z0?cEi9P_T3Y|?ZyM2UChCtCHeV5EFwI|nU#1eyaRR* z$|D066Fh@nF${~bF$7=|QDz}bA;yXvt`ePhe`|(s9V7vw4(v^dJmzRU3h}{qc@2JO$pkvXi8d@3WBej z#tbuy3bV+Nxf4QmKr7<2Y9okgTS0YVE^5Y^!}B)wTQq{RK1M+W*mIyYEbRXtKKcLDnL3@11kbK4+hOZt}f(V=RI*Q8eJJjOU|RB|89=+kWd-leo{gxVP!Q5 zbxGaSMrLy3nmwwH8$5|6t&D1%RBc`Ci-#d+N-s!gOipP=Ub71wgQ}w*_Sd}&i>K^m4&eL**qnmOrA@jNr7+6*5n z=M*Zah9hB3$-99W-NH^~^#63k3zlkSrF&oWrJ1lmsOJTzFl>AfsBr5u`}i7B5M)w=5m9L!Tqs ztb|CGo?{n{(_l5VR_m%gxcisEO`_}tR zhNWO9@(NxC%l2C|!4}CVC~(j%V@AORyt0sNS^7y=Hrt*`wa@ZTkVEy?`n4_gLBT9u zrQLF3>IW>#DLA&8PifASl`YhT@md70D|iEMa!yL8ko{dE^XT|_EyI~vcC?`Euu+^j z-U4C@O^Rm7uvA*}WQZCUv)IqA(0qb>HJ{f^%AzHnC{^Op3`QJl0V62TAN`an=9`fR zsjCUYvdCm8J}9=087tQzSSWNHv#tDbP316?2b+t8Wlre4NH#3lh+}c_oK7W$^cKul zQ=|tCEvK2Bz>Chn?5H|9qUNag?lNQeKL@j^jH|da!@CO~a1xGa<-hAz)hzrz~lHM!h9ifExn8;Gob@PHXtraiZ z0AxtbIF>yt<0^AcTGsSTo_E)%5+1yf0yENqyyVld%53?XU?g{O%Qh5zrbN__>k0 z4n8G5t6FbEy2V8WO@Xj~Sc}bED}ezX#}@9Yu@&2RvXSe1{C2M5vo}_eyo<`Q+X$uZ zqKeP($c{P4&DXHLeGZYfIaFUc|4~;MmTUh|-N#v@x|B?7|MTvy=wD*~uC! zc>>g-;yxN=bjqldQMH-1>@HKwibqvTGjZ24n-=D=j;r;|W&>;4$XYf%`dap2Z?P}u zNK6F_ZkR`H^VR8j)P3By_ES`aZmhlGGbLIa^V!?N{I-&rZDc*}=d>zt#gjg(HS9_k zSCY>lW$`yw^48>!x$Yv^AngU1604ub%4A#XJYu4&fsms9yEY1H$Fk@Ode|u;voN0W zdsfXp_7x+Jk~b0YvAbv(i#6Ux(~-MaMOCd%wo*!uEk&=TC77A`!5CvRgl@Hn>>MZ?qOd?Tau1d`4N`ySRc&Sc7xii(BL+{;U52Qe4p4 diff --git a/target/test-classes/TestData.xml b/target/test-classes/TestData.xml index 6fb88a0..2e2ba35 100644 --- a/target/test-classes/TestData.xml +++ b/target/test-classes/TestData.xml @@ -5,8 +5,8 @@ - 2023-03-11 - 2023-03-12 + 2023-03-20 + 2023-03-25 2 2 null diff --git a/target/test-classes/com/getRequests/GetTestCases.class b/target/test-classes/com/getRequests/GetTestCases.class index c2b9fdcf59b41b04667a388deb3f18adf76559f1..d98d52ffda619255ad70e170a5de1b7c33b6cb1e 100644 GIT binary patch delta 85 zcmZ3)zleW>G#ew&WEr*|SwRL424Mz%1`!5n22lnz1~CRb25|;61__1`2Fb})?2410 hv6aip09DBWRmlTYDF9U|0#zviRVf2isQ^`J001CA3-JH| delta 85 zcmZ3)zleW>G#ew=WEr*|S$+l%20;dX1|bG%24My@1`!5522lnx1~G;Z2Jy*N?2410 hv6ah80aeKWRmlQX$pKZ#163&iRVe~hDFIb!000{03(o)m diff --git a/target/test-classes/com/postRequests/PostTestCase.class b/target/test-classes/com/postRequests/PostTestCase.class index ef6bd8245e7e1c490a481693f36bc3c8fe52601f..04bcf2c1a9c07026861c5eb7cf2e75879e48d817 100644 GIT binary patch delta 174 zcmZot>rmr5^>5cc1_lOmhFKH2rmzYzFft@g4x)s+%|P*Dx`zo17_V&aBG7FgZ#nn%$Mbm?4|NbTXrm{N&q0T*^~{PT&ICJ(*!T W!xRQdhIk;KkAaCH0VtLTCQ|@=VJhPQ delta 187 zcmeBBYf|Gn^>5cc1_lOmhM5z&rZ96bq-G>;0xZooB1#cb3em`&5az{tQ_nN6L}bV8KzF2&8NvYeezMh zt&B4^SMx7n;#|nU!oUc$Eq=0wkP4&f