commit abaeacf300b7436996c6c0da7ff76a4f2fce987a
author Ben Rohlfs <brohlfs@google.com> Fri May 27 15:24:22 2022 +0200
committer Ben Rohlfs <brohlfs@google.com> Tue May 31 10:24:35 2022 +0200
tree 800f9ad0da53877644ee73809c05b6cbe8b7d8c9
parent 401ca85bd77d08f445ca87f7d349717cec578fd4

Improve typing of patch set numbers

For the "right" side of a diff always use `RevisionPatchSetNum`, which
cannot be `PARENT`.

Release-Notes: skip
Change-Id: Iffa7418236d0a8bc55bb062765099b4bea8ddd35

polygerrit-ui/app/elements/core/gr-router/gr-router_test.ts

diff --git a/polygerrit-ui/app/elements/core/gr-router/gr-router_test.ts b/polygerrit-ui/app/elements/core/gr-router/gr-router_test.ts
index 4ffc98b..9eb6acc 100644
--- a/polygerrit-ui/app/elements/core/gr-router/gr-router_test.ts
+++ b/polygerrit-ui/app/elements/core/gr-router/gr-router_test.ts
@@ -38,7 +38,6 @@
   GroupId,
   NumericChangeId,
   ParentPatchSetNum,
-  PatchSetNum,
   RepoName,
   RevisionPatchSetNum,
   TopicName,
@@ -394,7 +393,7 @@
 
       assert.equal(router.generateUrl(params), '/c/test/+/1234');
 
-      params.patchNum = 10 as PatchSetNum;
+      params.patchNum = 10 as RevisionPatchSetNum;
       assert.equal(router.generateUrl(params), '/c/test/+/1234/10');
 
       params.basePatchNum = 5 as BasePatchSetNum;
@@ -421,7 +420,7 @@
         view: GerritView.DIFF,
         changeNum: 42 as NumericChangeId,
         path: 'x+y/path.cpp' as RepoName,
-        patchNum: 12 as PatchSetNum,
+        patchNum: 12 as RevisionPatchSetNum,
         project: '' as RepoName,
       };
       assert.equal(router.generateUrl(params), '/c/42/12/x%252By/path.cpp');
@@ -439,7 +438,7 @@
       );
 
       params.path = 'foo bar/my+file.txt%';
-      params.patchNum = 2 as PatchSetNum;
+      params.patchNum = 2 as RevisionPatchSetNum;
       delete params.basePatchNum;
       assert.equal(
         router.generateUrl(params),
@@ -459,7 +458,7 @@
         view: GerritView.DIFF,
         changeNum: 42 as NumericChangeId,
         path: 'x+y/path.cpp',
-        patchNum: 12 as PatchSetNum,
+        patchNum: 12 as RevisionPatchSetNum,
         project: 'x+/y' as RepoName,
       };
       assert.equal(
@@ -474,7 +473,7 @@
         changeNum: 42 as NumericChangeId,
         project: 'test' as RepoName,
         path: 'x+y/path.cpp',
-        patchNum: 'edit' as PatchSetNum,
+        patchNum: 'edit' as RevisionPatchSetNum,
       };
       assert.equal(
         router.generateUrl(params),
@@ -487,7 +486,7 @@
       let actual = router.getPatchRangeExpression(params);
       assert.equal(actual, '');
 
-      params.patchNum = 4 as PatchSetNum;
+      params.patchNum = 4 as RevisionPatchSetNum;
       actual = router.getPatchRangeExpression(params);
       assert.equal(actual, '4');
 
@@ -621,12 +620,12 @@
       test('range n..n normalizes to n', () => {
         const params: PatchRangeParams = {
           basePatchNum: 4 as BasePatchSetNum,
-          patchNum: 4 as PatchSetNum,
+          patchNum: 4 as RevisionPatchSetNum,
         };
         const needsRedirect = router.normalizePatchRangeParams(params);
         assert.isTrue(needsRedirect);
         assert.equal(params.basePatchNum, ParentPatchSetNum);
-        assert.equal(params.patchNum, 4 as PatchSetNum);
+        assert.equal(params.patchNum, 4 as RevisionPatchSetNum);
       });
 
       test('range n.. normalizes to n', () => {
@@ -634,7 +633,7 @@
         const needsRedirect = router.normalizePatchRangeParams(params);
         assert.isFalse(needsRedirect);
         assert.equal(params.basePatchNum, ParentPatchSetNum);
-        assert.equal(params.patchNum, 4 as PatchSetNum);
+        assert.equal(params.patchNum, 4 as RevisionPatchSetNum);
       });
     });
   });
@@ -1689,7 +1688,7 @@
           changeNum: 1234 as NumericChangeId,
           view: GerritNav.View.EDIT,
           path: 'foo/bar/baz',
-          patchNum: 3 as PatchSetNum,
+          patchNum: 3 as RevisionPatchSetNum,
           lineNum: '',
         };
 
@@ -1722,7 +1721,7 @@
           changeNum: 1234 as NumericChangeId,
           view: GerritNav.View.EDIT,
           path: 'foo/bar/baz',
-          patchNum: 3 as PatchSetNum,
+          patchNum: 3 as RevisionPatchSetNum,
           lineNum: '4',
         };
 
@@ -1753,7 +1752,7 @@
           project: 'foo/bar' as RepoName,
           changeNum: 1234 as NumericChangeId,
           view: GerritView.CHANGE,
-          patchNum: 3 as PatchSetNum,
+          patchNum: 3 as RevisionPatchSetNum,
           edit: true,
           tab: '',
         };