project-sunbird · neha0305verma · Jan 7, 2020
diff --git a/kp_service_test/src/test/java/org/sunbird/kp/test/content/v3/ContentV3Scenario.java b/kp_service_test/src/test/java/org/sunbird/kp/test/content/v3/ContentV3Scenario.java
@@ -37,8 +37,6 @@ public class ContentV3Scenario {
             "testCreateResourceWithInvalidConceptId";
     public static final String TEST_CREATE_RESOURCE_CONTENT_WITH_ECML_BODY =
             "testCreateResourceWithEcmlBody";
-    public static final String TEST_CREATE_RESOURCE_CONTENT_WITH_INVALID_LICENSE_TYPE =
-            "testCreateResourceWithInvalidLicenseType";
     public static final String TEST_CREATE_RESOURCE_CONTENT_WITH_VALID_FRAMEWORK_INVALID_SUBJECT =
             "testCreateResourceWithValidFrameworkInvalidSubject";
     public static final String TEST_CREATE_RESOURCE_CONTENT_WITH_VALID_FRAMEWORK_INVALID_CATEGORY =
@@ -47,6 +45,17 @@ public class ContentV3Scenario {
             "testCreateResourceWithInvalidFramework";
     public static final String TEST_CREATE_RESOURCE_CONTENT_WITH_INVALID_RESOURCE_TYPE =
             "testCreateResourceWithInvalidResourceType";
+
+    //Content with license
+    public static final String TEST_CREATE_RESOURCE_CONTENT_WITH_VALID_LICENSE =
+            "testCreateResourceWithValidLicense";
+    public static final String TEST_CREATE_RESOURCE_CONTENT_WITHOUT_LICENSE =
+            "testCreateResourceWithoutLicense";
+    public static final String TEST_CREATE_RESOURCE_CONTENT_WITH_INVALID_LICENSE_VALUE =
+            "testCreateResourceWithInvalidLicenseValue";
+    public static final String TEST_CREATE_RESOURCE_CONTENT_WITH_INVALID_LICENSE_TYPE =
+            "testCreateResourceWithInvalidLicenseType";
+
     //Plugin
     public static final String TEST_CREATE_PLUGIN_CONTENT_WITH_VALID_REQUEST =
             "testCreatePluginContentWithValidRequest";
@@ -283,6 +292,14 @@ public class ContentV3Scenario {
             "testUpdateWithImageId";
     //Get Content Should expect lastSubmittedOn if allowUpdate is true
 
+    //update content with license
+    public static final String TEST_UPDATE_CONTENT_WITH_VALID_LICENSE =
+            "testUpdateContentWithValidLicense";
+    public static final String TEST_UPDATE_CONTENT_WITH_INVALID_LICENSE_VALUE =
+            "testUpdateContentWithInvalidLicenseValue";
+    public static final String TEST_UPDATE_CONTENT_WITH_INVALID_LICENSE_TYPE =
+            "testUpdateContentWithInvalidLicenseType";
+
     public static final String TEST_UPDATE_WITH_SYSTEM_PROPERTY =
             "testUpdateContentWithSystemProperty";
     public static final String TEST_UPDATE_WITH_INVALID_FORMAT_RESERVED_DIALCODES =

diff --git a/kp_service_test/src/test/java/org/sunbird/kp/test/content/v3/CreateContentTest.java b/kp_service_test/src/test/java/org/sunbird/kp/test/content/v3/CreateContentTest.java
@@ -130,6 +130,12 @@ public Object[][] createResourceContentWithValidRequest() {
                 },
                 new Object[]{
                         ContentV3Scenario.TEST_CREATE_RESOURCE_WITH_CONCEPTS
+                },
+                new Object[]{
+                        ContentV3Scenario.TEST_CREATE_RESOURCE_CONTENT_WITH_VALID_LICENSE
+                },
+                new Object[]{
+                        ContentV3Scenario.TEST_CREATE_RESOURCE_CONTENT_WITHOUT_LICENSE
                 }
         };
     }
@@ -210,6 +216,9 @@ public Object[][] createResourceContentWithInvalidRequest() {
                 },
                 new Object[]{
                         ContentV3Scenario.TEST_CREATE_RESOURCE_CONTENT_WITH_VALID_FRAMEWORK_INVALID_CATEGORY
+                },
+                new Object[]{
+                        ContentV3Scenario.TEST_CREATE_RESOURCE_CONTENT_WITH_INVALID_LICENSE_VALUE
                 }
         };
     }

