Merge pull request #12 from project-sunbird/Issue-SB-5072

Issue SB- - 5072- User Functional test case fixes
project-sunbird · Jul 3, 2018 · 2d75dde · 2d75dde
2 parents b27fa20 + 29b20a4
commit 2d75dde
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 20 deletions.
diff --git a/sunbird_service_api_test/src/test/java/org/sunbird/integration/test/user/EndpointConfig.java b/sunbird_service_api_test/src/test/java/org/sunbird/integration/test/user/EndpointConfig.java
@@ -38,8 +38,7 @@ public TestGlobalProperty initGlobalValues() {
     property.setEsPort(System.getenv("sunbird_es_port"));
     property.setIndexType(System.getenv("sunbird_es_index_type"));
     property.setIndex(System.getenv("sunbird_es_index"));
-    // System.getenv("sunbird_default_channel")
-    property.setSunbirdDefaultChannel("sunbird-dev");
+    property.setSunbirdDefaultChannel(System.getenv("sunbird_default_channel"));
     property.setLmsUrl(System.getenv("sunbird_test_base_url"));
     return property;
   }

diff --git a/sunbird_service_api_test/src/test/java/org/sunbird/integration/test/user/UserTest.java b/sunbird_service_api_test/src/test/java/org/sunbird/integration/test/user/UserTest.java
@@ -41,6 +41,7 @@ public class UserTest extends TestNGCitrusTestDesigner {
   private static volatile String USER_NAME = "userName";
   private static String externalId = String.valueOf(System.currentTimeMillis());
   private static String provider = String.valueOf(System.currentTimeMillis() + 10);
+  private static TestGlobalProperty testGlobalProperty = new EndpointConfig().initGlobalValues();
 
   /**
    * User can define the api request and response json structure. first index is request json
@@ -93,11 +94,6 @@ public Object[][] createUserDynamicJsonData() {
         Constant.USER_TEMPLATE_LOCATION + "user_username_exist_response.json",
         "duplicateUsernameTest"
       },
-      new Object[] {
-        createUserWithDuplicateExtIdAndProvider(),
-        Constant.USER_TEMPLATE_LOCATION + "user_already_exist_response.json",
-        "duplicateExtIdAndProviderTest"
-      },
       new Object[] {
         createUserWithInvalidChannel(),
         Constant.USER_TEMPLATE_LOCATION + "invalid_channel_response.json",
@@ -110,11 +106,6 @@ public Object[][] createUserDynamicJsonData() {
   public Object[][] updateUserDataProvider() {
     return new Object[][] {
       new Object[] {updateUserWithId(), "update_user_success_response.json", "updateUserWithId"},
-      new Object[] {
-        updateUserWithExtIdAndProvider(),
-        "update_user_success_response.json",
-        "updateUserWithExtIdAndProvider"
-      },
       new Object[] {
         updateUserWithRegOrgId(),
         Constant.UPDATE_USER_TEMPLATE_LOCATION + "user_update_bad_request_response.json",
@@ -408,8 +399,6 @@ private String createUserWithInvalidChannel() {
     innerMap.put(
         Constant.EMAIL, Constant.USER_NAME_PREFIX + UUID.randomUUID().toString() + "@gmail.com");
     innerMap.put(Constant.USER_NAME, Constant.USER_NAME_PREFIX + UUID.randomUUID().toString());
-    innerMap.put(Constant.EXTERNAL_ID, externalId + 123);
-    innerMap.put(Constant.PROVIDER, provider + 234);
     innerMap.put(Constant.CHANNEL, "functionalTest#Invalid$Channel@1235123");
     requestMap.put(Constant.REQUEST, innerMap);
     try {
@@ -452,8 +441,7 @@ private static Map<String, Object> createUserInnerMap() {
     innerMap.put(Constant.FIRST_NAME, "ft_first_Name_pw12401");
     innerMap.put(Constant.LAST_NAME, "ft_lastName");
     innerMap.put(Constant.PASSWORD, "password");
-    innerMap.put(Constant.EXTERNAL_ID, externalId);
-    innerMap.put(Constant.PROVIDER, provider);
+    innerMap.put(Constant.CHANNEL,testGlobalProperty.getSunbirdDefaultChannel());
     USER_NAME = Constant.USER_NAME_PREFIX + EndpointConfig.val;
     String email = Constant.USER_NAME_PREFIX + EndpointConfig.val + "@gmail.com";
     innerMap.put(Constant.USER_NAME, USER_NAME);
@@ -468,6 +456,7 @@ private String updateUserWithId() {
     innerMap.put(Constant.ID, userId);
     innerMap.put(Constant.USER_ID, userId);
     innerMap.remove(Constant.USER_NAME);
+    innerMap.remove(Constant.CHANNEL);
     requestMap.put(Constant.REQUEST, innerMap);
 
     try {

diff --git a/...vice_api_test/src/test/resources/templates/user/create/user_duplicate_email_response.json b/...vice_api_test/src/test/resources/templates/user/create/user_duplicate_email_response.json
@@ -6,8 +6,8 @@
 {
 "resmsgid":null,
 "msgid":"@ignore@",
-"err":"USER_ALREADY_EXISTS",
-"status":"USER_ALREADY_EXISTS",
+"err":"USERNAME_EMAIL_IN_USE",
+"status":"USERNAME_EMAIL_IN_USE",
 "errmsg":"@ignore@"
 }
 ,"responseCode":"CLIENT_ERROR",

diff --git a/...rvice_api_test/src/test/resources/templates/user/create/user_username_exist_response.json b/...rvice_api_test/src/test/resources/templates/user/create/user_username_exist_response.json
@@ -6,8 +6,8 @@
 {
 "resmsgid":null,
 "msgid":"@ignore@",
-"err":"USER_ALREADY_EXISTS",
-"status":"USER_ALREADY_EXISTS",
+"err":"USERNAME_EMAIL_IN_USE",
+"status":"USERNAME_EMAIL_IN_USE",
 "errmsg":"@ignore@"
 }
 ,"responseCode":"CLIENT_ERROR",