Merge remote-tracking branch 'mt-repo1/master'

mosip · Jan 6, 2020 · febcad4 · febcad4
2 parents e3c6bcf + d3105dc
commit febcad4
Show file tree

Hide file tree

Showing 20 changed files with 138 additions and 124 deletions.
diff --git a/automationtests/pom.xml b/automationtests/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>io.mosip</groupId>
 		<artifactId>mosip-parent</artifactId>
-		<version>1.0.4</version>
+		<version>1.0.5</version>
 	</parent>
 	<properties>
 		<!-- kernel versions -->

diff --git a/automationtests/src/main/java/io/mosip/service/BaseTestCase.java b/automationtests/src/main/java/io/mosip/service/BaseTestCase.java
@@ -156,7 +156,7 @@ public static void suiteSetup() {
 			 * expiredPreRegIds list contain list of pre registration ids of yesterday date
 			 * Here after booking appointment setting booking date to yesterday. 
 			 */
-			expiredPreRegIds=lib.BookExpiredApplication();
+			//expiredPreRegIds=lib.BookExpiredApplication();
 			/**
 			 * consumedPreRegIds list contain list of consumed pre registration ids 
 			 * 
@@ -258,4 +258,4 @@ private static void copyDbInTarget() {
 		}
 	}
 
-	}
+	}
diff --git a/...resources/idRepository/TestData/AddIdentity/testdata.idRepository.AddIdentity.mapping.yml b/...resources/idRepository/TestData/AddIdentity/testdata.idRepository.AddIdentity.mapping.yml
diff --git a/...main/resources/idRepository/TestData/Security/GetCookie/dev.getCookieForInternalAuth.json b/...main/resources/idRepository/TestData/Security/GetCookie/dev.getCookieForInternalAuth.json
@@ -1,11 +1,11 @@
 {
-  "id": "mosip.otpnotification.send",
-  "metadata": {},
-  "request": {
-  "clientId": "registration-processor",
-    "secretKey": "d80ec0be-bba7-4d8e-bf0c-85ab45bb976b",
-    "appId": "registrationprocessor"
-  },
-  "requesttime": "$TIMESTAMPZ$",
-  "version": "v1.0"
+    "request": {
+        "password": "mosip",
+        "appId": "admin",
+        "userName": "110005"
+    },
+    "metadata": "",
+    "requesttime": "$TIMESTAMPZ$",
+    "id": "mosip.io.userId.pwd",
+    "version": "1.0"
 }
diff --git a/...main/resources/idRepository/TestData/Security/GetCookie/dev.getCookieForUinGenerator.json b/...main/resources/idRepository/TestData/Security/GetCookie/dev.getCookieForUinGenerator.json
@@ -1,11 +1,11 @@
 {
-  "id": "mosip.otpnotification.send",
-  "metadata": {},
-  "request": {
-  "clientId": "registration-processor",
-    "secretKey": "d80ec0be-bba7-4d8e-bf0c-85ab45bb976b",
-    "appId": "registrationprocessor"
-  },
-  "requesttime": "$TIMESTAMPZ$",
-  "version": "v1.0"
+    "request": {
+        "password": "mosip",
+        "appId": "admin",
+        "userName": "110005"
+    },
+    "metadata": "",
+    "requesttime": "$TIMESTAMPZ$",
+    "id": "mosip.io.userId.pwd",
+    "version": "1.0"
 }
diff --git a/...sts/src/main/resources/idRepository/TestData/Security/GetCookie/dev.getCookieRequest.json b/...sts/src/main/resources/idRepository/TestData/Security/GetCookie/dev.getCookieRequest.json
@@ -1,10 +1,11 @@
 {
-	"id": "string",
-	"request": {
-		"clientId": "ida",
-		"secretKey": "bad25866-e6a5-4f93-831a-08923ea6eee0",
-		"appId": "ida"
-	},
-	"requesttime": "$TIMESTAMPZ$",
-	"version": "string"
-}	
+    "request": {
+        "password": "mosip",
+        "appId": "admin",
+        "userName": "110005"
+    },
+    "metadata": "",
+    "requesttime": "$TIMESTAMPZ$",
+    "id": "mosip.io.userId.pwd",
+    "version": "1.0"
+}
diff --git a/...ain/resources/idRepository/TestData/Security/GetCookie/dev.residentServiceCredential.json b/...ain/resources/idRepository/TestData/Security/GetCookie/dev.residentServiceCredential.json
@@ -1,10 +1,11 @@
 {
-  "id": "string",
-  "request": {
-    "clientId": "resident",
-    "secretKey": "dbe554cd-81e8-44c2-b8ec-3d8090aca1f4",
-    "appId": "resident"
-  },
-  "requesttime": "$TIMESTAMPZ$",
-  "version": "string"
+    "request": {
+        "password": "mosip",
+        "appId": "resident",
+        "userName": "resident_user1"
+    },
+    "metadata": "",
+    "requesttime": "$TIMESTAMPZ$",
+    "id": "mosip.io.userId.pwd",
+    "version": "1.0"
 }
diff --git a/...ationtests/src/main/resources/preReg/QRCode/preReg_QRCode_id_withEmptyValue/response.json b/...ationtests/src/main/resources/preReg/QRCode/preReg_QRCode_id_withEmptyValue/response.json
@@ -1 +1,10 @@
-{"id":"","version":"1.0","responsetime":"2019-06-01T08:02:07.585Z","response":null,"errors":[{"errorCode":"PRG_PAM_CORE_001","message":"Request id is invalid"}]}
+{
+	"id": "mosip.pre-registration.qrcode.generate",
+	"version": "1.0",
+	"responsetime": "2020-01-06T05:26:31.911Z",
+	"response": null,
+	"errors": [{
+		"errorCode": "PRG_PAM_CORE_001",
+		"message": "Request id is invalid"
+	}]
+}
diff --git a/...rc/main/resources/preReg/QRCode/preReg_QRCode_id_withOtherThanStandardValue/response.json b/...rc/main/resources/preReg/QRCode/preReg_QRCode_id_withOtherThanStandardValue/response.json
@@ -1,10 +1,10 @@
 {
-   "id": "ejhwr3029mGF4",
-   "version": "1.0",
-   "responsetime": "2019-04-21T13:34:36.737Z",
-   "response": null,
-   "errors": [   {
-      "errorCode": "PRG_PAM_CORE_001",
-      "message": "Request id is invalid"
-   }]
+	"id": "mosip.pre-registration.qrcode.generate",
+	"version": "1.0",
+	"responsetime": "2020-01-06T05:35:38.403Z",
+	"response": null,
+	"errors": [{
+		"errorCode": "PRG_PAM_CORE_001",
+		"message": "Request id is invalid"
+	}]
 }
diff --git a/...s/src/main/resources/preReg/QRCode/preReg_QRCode_requesttime_withEmptyValue/response.json b/...s/src/main/resources/preReg/QRCode/preReg_QRCode_requesttime_withEmptyValue/response.json
@@ -1,12 +1,10 @@
 {
-    "id": "mosip.pre-registration.qrcode.generate",
-    "version": "1.0",
-    "responsetime": "2019-06-28T09:51:43.687Z",
-    "response": null,
-    "errors": [
-        {
-            "errorCode": "PRG_PAM_CORE_003",
-            "message": "Invalid request time"
-        }
-    ]
+	"id": "mosip.pre-registration.qrcode.generate",
+	"version": "1.0",
+	"responsetime": "2020-01-06T05:23:46.082Z",
+	"response": null,
+	"errors": [{
+		"errorCode": "PRG_CORE_REQ_003",
+		"message": "Invalid request time"
+	}]
 }
diff --git a/...tests/src/main/resources/preReg/QRCode/preReg_QRCode_requesttime_withSpaces/response.json b/...tests/src/main/resources/preReg/QRCode/preReg_QRCode_requesttime_withSpaces/response.json
@@ -1,12 +1,10 @@
 {
-    "id": "mosip.pre-registration.qrcode.generate",
-    "version": "1.0",
-    "responsetime": "2019-06-28T09:51:43.687Z",
-    "response": null,
-    "errors": [
-        {
-            "errorCode": "PRG_PAM_CORE_003",
-            "message": "Invalid request time"
-        }
-    ]
+	"id": "mosip.pre-registration.qrcode.generate",
+	"version": "1.0",
+	"responsetime": "2020-01-06T05:34:14.569Z",
+	"response": null,
+	"errors": [{
+		"errorCode": "PRG_CORE_REQ_003",
+		"message": "Invalid request time"
+	}]
 }
diff --git a/...tests/src/main/resources/preReg/QRCode/preReg_QRCode_version_withEmptyValue/response.json b/...tests/src/main/resources/preReg/QRCode/preReg_QRCode_version_withEmptyValue/response.json
@@ -1,12 +1,10 @@
-{"id":"mosip.pre-registration.qrcode.generate",
-"version":"",
-"responsetime":"2019-06-01T08:11:11.981Z",
-"response":null,
-"errors":
-[
 {
-"errorCode":"PRG_PAM_CORE_002",
-"message":"Request version is invalid"
-}
-]
+	"id": "mosip.pre-registration.qrcode.generate",
+	"version": "1.0",
+	"responsetime": "2020-01-06T05:31:37.023Z",
+	"response": null,
+	"errors": [{
+		"errorCode": "PRG_CORE_REQ_002",
+		"message": "Request version is invalid"
+	}]
 }
diff --git a/...in/resources/preReg/QRCode/preReg_QRCode_version_withOtherThanStandardValue/response.json b/...in/resources/preReg/QRCode/preReg_QRCode_version_withOtherThanStandardValue/response.json
@@ -1 +1,10 @@
-{"id":"mosip.pre-registration.qrcode.generate","version":"29mGF4","responsetime":"2019-06-01T08:14:08.263Z","response":null,"errors":[{"errorCode":"PRG_PAM_CORE_002","message":"Request version is invalid"}]}
+{
+	"id": "mosip.pre-registration.qrcode.generate",
+	"version": "1.0",
+	"responsetime": "2020-01-06T05:31:37.023Z",
+	"response": null,
+	"errors": [{
+		"errorCode": "PRG_CORE_REQ_002",
+		"message": "Request version is invalid"
+	}]
+}
diff --git a/automationtests/src/main/resources/testngapi.xml b/automationtests/src/main/resources/testngapi.xml
@@ -10,7 +10,7 @@
 			class-name="io.mosip.authentication.fw.util.AuthenticationTestsListener" />
 		<listener class-name="io.mosip.authentication.e2e.E2EReport" />
 	</listeners>
-	<test name="Kernel Tests">
+ 	<test name="Kernel Tests">
 		<classes>
 			<class name="io.mosip.kernel.tests.AuditLog" />
 			<class name="io.mosip.kernel.tests.CentetMachineUserMappingToMasterData" />
@@ -304,6 +304,6 @@
             <class name="io.mosip.admin.tests.UpdateRegistrationCenter" />
 		</classes>
 	</test>	
-
+ 
 
 </suite>
diff --git a/e2etestrig/e2etests/pom.xml b/e2etestrig/e2etests/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>io.mosip.e2etestrig</groupId>
 		<artifactId>e2etestrig</artifactId>
-		<version>1.0.3</version>
+		<version>1.0.5</version>
 	</parent>
 	<artifactId>e2etests</artifactId>
 	<dependencies>
@@ -15,22 +15,22 @@
 		<dependency>
 		<groupId>io.mosip.e2etestrig</groupId>
 			<artifactId>preregistration</artifactId>
-			<version>1.0.3</version>
+			<version>1.0.5</version>
 		</dependency>
 		<dependency>
 			<groupId>io.mosip.e2etestrig</groupId>
 			<artifactId>reg-proc-automation</artifactId>
-			<version>1.0.3</version>
+			<version>1.0.5</version>
 		</dependency>
 	<dependency>
 			<groupId>io.mosip.e2etestrig</groupId>
 			<artifactId>reg-client-automation</artifactId>
-			<version>1.0.3</version>
+			<version>1.0.5</version>
 		</dependency>
 <dependency>
 <groupId>io.mosip.e2etestrig</groupId>
 <artifactId>ida-automation</artifactId>
-<version>1.0.3</version>
+<version>1.0.5</version>
 </dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>

diff --git a/e2etestrig/ida-automation/pom.xml b/e2etestrig/ida-automation/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.mosip.e2etestrig</groupId>
     <artifactId>e2etestrig</artifactId>
-    <version>1.0.3</version>
+    <version>1.0.5</version>
   </parent>
   <artifactId>ida-automation</artifactId>
   <dependencies>

diff --git a/e2etestrig/pom.xml b/e2etestrig/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.mosip.e2etestrig</groupId>
   <artifactId>e2etestrig</artifactId>
-  <version>1.0.3</version>
+  <version>1.0.5</version>
   <packaging>pom</packaging>
   <modules>
   	<module>e2etests</module>

diff --git a/e2etestrig/pre-reg-automation/pom.xml b/e2etestrig/pre-reg-automation/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.mosip.e2etestrig</groupId>
     <artifactId>e2etestrig</artifactId>
-    <version>1.0.3</version>
+    <version>1.0.5</version>
   </parent>
 
   <artifactId>preregistration</artifactId>

diff --git a/e2etestrig/reg-client-automation/pom.xml b/e2etestrig/reg-client-automation/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.mosip.e2etestrig</groupId>
     <artifactId>e2etestrig</artifactId>
-    <version>1.0.3</version>
+    <version>1.0.5</version>
   </parent>
   <artifactId>reg-client-automation</artifactId>
    <dependencies>

diff --git a/e2etestrig/reg-proc-automation/pom.xml b/e2etestrig/reg-proc-automation/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.mosip.e2etestrig</groupId>
     <artifactId>e2etestrig</artifactId>
-    <version>1.0.3</version>
+    <version>1.0.5</version>
   </parent>
   <artifactId>reg-proc-automation</artifactId>
   	<dependencies>