Skip to content

getHierarchy FT #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
neha0305verma wants to merge 9 commits into
base: kp-test
Choose a base branch
from
Open

getHierarchy FT #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
93adaa6
getHierarchy FT
neha0305verma Dec 17, 2019
1ce2250
scenarious are added
neha0305verma Dec 17, 2019
abc4ec8
getHierarchy FT
neha0305verma Dec 23, 2019
1af303e
Merge branch 'kp-test' of https://github.com/project-sunbird/sunbird-…
neha0305verma Dec 23, 2019
30412c8
gethierarchy ft
neha0305verma Dec 27, 2019
064b777
FT added for live and image nodes
Jan 7, 2020
7782e01
Issue #SC-0000 fix: updated endpoints
krgauraw Jun 1, 2020
f659884
Merge Branch upstream/kp-test into kp-test
krgauraw Jun 30, 2020
521fb02
Merge branch 'kp-test-get-hierarchy' into kp-test-getHierarchy
krgauraw Jun 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions kp_service_test/src/test/java/org/sunbird/kp/test/common/BaseCitrusTestRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public class BaseCitrusTestRunner extends TestNGCitrusTestRunner {
public static final String REQUEST_JSON = "request.json";
public static final String RESPONSE_JSON = "response.json";
public static final String VALIDATE_JSON = "validate.json";
public static final String RESPONSE_JSON_IMAGE = "response_image.json";

private static final String API_KEY = AppConfig.config.getString("kp_api_key");
private static final Boolean IS_USER_AUTH_REQUIRED = AppConfig.config.getBoolean("user_auth_enable");
Expand Down
18 changes: 17 additions & 1 deletion kp_service_test/src/test/java/org/sunbird/kp/test/content/v3/ContentV3Scenario.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,22 @@ public class ContentV3Scenario {
public static final String TEST_UPDATE_HIERARCHY_WITH_1RESOURCE_ONLY = "testUpdateHierarchyWith1ResourceOnly";
public static final String TEST_UPDATE_HIERARCHY_WITH_MULTILEVEL_UNITS = "testUpdateHierarchyWithMultilevelUnitAnd1Resource";
public static final String TEST_UPDATE_HIERARCHY_WITH_1UNIT_1COLLECTION = "testUpdateHierarchyWith1Unit1CollectionValidRequest";

//Get Hierarchy Scenarios
public static final String TEST_GET_HIERARCHY_WITH_VALID_IDENTIFIER = "testGetHierarchyWithValidIdentifier";
public static final String TEST_GET_HIERARCHY_WITH_INVALID_IDENTIFIER = "testGetHierarchyWithInvalidIdentifier";
public static final String TEST_GET_HIERARCHY_WITH_EDIT_MODE = "testGetHierarchyWithEditMode";
public static final String TEST_GET_HIERARCHY_WITH_NULL_MODE = "testGetHierarchyWithNullMode";
public static final String TEST_GET_HIERARCHY_WITH_INVALID_MODE = "testGetHierarchyWithInvalidMode";
public static final String TEST_GET_HIERARCHY_WITH_EMPTY_MODE = "testGetHierarchyWithEmptyMode";
public static final String TEST_GET_HIERARCHY_BEFORE_UPDATE = "testGetHierarchyBeforeUpdate";
public static final String TEST_GET_HIERARCHY_AFTER_UPDATE = "testGetHierarchyAfterUpdate";
public static final String TEST_GET_HIERARCHY_AFTER_REVIEW = "testGetHierarchyAfterReview";
public static final String TEST_GET_HIERARCHY_AFTER_REJECT = "testGetHierarchyAfterReject";
public static final String TEST_GET_HIERARCHY_AFTER_FLAG = "testGetHierarchyAfterFlag";
public static final String TEST_GET_HIERARCHY_AFTER_FLAG_REJECT = "testGetHierarchyAfterFlagReject";
public static final String TEST_GET_HIERARCHY_AFTER_FLAG_ACCEPT = "testGetHierarchyAfterFlagAccept";
public static final String TEST_GET_HIERARCHY_AFTER_DISCARD = "testGetHierarchyAfterDiscard";
public static final String TEST_GET_HIERARCHY_AFTER_RETIRE = "testGetHierarchyAfterRetire";
public static final String TEST_GET_HIERARCHY_AFTER_UPDATE_LIVE = "testGetHierarchyAfterUpdateLive";
}

266 changes: 266 additions & 0 deletions kp_service_test/src/test/java/org/sunbird/kp/test/content/v3/getHierarchyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,266 @@
package org.sunbird.kp.test.content.v3;

import com.consol.citrus.annotations.CitrusTest;
import com.consol.citrus.testng.CitrusParameters;
import org.springframework.http.HttpStatus;
import org.sunbird.kp.test.common.APIUrl;
import org.sunbird.kp.test.common.BaseCitrusTestRunner;
import org.sunbird.kp.test.util.CollectionUtil;
import org.sunbird.kp.test.util.CollectionUtilPayload;
import org.sunbird.kp.test.util.ContentUtil;
import org.sunbird.kp.test.util.TestSetupUtil;
import org.testng.annotations.AfterClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;

import java.util.HashMap;
import java.util.Map;

/**
* Integration Test Cases for Get Hierarchy API
*
* @author Neha Verma
*
* Number of testcases for get : 16
* Last Count Update: 17-12-2019
*/
public class getHierarchyTest extends BaseCitrusTestRunner {

private static final String TEMPLATE_DIR = "templates/content/v3/hierarchy/get";
private static final String MODE = "?mode=";
private String identifier;
private static Map<String, String> dirIdMap = new HashMap<>();

@AfterClass
public static void populateAssertionData() {
// TestSetupUtil.createDirectoriesForTestCases(dirIdMap, "response.json", TEMPLATE_DIR);
TestSetupUtil.createDirectoriesForTestCases(dirIdMap, "response_image.json", TEMPLATE_DIR);
}

@Test(dataProvider = "getHierarchyWithValidRequest")
@CitrusParameters ({"testName", "workFlowStatus", "payload", "collectionType", "resourceCount"})
@CitrusTest
public void getHierarchyWithValidRequest(String testName, String workFlowStatus, String payload, String collectionType, Integer resourceCount) {
Map<String, Object> collectionMap = CollectionUtil.prepareTestCollection(workFlowStatus, this, new HashMap<String,String>() {{put("updateHierarchy", payload);}}, collectionType, 0, resourceCount, "application/vnd.ekstep.ecml-archive");
identifier = (String) collectionMap.get("content_id");
this.variable("rootId", identifier);
performGetTest(
this,
TEMPLATE_DIR,
testName,
APIUrl.READ_CONTENT_HIERARCHY + identifier,
null,
HttpStatus.OK,
null,
RESPONSE_JSON
);
}

@Test(dataProvider = "getHierarchyWithInvalidRequest")
@CitrusParameters ({"testName", "workFlowStatus", "payload", "collectionType", "resourceCount", "rootId"})
@CitrusTest
public void getHierarchyWithInvalidRequest(String testName, String workFlowStatus, String payload, String collectionType, Integer resourceCount, String rootId) {
Map<String, Object> collectionMap = CollectionUtil.prepareTestCollection(workFlowStatus, this,
new HashMap<String,String>() {{put("updateHierarchy", payload);}}, collectionType, 0, resourceCount, "application/vnd.ekstep.ecml-archive");
identifier = (String) collectionMap.get("content_id");
//ContentUtil.publishContent(this, null, "public", identifier, null);
performGetTest(
this,
TEMPLATE_DIR,
testName,
APIUrl.READ_CONTENT_HIERARCHY + rootId,
null,
HttpStatus.NOT_FOUND,
null,
RESPONSE_JSON
);
}

@Test(dataProvider = "getHierarchyWithMode")
@CitrusParameters ({"testName", "workFlowStatus", "payload", "collectionType", "resourceCount", "mode"})
@CitrusTest
public void getHierarchyWithMode(String testName, String workFlowStatus, String payload, String collectionType, Integer resourceCount, String mode) {
Map<String, Object> collectionMap = CollectionUtil.prepareTestCollection(workFlowStatus, this,
new HashMap<String,String>() {{put("updateHierarchy", payload);}}, collectionType, 0, resourceCount, "application/vnd.ekstep.ecml-archive");
identifier = (String) collectionMap.get("content_id");
this.variable("rootId", identifier);
//dirIdMap.put(testName, identifier);
performGetTest(
this,
TEMPLATE_DIR,
testName,
APIUrl.READ_CONTENT_HIERARCHY + identifier + MODE + mode,
null,
HttpStatus.OK,
null,
RESPONSE_JSON
);
}

@Test(dataProvider = "getHierarchyLiveAndImageNodes")
@CitrusParameters ({"testName", "workFlowStatus", "payload", "collectionType", "resourceCount"})
@CitrusTest
public void getHierarchyLiveAndImageNodes(String testName, String workFlowStatus, String payload, String collectionType, Integer resourceCount) {
Map<String, Object> collectionMap = CollectionUtil.prepareTestCollection(workFlowStatus, this,
new HashMap<String,String>() {{put("updateHierarchy", payload);}}, collectionType, 0, resourceCount, "application/vnd.ekstep.ecml-archive");
identifier = (String) collectionMap.get("content_id");
this.variable("rootId", identifier);
// dirIdMap.put(testName, identifier);
// performGetTest(
// this,
// TEMPLATE_DIR,
// testName,
// APIUrl.READ_CONTENT_HIERARCHY + identifier,
// null,
// HttpStatus.OK,
// null,
// RESPONSE_JSON
// );
performGetTest(
this,
TEMPLATE_DIR,
testName,
APIUrl.READ_CONTENT_HIERARCHY + identifier + MODE + "edit",
null,
HttpStatus.OK,
null,
RESPONSE_JSON_IMAGE
);
}

@Test(dataProvider = "getHierarchyImageNodes")
@CitrusParameters ({"testName", "workFlowStatus", "payload", "collectionType", "resourceCount"})
@CitrusTest
public void getHierarchyImageNodes(String testName, String workFlowStatus, String payload, String collectionType, Integer resourceCount) {
Map<String, Object> collectionMap = CollectionUtil.prepareTestCollection(workFlowStatus, this,
new HashMap<String,String>() {{put("updateHierarchy", payload);}}, collectionType, 0, resourceCount, "application/vnd.ekstep.ecml-archive");
identifier = (String) collectionMap.get("content_id");
this.variable("rootId", identifier);
// dirIdMap.put(testName, identifier);
// performGetTest(
// this,
// TEMPLATE_DIR,
// testName,
// APIUrl.READ_CONTENT_HIERARCHY + identifier,
// null,
// HttpStatus.NOT_FOUND,
// null,
// RESPONSE_JSON
// );
performGetTest(
this,
TEMPLATE_DIR,
testName,
APIUrl.READ_CONTENT_HIERARCHY + identifier + MODE + "edit",
null,
HttpStatus.OK,
null,
RESPONSE_JSON_IMAGE
);
}

@Test
@CitrusTest
public void getHierarchyAfterReview(){
Map<String, Object> collectionMap = CollectionUtil.prepareTestCollection("collectionReview", this,
new HashMap<String,String>() {{put("updateHierarchy", CollectionUtilPayload.UPDATE_HIERARCHY_1_UNIT_1_RESOURCE);}}, "textBook", 0, 1, "application/vnd.ekstep.ecml-archive");
identifier = (String) collectionMap.get("content_id");
this.variable("rootId", identifier);
performGetTest(
this,
TEMPLATE_DIR,
ContentV3Scenario.TEST_GET_HIERARCHY_AFTER_REVIEW,
APIUrl.READ_CONTENT_HIERARCHY + identifier,
null,
HttpStatus.NOT_FOUND,
null,
RESPONSE_JSON
);
performGetTest(
this,
TEMPLATE_DIR,
ContentV3Scenario.TEST_GET_HIERARCHY_AFTER_REVIEW,
APIUrl.READ_CONTENT_HIERARCHY + identifier + MODE + "edit",
null,
HttpStatus.OK,
null,
RESPONSE_JSON_IMAGE
);
}


@DataProvider
public static Object[][] getHierarchyWithValidRequest() {
return new Object[][]{
new Object[]{
ContentV3Scenario.TEST_GET_HIERARCHY_WITH_VALID_IDENTIFIER, "collectionUnitsInLive", CollectionUtilPayload.UPDATE_HIERARCHY_1_UNIT_1_RESOURCE, "textBook", 1, true
}
};
}

@DataProvider
public static Object[][] getHierarchyWithInvalidRequest() {
return new Object[][]{
new Object[]{
ContentV3Scenario.TEST_GET_HIERARCHY_WITH_INVALID_IDENTIFIER, "collectionUnitsInLive", CollectionUtilPayload.UPDATE_HIERARCHY_1_UNIT_1_RESOURCE, "textBook", 1, "KP_FT_9876543"
}
};
}

@DataProvider
public static Object[][] getHierarchyWithMode() {
return new Object[][]{
new Object[]{
ContentV3Scenario.TEST_GET_HIERARCHY_WITH_EDIT_MODE, "collectionUnitsInDraft", CollectionUtilPayload.UPDATE_HIERARCHY_1_UNIT_1_RESOURCE, "textBook", 1, "edit"
},
new Object[]{
ContentV3Scenario.TEST_GET_HIERARCHY_WITH_EMPTY_MODE, "collectionUnitsInLive", CollectionUtilPayload.UPDATE_HIERARCHY_1_UNIT_1_RESOURCE, "textBook", 1, ""
},
new Object[]{
ContentV3Scenario.TEST_GET_HIERARCHY_WITH_INVALID_MODE, "collectionUnitsInLive", CollectionUtilPayload.UPDATE_HIERARCHY_1_UNIT_1_RESOURCE, "textBook", 1, "abc"
},
new Object[]{
ContentV3Scenario.TEST_GET_HIERARCHY_WITH_NULL_MODE, "collectionUnitsInLive", CollectionUtilPayload.UPDATE_HIERARCHY_1_UNIT_1_RESOURCE, "textBook", 1, null
}
};
}

@DataProvider
public static Object[][] getHierarchyLiveAndImageNodes() {
return new Object[][]{
// new Object[]{
// ContentV3Scenario.TEST_GET_HIERARCHY_AFTER_RETIRE, "collectionRetire", CollectionUtilPayload.UPDATE_HIERARCHY_1_UNIT_1_RESOURCE, "textBook", 1
// },
// new Object[]{
// ContentV3Scenario.TEST_GET_HIERARCHY_AFTER_FLAG, "collectionInFlagged", CollectionUtilPayload.UPDATE_HIERARCHY_1_UNIT_1_RESOURCE, "textBook", 1
// }
// //,
// new Object[]{
// ContentV3Scenario.TEST_GET_HIERARCHY_AFTER_FLAG_ACCEPT, "contentInFlagDraft", CollectionUtilPayload.UPDATE_HIERARCHY_1_UNIT_1_RESOURCE, "textBook", 1
// }
//,
// new Object[]{
// ContentV3Scenario.TEST_GET_HIERARCHY_AFTER_FLAG_REJECT, "collectionInFlagged", CollectionUtilPayload.UPDATE_HIERARCHY_1_UNIT_1_RESOURCE, "textBook", 1
// },
// new Object[]{
// ContentV3Scenario.TEST_GET_HIERARCHY_AFTER_DISCARD, "collectionDiscarded", CollectionUtilPayload.UPDATE_HIERARCHY_1_UNIT_1_RESOURCE, "textBook", 1
// },
// new Object[]{
// ContentV3Scenario.TEST_GET_HIERARCHY_AFTER_UPDATE_LIVE, "collectionUnitsInLiveUpdate", CollectionUtilPayload.UPDATE_HIERARCHY_1_UNIT_1_RESOURCE, "textBook", 1
// },

};
}

@DataProvider
public static Object[][] getHierarchyImageNodes() {
return new Object[][]{
// new Object[]{
// ContentV3Scenario.TEST_GET_HIERARCHY_AFTER_UPDATE, "collectionUnitsInDraft", CollectionUtilPayload.UPDATE_HIERARCHY_1_UNIT_1_RESOURCE, "textBook", 1
// },
new Object[]{
ContentV3Scenario.TEST_GET_HIERARCHY_BEFORE_UPDATE, "collectionCreate", null, "textBook", 1
},
};
}
}
28 changes: 15 additions & 13 deletions kp_service_test/src/test/java/org/sunbird/kp/test/util/CollectionUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,20 +48,23 @@ public class CollectionUtil {
*/
public static Map<String, Object> prepareTestCollection(String workFlow, BaseCitrusTestRunner runner, Map<String, String> payloadMap, String collectionType,
Integer assetCount, Integer resourceCount, String mimeType) {
String updateHierarchyPayload = payloadMap.get("updateHierarchy");
String updateHierarchyPayload = null;
Map<String, Object> collectionMap = new HashMap<>();
if (assetCount != 0) {
List<String> assetIds = getLiveAsset(runner, assetCount, mimeType);
for (String assetId : assetIds) {
collectionMap.put("asset_" + (assetIds.indexOf(assetId) + 1), assetId);
updateHierarchyPayload = updateHierarchyPayload.replace("asset_" + (assetIds.indexOf(assetId) + 1), assetId);
if(!StringUtils.isEmpty(payloadMap.get("updateHierarchy"))) {
updateHierarchyPayload = payloadMap.get("updateHierarchy");
if (assetCount != 0) {
List<String> assetIds = getLiveAsset(runner, assetCount, mimeType);
for (String assetId : assetIds) {
collectionMap.put("asset_" + (assetIds.indexOf(assetId) + 1), assetId);
updateHierarchyPayload = updateHierarchyPayload.replace("asset_" + (assetIds.indexOf(assetId) + 1), assetId);
}
}
}
if (resourceCount != 0) {
List<String> resourceIds = getLiveResources(runner, resourceCount, mimeType, payloadMap.get("createResource"));
for (String resourceId : resourceIds) {
collectionMap.put("resource_" + (resourceIds.indexOf(resourceId) + 1), resourceId);
updateHierarchyPayload = updateHierarchyPayload.replace("resource_" + (resourceIds.indexOf(resourceId) + 1), resourceId);
if (resourceCount != 0) {
List<String> resourceIds = getLiveResources(runner, resourceCount, mimeType, payloadMap.get("createResource"));
for (String resourceId : resourceIds) {
collectionMap.put("resource_" + (resourceIds.indexOf(resourceId) + 1), resourceId);
updateHierarchyPayload = updateHierarchyPayload.replace("resource_" + (resourceIds.indexOf(resourceId) + 1), resourceId);
}
}
}
collectionMap.putAll(ContentUtil.createCollectionContent(runner, null, collectionType, null));
Expand Down Expand Up @@ -120,5 +123,4 @@ public static List<String> getLiveAsset(BaseCitrusTestRunner runner, Integer ass
});
return assetIds;
}

}
2 changes: 2 additions & 0 deletions kp_service_test/src/test/java/org/sunbird/kp/test/util/ContentUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1076,6 +1076,8 @@ public static Map<String, Supplier<Map<String, Object>>> getCollectionWorkFlowMa
put("AcceptFlag", () -> ContentUtil.acceptFlagContent(runner, null, null, contentId, headers));
put("RejectFlag", () -> ContentUtil.rejectFlagContent(runner, null, contentId, headers));
put("Get", () -> ContentUtil.readCollectionHierarchy(runner, contentId));
put("Create", () -> ContentUtil.readCollectionHierarchy(runner, contentId));
put("Review", () -> ContentUtil.reviewContent(runner, payload, testName, contentId, headers));
}
};
}
Expand Down
Loading