- Update restful-api.dev.postman_collection.json to add Update request

- Minor renaming in PokemonTest

Signed-off-by: Gopal S Akshintala <gopala.akshintala@salesforce.com>

Author: overfullstack

detekt/baseline.xml

@@ -14,6 +14,7 @@
     <ID>MagicNumber:Constants.kt$499</ID>
     <ID>MagicNumber:Constants.kt$200</ID>
     <ID>MagicNumber:Constants.kt$299</ID>
+    <ID>FunctionNaming:RestfulAPIDevKtTest.kt$RestfulAPIDevKtTest$@Test fun `execute restful-api dev pm collection`()</ID>
   </ManuallySuppressedIssues>
   <CurrentIssues/>
 </SmellBaseline>

src/integrationTest/java/com/salesforce/revoman/integration/pokemon/PokemonTest.java

@@ -60,42 +60,42 @@ void pokemon() {
 				Map.of(
 						"offset", String.valueOf(OFFSET),
 						"limit", String.valueOf(LIMIT));
-		//noinspection Convert2Lambda
+		@SuppressWarnings("Convert2Lambda")
 		final var preLogHook =
 				Mockito.spy(
 						new PreStepHook() {
 							@Override
 							public void accept(
 									@NotNull Step currentStep,
-									@NotNull TxnInfo<Request> requestInfo,
-									@NotNull Rundown rundown) {
+									@NotNull TxnInfo<Request> ignore1,
+									@NotNull Rundown ignore2) {
 								LOGGER.info("Picked `preLogHook` before stepName: {}", currentStep);
 							}
 						});
-		//noinspection Convert2Lambda
+		@SuppressWarnings("Convert2Lambda")
 		final var postLogHook =
 				Mockito.spy(
 						new PostStepHook() {
 							@Override
-							public void accept(@NotNull StepReport stepReport, @NotNull Rundown rundown) {
+							public void accept(@NotNull StepReport stepReport, @NotNull Rundown ignore) {
 								LOGGER.info("Picked `postLogHook` after stepName: {}", stepReport.step.displayName);
 								throw RUNTIME_EXCEPTION;
 							}
 						});
-		//noinspection Convert2Lambda
-		final var preStepHook =
+		@SuppressWarnings("Convert2Lambda")
+		final var preStepHookBeforeStepName =
 				Mockito.spy(
 						new PreStepHook() {
 							@Override
 							public void accept(
-									@NotNull Step currentStep,
-									@NotNull TxnInfo<Request> requestInfo,
+									@NotNull Step ignore1,
+									@NotNull TxnInfo<Request> ignore2,
 									@NotNull Rundown rundown) {
 								rundown.mutableEnv.set("limit", String.valueOf(newLimit));
 							}
 						});
-		//noinspection Convert2Lambda
-		final var postStepHook =
+		@SuppressWarnings("Convert2Lambda")
+		final var postStepHookAfterStepName =
 				Mockito.spy(
 						new PostStepHook() {
 							@Override
@@ -106,14 +106,14 @@ public void accept(@NotNull StepReport stepReport, @NotNull Rundown rundown) {
 								assertThat(results.size()).isEqualTo(newLimit);
 							}
 						});
-		//noinspection Convert2Lambda
-		final var postHookAfterURIPath =
+		@SuppressWarnings("Convert2Lambda")
+		final var postStepHookAfterURIPath =
 				Mockito.spy(
 						new PostStepHook() {
 							@Override
 							public void accept(@NotNull StepReport stepReport, @NotNull Rundown rundown) {
 								LOGGER.info(
-										"Picked `postHookAfterURIPath` after stepName: {} with raw URI: {}",
+										"Picked `postStepHookAfterURIPath` after stepName: {} with raw URI: {}",
 										stepReport.step.displayName,
 										stepReport.step.rawPMStep.getRequest().url);
 								final var id =
@@ -133,9 +133,10 @@ public void accept(@NotNull StepReport stepReport, @NotNull Rundown rundown) {
 								.environmentPath(PM_ENVIRONMENT_PATH)
 								.responseConfig(unmarshallResponse(afterStepName("all-pokemon"), AllPokemon.class))
 								.hooks(
-										pre(beforeStepName("all-pokemon"), preStepHook),
-										post(afterStepName("all-pokemon"), postStepHook),
-										post(afterStepContainingURIPathOfAny("pokemon-color"), postHookAfterURIPath),
+										pre(beforeStepName("all-pokemon"), preStepHookBeforeStepName),
+										post(afterStepName("all-pokemon"), postStepHookAfterStepName),
+										post(
+												afterStepContainingURIPathOfAny("pokemon-color"), postStepHookAfterURIPath),
 										pre(beforeStepContainingHeader("preLog"), preLogHook),
 										post(afterStepContainingHeader("postLog"), postLogHook))
 								.dynamicEnvironment(dynamicEnvironment)
@@ -157,9 +158,9 @@ public void accept(@NotNull StepReport stepReport, @NotNull Rundown rundown) {
 								"gender", "female",
 								"ability", "stench",
 								"nature", "hardy"));
-		Mockito.verify(preStepHook, times(1)).accept(any(), any(), any());
-		Mockito.verify(postStepHook, times(1)).accept(any(), any());
-		Mockito.verify(postHookAfterURIPath, times(1)).accept(any(), any());
+		Mockito.verify(preStepHookBeforeStepName, times(1)).accept(any(), any(), any());
+		Mockito.verify(postStepHookAfterStepName, times(1)).accept(any(), any());
+		Mockito.verify(postStepHookAfterURIPath, times(1)).accept(any(), any());
 		Mockito.verify(preLogHook, times(1)).accept(any(), any(), any());
 		Mockito.verify(postLogHook, times(1)).accept(any(), any());
 	}

src/integrationTest/resources/pm-templates/restfulapidev/restful-api.dev.postman_collection.json

@@ -44,7 +44,8 @@
 						"exec": [
 							"var responseJson = pm.response.json();",
 							"pm.environment.set(\"objId\", responseJson.id);",
-							"pm.environment.set(\"data\", responseJson.data)"
+							"pm.environment.set(\"data\", responseJson.data)",
+							"pm.environment.set(\"productName\", responseJson.name)"
 						],
 						"type": "text/javascript",
 						"packages": {}
@@ -91,7 +92,7 @@
 			"response": []
 		},
 		{
-			"name": "add-object-2",
+			"name": "update-object",
 			"event": [
 				{
 					"listen": "test",
@@ -121,31 +122,26 @@
 				}
 			],
 			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json",
-						"type": "text"
-					}
-				],
+				"method": "PATCH",
+				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\n  \"name\": \"{{$randomProduct}}\", // Dynamic variable\n  \"data\": {\n    \"year\": {{$currentYear}}, // Variable set via Pre-req\n    \"price\": {{$randomPrice}} // Variable set via Pre-req\n  }\n}",
+					"raw": "{\n  \"name\": \"updated - {{productName}}\" // Update Name\n}",
 					"options": {
 						"raw": {
 							"language": "json"
 						}
 					}
 				},
 				"url": {
-					"raw": "https://{{uri}}/objects",
+					"raw": "https://{{uri}}/objects/{{objId}}",
 					"protocol": "https",
 					"host": [
 						"{{uri}}"
 					],
 					"path": [
-						"objects"
+						"objects",
+						"{{objId}}"
 					]
 				}
 			},

src/main/kotlin/com/salesforce/revoman/input/FileUtils.kt

@@ -9,20 +9,19 @@
 
 package com.salesforce.revoman.input
 
+import java.io.File
+import java.io.InputStream
 import okio.BufferedSource
 import okio.FileSystem.Companion.RESOURCES
 import okio.FileSystem.Companion.SYSTEM
 import okio.Path.Companion.toPath
 import okio.buffer
 import okio.source
-import java.io.File
-import java.io.InputStream
 
 fun bufferFile(filePath: String): BufferedSource =
   filePath.toPath().let { (if (it.isAbsolute) SYSTEM else RESOURCES).source(it).buffer() }
 
-fun readFileToString(filePath: String): String =
-  bufferFile(filePath).readUtf8()
+fun readFileToString(filePath: String): String = bufferFile(filePath).readUtf8()
 
 fun bufferInputStream(inputStream: InputStream): BufferedSource = inputStream.source().buffer()