From 134200375a7ac21b83905e1c9d1d151b724f482a Mon Sep 17 00:00:00 2001 From: Menaka Jayawardena Date: Thu, 26 Jan 2017 15:48:41 +0530 Subject: [PATCH] merging menaka's commit --- .../org/wso2/iot/integration/common/OAuthUtil.java | 11 +++-------- .../MobileDeviceManagementWithNoDevices.java | 8 +++----- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/OAuthUtil.java b/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/OAuthUtil.java index b2b7a93f..61eb466d 100644 --- a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/OAuthUtil.java +++ b/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/OAuthUtil.java @@ -27,15 +27,10 @@ import org.wso2.carbon.automation.test.utils.http.client.HttpResponse; */ public class OAuthUtil { - public static String getScopes(String backendHTTPURL, String backendHTTPSURL) throws Exception { - return getOAuthTokenPair(backendHTTPURL, backendHTTPSURL).get(Constants.SCOPE).toString(); - } - - public static String getOAuthToken(String backendHTTPURL, String backendHTTPSURL) throws Exception { - return getOAuthTokenPair(backendHTTPURL, backendHTTPSURL).get(Constants.OAUTH_ACCESS_TOKEN).toString(); - } - public static JSONObject getOAuthTokenPair(String backendHTTPURL, String backendHTTPSURL) throws Exception { + public static String getOAuthToken(String backendHTTPURL, String backendHTTPSURL) + throws Exception { + Thread.sleep(10000); String AuthString = "Basic YWRtaW46YWRtaW4="; RestClient client = new RestClient(backendHTTPURL, Constants.APPLICATION_JSON, AuthString); HttpResponse oAuthData = client.post(Constants.APIApplicationRegistration.API_APP_REGISTRATION_ENDPOINT, diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java b/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java index b2e76bea..07aa8eb9 100644 --- a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java +++ b/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java @@ -54,6 +54,8 @@ public class MobileDeviceManagementWithNoDevices extends TestBase { @BeforeClass(alwaysRun = true, groups = { Constants.MobileDeviceManagement.MOBILE_DEVICE_MANAGEMENT_GROUP}) public void initTest() throws Exception { + super.init(TestUserMode.SUPER_TENANT_ADMIN); + Thread.sleep(10000); String accessTokenString = "Bearer " + OAuthUtil.getOAuthToken(backendHTTPSURL, backendHTTPSURL); this.client = new IOTHttpClient(backendHTTPSURL, Constants.APPLICATION_JSON, accessTokenString); } @@ -65,9 +67,5 @@ public class MobileDeviceManagementWithNoDevices extends TestBase { Assert.assertEquals(Constants.MobileDeviceManagement.NO_DEVICE, response.getBody()); } - private boolean checkScopes(String permissionsList) throws Exception { - String tokenString = OAuthUtil.getScopes(backendHTTPSURL, backendHTTPSURL); - return tokenString.contains(permissionsList); - } -} \ No newline at end of file +}