🔥 ResolutionProgress serialization tests

smashwilson · smashwilson · commit 1af18d0df198 · 2017-04-24T10:21:06.000-04:00
diff --git a/test/github-package.test.js b/test/github-package.test.js
@@ -607,45 +607,4 @@ describe('GithubPackage', function() {
       );
     });
   });
-
-  describe('serialized state', function() {
-    function resolutionProgressFrom(pkg, workdir) {
-      return pkg.getContextPool().getContext(workdir).getResolutionProgress();
-    }
-
-    it('restores nonempty resolution progress', async function() {
-      const workdirMergeConflict = await cloneRepository('merge-conflict');
-      const workdirNoConflict = await cloneRepository('three-files');
-
-      project.setPaths([workdirMergeConflict, workdirNoConflict]);
-      await githubPackage.activate();
-      await githubPackage.scheduleActiveContextUpdate();
-
-      // Record some state to recover later.
-      const resolutionMergeConflict0 = resolutionProgressFrom(githubPackage, workdirMergeConflict);
-      await assert.async.isTrue(resolutionMergeConflict0.loaded);
-      resolutionMergeConflict0.reportMarkerCount('modified-on-both-ours.txt', 3);
-
-      const payload = githubPackage.serialize();
-
-      // Use a little guilty knowledge of the payload structure to ensure that the workdir without resolution
-      // progress isn't serialized with the rest of the package state.
-      assert.isDefined(payload.resolutionProgressByPath[workdirMergeConflict]);
-      assert.isUndefined(payload.resolutionProgressByPath[workdirNoConflict]);
-
-      const githubPackage1 = new GithubPackage(
-        workspace, project, commandRegistry, notificationManager, tooltips, styles, config, confirm, getLoadSettings,
-      );
-      await githubPackage1.activate(payload);
-      await githubPackage1.scheduleActiveContextUpdate();
-
-      const resolutionMergeConflict1 = resolutionProgressFrom(githubPackage1, workdirMergeConflict);
-      const resolutionNoConflict1 = resolutionProgressFrom(githubPackage1, workdirNoConflict);
-
-      await assert.async.isFalse(resolutionMergeConflict1.isEmpty());
-      assert.equal(resolutionMergeConflict1.getRemaining('modified-on-both-ours.txt'), 3);
-
-      assert.isTrue(resolutionNoConflict1.isEmpty());
-    });
-  });
 });
diff --git a/test/models/conflicts/resolution-progress.test.js b/test/models/conflicts/resolution-progress.test.js
@@ -15,36 +15,6 @@ describe('ResolutionProgress', function() {
     assert.equal(progress.getRemaining('path/to/file.txt'), 3);
   });
 
-  describe('serialization', function() {
-    let payload;
-
-    beforeEach(function() {
-      const progress0 = new ResolutionProgress();
-      progress0.load('1234abcd', {});
-      progress0.reportMarkerCount('path/to/file0.txt', 3);
-      progress0.reportMarkerCount('path/to/file1.txt', 4);
-
-      payload = progress0.serialize();
-    });
-
-    it('restores data from the same revision', function() {
-      const progress1 = new ResolutionProgress();
-      progress1.load('1234abcd', payload);
-      assert.equal(progress1.getRemaining('path/to/file0.txt'), 3);
-      assert.equal(progress1.getRemaining('path/to/file1.txt'), 4);
-      assert.isFalse(progress1.isEmpty());
-    });
-
-    it('restores an empty object for a different revision', function() {
-      const progress2 = new ResolutionProgress();
-      progress2.load('abcd1234', payload);
-
-      assert.isUndefined(progress2.getRemaining('path/to/file0.txt'));
-      assert.isUndefined(progress2.getRemaining('path/to/file1.txt'));
-      assert.isTrue(progress2.isEmpty());
-    });
-  });
-
   describe('onDidUpdate', function() {
     let progress, didUpdateSpy;
 
diff --git a/test/models/workdir-context-pool.test.js b/test/models/workdir-context-pool.test.js
@@ -62,22 +62,6 @@ describe('WorkdirContextPool', function() {
       await context.getRepositoryStatePromise('Present');
       assert.isTrue(context.getRepository().isPresent());
     });
-
-    it('passes appropriate serialized state to the resolution progress', async function() {
-      const resolutionProgressByPath = {
-        [workingDirectory]: {
-          revision: await sha(workingDirectory),
-          paths: {'a.txt': 12},
-        },
-      };
-
-      pool.add(workingDirectory, {resolutionProgressByPath});
-      const context = pool.getContext(workingDirectory);
-      await context.getRepositoryStatePromise('Present');
-
-      const resolutionProgress = context.getResolutionProgress();
-      assert.equal(resolutionProgress.getRemaining('a.txt'), 12);
-    });
   });
 
   describe('replace', function() {
