Fix mappings to allow for variability between windows and other OSes

bitwiseman · bitwiseman · commit 094053099c11 · 2021-11-02T14:42:04.000-07:00
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-10-10-2.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-10-10-2.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-12-12.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-12-12.json
@@ -6,7 +6,7 @@
     "method": "GET",
     "headers": {
       "If-None-Match": {
-        "equalTo": "\"4f508593b64df214fee8f6ab42df633c\""
+        "matches": "^(W/)?\"4f508593b64df214fee8f6ab42df633c\"$"
       }
     }
   },
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-13-13.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-13-13.json
@@ -6,7 +6,7 @@
     "method": "GET",
     "headers": {
       "If-None-Match": {
-        "equalTo": "\"4f508593b64df214fee8f6ab42df633c\""
+        "matches": "^(W/)?\"4f508593b64df214fee8f6ab42df633c\"$"
       }
     }
   },
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-14-14.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-14-14.json
@@ -6,7 +6,7 @@
     "method": "GET",
     "headers": {
       "If-None-Match": {
-        "equalTo": "\"4f508593b64df214fee8f6ab42df633c\""
+        "matches": "^(W/)?\"4f508593b64df214fee8f6ab42df633c\"$"
       }
     }
   },
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-16-16.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-16-16.json
@@ -6,7 +6,7 @@
     "method": "GET",
     "headers": {
       "If-None-Match": {
-        "equalTo": "\"31f73a7ecc35bbecec125851ce166af4\""
+        "matches": "^(W/)?\"31f73a7ecc35bbecec125851ce166af4\"$"
       }
     }
   },
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-17-17.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-17-17.json
@@ -6,7 +6,7 @@
     "method": "GET",
     "headers": {
       "If-None-Match": {
-        "equalTo": "\"31f73a7ecc35bbecec125851ce166af4\""
+        "matches": "^(W/)?\"31f73a7ecc35bbecec125851ce166af4\"$"
       }
     }
   },
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-4-4.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-4-4.json
@@ -3,7 +3,12 @@
   "name": "repos_hub4j-test-org_github-api",
   "request": {
     "url": "/repos/hub4j-test-org/github-api",
-    "method": "GET"
+    "method": "GET",
+    "headers": {
+      "If-None-Match": {
+        "absent" : true
+      }
+    }
   },
   "response": {
     "status": 200,
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-6-6.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-6-6.json
@@ -6,7 +6,7 @@
     "method": "GET",
     "headers": {
       "If-None-Match": {
-        "equalTo": "\"295ae3430c604f3d10b6eb145fe511b5\""
+        "matches": "^(W/)?\"295ae3430c604f3d10b6eb145fe511b5\"$"
       }
     }
   },
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-7-7.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-7-7.json
@@ -6,7 +6,7 @@
     "method": "GET",
     "headers": {
       "If-None-Match": {
-        "equalTo": "\"295ae3430c604f3d10b6eb145fe511b5\""
+        "matches": "^(W/)?\"295ae3430c604f3d10b6eb145fe511b5\"$"
       }
     }
   },
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-8-8.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-8-8.json
@@ -6,7 +6,7 @@
     "method": "GET",
     "headers": {
       "If-None-Match": {
-        "equalTo": "\"295ae3430c604f3d10b6eb145fe511b5\""
+        "matches": "^(W/)?\"295ae3430c604f3d10b6eb145fe511b5\"$"
       }
     }
   },

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`"method": "GET",`
`7`	`7`	`"headers": {`
`8`	`8`	`"If-None-Match": {`
`9`		`- "equalTo": "\"4f508593b64df214fee8f6ab42df633c\""`
	`9`	`+ "matches": "^(W/)?\"4f508593b64df214fee8f6ab42df633c\"$"`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`	`},`