From b504cbe5222ddc5f57d97af711718ccbf623b7c0 Mon Sep 17 00:00:00 2001 From: Mavlushechka Date: Thu, 20 Oct 2022 00:50:48 +0500 Subject: Remove vkontakte.account object from testData.json --- src/main/java/com/mavlushechka/a1qa/project/utils/VkApiUtils.java | 2 +- src/main/resources/testData.json | 5 ----- src/test/java/com/mavlushechka/a1qa/project/TestCase1.java | 4 ++-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/mavlushechka/a1qa/project/utils/VkApiUtils.java b/src/main/java/com/mavlushechka/a1qa/project/utils/VkApiUtils.java index a5cd439..2d02c7a 100644 --- a/src/main/java/com/mavlushechka/a1qa/project/utils/VkApiUtils.java +++ b/src/main/java/com/mavlushechka/a1qa/project/utils/VkApiUtils.java @@ -14,7 +14,7 @@ public class VkApiUtils { private final static double apiVersion = 5.131; - private final static String url = "https://api.vk.com/method/%s?v=" + apiVersion + "&%s&access_token=" + JsonParser.parseData("testData", "vkontakte.account.token"); + private final static String url = "https://api.vk.com/method/%s?v=" + apiVersion + "&%s&access_token=" + System.getProperty("vkontakte.account.token"); public static User getCurrentUser() throws IOException { diff --git a/src/main/resources/testData.json b/src/main/resources/testData.json index 0ebb86e..6713095 100644 --- a/src/main/resources/testData.json +++ b/src/main/resources/testData.json @@ -1,10 +1,5 @@ { "vkontakte": { - "account": { - "login": "", - "password": "", - "token": "" - }, "photoFromAlbum": { "id": "457252090" } diff --git a/src/test/java/com/mavlushechka/a1qa/project/TestCase1.java b/src/test/java/com/mavlushechka/a1qa/project/TestCase1.java index b482f1a..ebb0bae 100644 --- a/src/test/java/com/mavlushechka/a1qa/project/TestCase1.java +++ b/src/test/java/com/mavlushechka/a1qa/project/TestCase1.java @@ -26,11 +26,11 @@ public class TestCase1 extends BaseTest { HomePage homePage = new HomePage(); Assert.assertTrue(homePage.isOpened(), "This is not the " + homePage.getName() + " page."); LoggerUtils.step("[UI] Authorize."); - homePage.performAuthorization(JsonParser.parseData("testData", "vkontakte.account.login")); + homePage.performAuthorization(System.getProperty("vkontakte.account.login")); SignInPage signInPage = new SignInPage(); Assert.assertTrue(signInPage.isOpened(), "This is not the " + signInPage.getName() + " page."); - signInPage.performAuthorization(JsonParser.parseData("testData", "vkontakte.account.password")); + signInPage.performAuthorization(System.getProperty("vkontakte.account.password")); FeedPage feedPage = new FeedPage(); Assert.assertTrue(feedPage.isOpened(), "This is not the " + feedPage.getName() + " page."); -- cgit v1.2.3