diff --git a/kp_service_test/src/test/java/org/sunbird/kp/test/content/v3/UpdateContentTest.java b/kp_service_test/src/test/java/org/sunbird/kp/test/content/v3/UpdateContentTest.java
@@ -169,6 +169,9 @@ public Object[][] updateValidResourceContent() {
                 new Object[]{
                         ContentV3Scenario.TEST_UPDATE_WITH_VALID_ECML_BODY, "application/pdf", "contentInDraft"
                 },
+                new Object[]{
+                        ContentV3Scenario.TEST_UPDATE_CONTENT_WITH_VALID_LICENSE, "application/pdf", "contentInDraft"
+                }
         };
     }
 
@@ -233,6 +236,12 @@ public Object[][] updateInvalidResourceContent() {
 //                new Object[]{
 //                        ContentV3Scenario.TEST_UPDATE_WITH_INVALID_ECML_BODY, "application/pdf", "contentInDraft"
 //                },
+                new Object[]{
+                        ContentV3Scenario.TEST_UPDATE_CONTENT_WITH_INVALID_LICENSE_TYPE, "application/pdf", "contentInDraft"
+                },
+                new Object[]{
+                        ContentV3Scenario.TEST_UPDATE_CONTENT_WITH_INVALID_LICENSE_VALUE, "application/pdf", "contentInDraft"
+                }
         };
     }
 
@@ -263,8 +272,7 @@ public Object[][] updateImageResourceContent() {
                 },
                 new Object[]{
                         ContentV3Scenario.TEST_UPDATE_CONTENT_IN_LIVE_WITH_IMAGE, "application/pdf", "contentInLiveImageDraft"
-                },
-
+                }
         };
     }
 

diff --git a/...sources/templates/content/v3/create/testCreateResourceWithInvalidLicenseType/request.json b/...sources/templates/content/v3/create/testCreateResourceWithInvalidLicenseType/request.json
@@ -1,11 +1,12 @@
 {
   "request": {
     "content": {
+      "identifier":"${contentIdVal}",
       "name": "Course",
       "contentType": "Resource",
       "code": "citrus:Code",
       "mimeType": "application/pdf",
-      "license": "InvalidOther"
+      "license": ["CC BY 4.0"]
     }
   }
 }
diff --git a/...ources/templates/content/v3/create/testCreateResourceWithInvalidLicenseType/response.json b/...ources/templates/content/v3/create/testCreateResourceWithInvalidLicenseType/response.json
@@ -1,16 +1,18 @@
 {
-    "id": "api.content.create",
+    "id": "api.content.update",
     "ver": "3.0",
     "ts": "@matchesDatePattern('yyyy-MM-dd')@",
     "params": {
         "resmsgid": "@ignore@",
         "msgid": null,
-        "err": "ERR_INVALID_EDGE_PROPERTY",
+        "err": "CLIENT_ERROR",
         "status": "failed",
-        "errmsg": "@ignore@"
+        "errmsg": "Validation Errors"
     },
     "responseCode": "CLIENT_ERROR",
     "result": {
-        "messages": null
+        "messages": [
+            "Metadata license should be a/an String value"
+        ]
     }
 }
