Simplify hash handling in test harness

Author: ofalvai

code-push-plugin-testing-framework/script/serverUtil.js

@@ -55,10 +55,9 @@ function setupServer(targetPlatform) {
 }
 exports.setupServer = setupServer;
 /**
- * The real content hash of each update archive built during this run, keyed by archive path.
- * Populated by setPackageHashForPath and applied to exports.updateResponse.
+ * The real content hash of the update archive most recently built during this test scenario.
  */
-var packageHashesByPath = {};
+var knownPackageHash;
 var _updatePackagePath;
 Object.defineProperty(exports, "updatePackagePath", {
     enumerable: true,
@@ -70,18 +69,17 @@ Object.defineProperty(exports, "updatePackagePath", {
     }
 });
 /**
- * Records the real content hash for an update archive, so that any update_check response
- * pointing exports.updatePackagePath at this archive gets the matching package_hash instead
- * of the one filled in by default.
+ * Records the real content hash for the update archive that will be served next, so that
+ * any update_check response gets the matching package_hash instead of the one filled in
+ * by default.
  */
-function setPackageHashForPath(archivePath, packageHash) {
-    packageHashesByPath[archivePath] = packageHash;
+function setKnownPackageHash(packageHash) {
+    knownPackageHash = packageHash;
 }
-exports.setPackageHashForPath = setPackageHashForPath;
+exports.setKnownPackageHash = setKnownPackageHash;
 function applyKnownPackageHash() {
-    var knownHash = _updatePackagePath && packageHashesByPath[_updatePackagePath];
-    if (knownHash && exports.updateResponse && exports.updateResponse.update_info) {
-        exports.updateResponse.update_info.package_hash = knownHash;
+    if (knownPackageHash && exports.updateResponse && exports.updateResponse.update_info) {
+        exports.updateResponse.update_info.package_hash = knownPackageHash;
     }
 }
 /**

code-push-plugin-testing-framework/typings/code-push-plugin-testing-framework.d.ts

@@ -291,10 +291,11 @@ declare module 'code-push-plugin-testing-framework/script/serverUtil' {
 	 */
 	export function cleanupServer(): void;
 	/**
-	 * Records the real content hash for an update archive at archivePath, so any future
-	 * update_check response pointing updatePackagePath at it gets a matching package_hash.
+	 * Records the real content hash for the update archive that will be served next, so the
+	 * next update_check response gets a matching package_hash. Pass a falsy packageHash to
+	 * clear it.
 	 */
-	export function setPackageHashForPath(archivePath: string, packageHash: string): void;
+	export function setKnownPackageHash(packageHash: string): void;
 	/**
 	 * Class used to mock the codePush.checkForUpdate() response from the server.
 	 */

test/test.ts

@@ -554,10 +554,10 @@ class RNProjectManager extends ProjectManager {
 
     // Records the real hash of bundleFolder of an archive, so the mock server can hand back a
     // package_hash that matches what the client's verifyFolderHash integrity check will compute.
+    // Diff updates clear it instead, since they don't have a precomputed real hash and must not
+    // pick up a stale one left behind by a preceding full update.
     private updateMockPackageHash(bundleFolder: string, isDiff: boolean, archivePath: string): string {
-        if (!isDiff) {
-            ServerUtil.setPackageHashForPath(archivePath, computeUpdateContentsHash(bundleFolder));
-        }
+        ServerUtil.setKnownPackageHash(isDiff ? undefined : computeUpdateContentsHash(bundleFolder));
         return archivePath;
     }