diff --git a/...ources/templates/content/v3/create/testCreateResourceWithInvalidLicenseValue/request.json b/...ources/templates/content/v3/create/testCreateResourceWithInvalidLicenseValue/request.json
@@ -0,0 +1,12 @@
+{
+  "request": {
+    "content": {
+      "identifier":"${contentIdVal}",
+      "name": "Course",
+      "contentType": "Resource",
+      "code": "citrus:Code",
+      "mimeType": "application/pdf",
+      "license": "InvalidValue"
+    }
+  }
+}
diff --git a/...urces/templates/content/v3/create/testCreateResourceWithInvalidLicenseValue/response.json b/...urces/templates/content/v3/create/testCreateResourceWithInvalidLicenseValue/response.json
@@ -0,0 +1,16 @@
+{
+  "id": "api.content.create",
+  "ver": "3.0",
+  "ts": "@matchesDatePattern('yyyy-MM-dd')@",
+  "params": {
+    "resmsgid": "@ignore@",
+    "msgid": null,
+    "err": "ERR_INVALID_EDGE_PROPERTY",
+    "status": "failed",
+    "errmsg": "@startsWith('license value should be one of List')@"
+  },
+  "responseCode": "CLIENT_ERROR",
+  "result": {
+    "messages": null
+  }
+}
diff --git a/...est/resources/templates/content/v3/create/testCreateResourceWithValidLicense/request.json b/...est/resources/templates/content/v3/create/testCreateResourceWithValidLicense/request.json
@@ -0,0 +1,12 @@
+{
+  "request": {
+    "content": {
+      "identifier":"${contentIdVal}",
+      "name": "KP Integration Test Content",
+      "code": "kp.ft.resource.pdf",
+      "mimeType": "application/pdf",
+      "contentType":"Resource",
+      "license": "CC BY 4.0"
+    }
+  }
+}
diff --git a/...st/resources/templates/content/v3/create/testCreateResourceWithValidLicense/response.json b/...st/resources/templates/content/v3/create/testCreateResourceWithValidLicense/response.json
@@ -0,0 +1,18 @@
+{
+  "id": "api.content.create",
+  "ver": "3.0",
+  "ts": "@matchesDatePattern('yyyy-MM-dd')@",
+  "params": {
+    "resmsgid": "@ignore@",
+    "msgid": null,
+    "err": null,
+    "status": "successful",
+    "errmsg": null
+  },
+  "responseCode": "OK",
+  "result": {
+    "node_id": "${contentIdVal}",
+    "identifier": "${contentIdVal}",
+    "versionKey": "@isNumber()@"
+  }
+}
diff --git a/...st/resources/templates/content/v3/create/testCreateResourceWithValidLicense/validate.json b/...st/resources/templates/content/v3/create/testCreateResourceWithValidLicense/validate.json
@@ -0,0 +1,47 @@
+{
+  "id" : "api.content.read",
+  "ver" : "3.0",
+  "ts" : "@matchesDatePattern('yyyy-MM-dd')@",
+  "params" : {
+    "resmsgid" : "@ignore@",
+    "msgid" : null,
+    "err" : null,
+    "status" : "successful",
+    "errmsg" : null
+  },
+  "responseCode" : "OK",
+  "result" : {
+    "content" : {
+      "ownershipType" : [ "createdBy" ],
+      "code" : "kp.ft.resource.pdf",
+      "channel" : "channel-01",
+      "language" : [ "English" ],
+      "mimeType" : "application/pdf",
+      "idealScreenSize" : "normal",
+      "createdOn" : "@matchesDatePattern('yyyy-MM-dd')@",
+      "appId" : "@ignore@",
+      "contentDisposition" : "inline",
+      "lastUpdatedOn" : "@matchesDatePattern('yyyy-MM-dd')@",
+      "contentEncoding" : "identity",
+      "contentType" : "Resource",
+      "dialcodeRequired" : "No",
+      "identifier" : "${contentIdVal}",
+      "lastStatusChangedOn" : "@matchesDatePattern('yyyy-MM-dd')@",
+      "audience" : [ "Learner" ],
+      "os" : [ "All" ],
+      "visibility" : "Default",
+      "consumerId" : "@ignore@",
+      "mediaType" : "content",
+      "osId" : "org.ekstep.quiz.app",
+      "languageCode" : [ ],
+      "version" :"@isNumber()@",
+      "versionKey" : "@ignore@",
+      "license" : "CC BY 4.0",
+      "idealScreenDensity" : "hdpi",
+      "framework" : "NCF",
+      "compatibilityLevel" :"@isNumber()@",
+      "name" : "KP Integration Test Content",
+      "status" : "Draft"
+    }
+  }
+}
diff --git a/.../test/resources/templates/content/v3/create/testCreateResourceWithoutLicense/request.json b/.../test/resources/templates/content/v3/create/testCreateResourceWithoutLicense/request.json
@@ -0,0 +1,11 @@
+{
+  "request": {
+    "content": {
+      "identifier":"${contentIdVal}",
+      "name": "KP Integration Test Content",
+      "code": "kp.ft.resource.pdf",
+      "mimeType": "application/pdf",
+      "contentType":"Resource"
+    }
+  }
+}
diff --git a/...test/resources/templates/content/v3/create/testCreateResourceWithoutLicense/response.json b/...test/resources/templates/content/v3/create/testCreateResourceWithoutLicense/response.json
@@ -0,0 +1,18 @@
+{
+  "id": "api.content.create",
+  "ver": "3.0",
+  "ts": "@matchesDatePattern('yyyy-MM-dd')@",
+  "params": {
+    "resmsgid": "@ignore@",
+    "msgid": null,
+    "err": null,
+    "status": "successful",
+    "errmsg": null
+  },
+  "responseCode": "OK",
+  "result": {
+    "node_id": "${contentIdVal}",
+    "identifier": "${contentIdVal}",
+    "versionKey": "@isNumber()@"
+  }
+}
diff --git a/...test/resources/templates/content/v3/create/testCreateResourceWithoutLicense/validate.json b/...test/resources/templates/content/v3/create/testCreateResourceWithoutLicense/validate.json
@@ -0,0 +1,47 @@
+{
+  "id" : "api.content.read",
+  "ver" : "3.0",
+  "ts" : "@matchesDatePattern('yyyy-MM-dd')@",
+  "params" : {
+    "resmsgid" : "@ignore@",
+    "msgid" : null,
+    "err" : null,
+    "status" : "successful",
+    "errmsg" : null
+  },
+  "responseCode" : "OK",
+  "result" : {
+    "content" : {
+      "ownershipType" : [ "createdBy" ],
+      "code" : "kp.ft.resource.pdf",
+      "channel" : "channel-01",
+      "language" : [ "English" ],
+      "mimeType" : "application/pdf",
+      "idealScreenSize" : "normal",
+      "createdOn" : "@matchesDatePattern('yyyy-MM-dd')@",
+      "appId" : "@ignore@",
+      "contentDisposition" : "inline",
+      "lastUpdatedOn" : "@matchesDatePattern('yyyy-MM-dd')@",
+      "contentEncoding" : "identity",
+      "contentType" : "Resource",
+      "dialcodeRequired" : "No",
+      "identifier" : "${contentIdVal}",
+      "lastStatusChangedOn" : "@matchesDatePattern('yyyy-MM-dd')@",
+      "audience" : [ "Learner" ],
+      "os" : [ "All" ],
+      "visibility" : "Default",
+      "consumerId" : "@ignore@",
+      "mediaType" : "content",
+      "osId" : "org.ekstep.quiz.app",
+      "languageCode" : [ ],
+      "version" :"@isNumber()@",
+      "versionKey" : "@ignore@",
+      "license" : "CC BY 4.0",
+      "idealScreenDensity" : "hdpi",
+      "framework" : "NCF",
+      "compatibilityLevel" :"@isNumber()@",
+      "name" : "KP Integration Test Content",
+      "status" : "Draft"
+    }
+  }
+}
diff --git a/...esources/templates/content/v3/update/testUpdateContentWithInvalidLicenseType/request.json b/...esources/templates/content/v3/update/testUpdateContentWithInvalidLicenseType/request.json
@@ -0,0 +1,9 @@
+{
+  "request": {
+    "content": {
+      "name": "KP-Updated-pdf",
+      "versionKey": "${versionKeyVal}",
+      "license": ["CC BY 4.0"]
+    }
+  }
+}
diff --git a/...sources/templates/content/v3/update/testUpdateContentWithInvalidLicenseType/response.json b/...sources/templates/content/v3/update/testUpdateContentWithInvalidLicenseType/response.json
@@ -0,0 +1,18 @@
+{
+  "id": "api.content.update",
+  "ver": "3.0",
+  "ts": "@matchesDatePattern('yyyy-MM-dd')@",
+  "params": {
+    "resmsgid": "@ignore@",
+    "msgid": null,
+    "err": "CLIENT_ERROR",
+    "status": "failed",
+    "errmsg": "Validation Errors"
+  },
+  "responseCode": "CLIENT_ERROR",
+  "result": {
+    "messages": [
+      "Metadata license should be a/an String value"
+    ]
+  }
+}
diff --git a/...sources/templates/content/v3/update/testUpdateContentWithInvalidLicenseValue/request.json b/...sources/templates/content/v3/update/testUpdateContentWithInvalidLicenseValue/request.json
@@ -0,0 +1,9 @@
+{
+  "request": {
+    "content": {
+      "name": "KP-Updated-pdf",
+      "versionKey": "${versionKeyVal}",
+      "license": "Invalid License"
+    }
+  }
+}
diff --git a/...ources/templates/content/v3/update/testUpdateContentWithInvalidLicenseValue/response.json b/...ources/templates/content/v3/update/testUpdateContentWithInvalidLicenseValue/response.json
@@ -0,0 +1,16 @@
+{
+  "id": "api.content.update",
+  "ver": "3.0",
+  "ts": "@matchesDatePattern('yyyy-MM-dd')@",
+  "params": {
+    "resmsgid": "@ignore@",
+    "msgid": null,
+    "err": "ERR_INVALID_EDGE_PROPERTY",
+    "status": "failed",
+    "errmsg": "@startsWith('license value should be one of List')@"
+  },
+  "responseCode": "CLIENT_ERROR",
+  "result": {
+    "messages": null
+  }
+}