From dcb061fb1b9cacaf136cddfd2842bf3dbb010ced Mon Sep 17 00:00:00 2001 From: webzwo0i Date: Tue, 4 Aug 2020 18:43:01 +0200 Subject: [PATCH] cleanup --- tests/backend/specs/easysync/attributionlinemutations.js | 2 -- tests/backend/specs/easysync/compose.js | 4 ++-- tests/backend/specs/easysync/follow.js | 7 +++---- tests/backend/specs/easysync/inverserandom.js | 9 ++------- .../backend/specs/easysync/testAppendATextToAssembler.js | 3 --- .../specs/easysync/testSplitJoinAttributionLines.js | 3 --- tests/backend/specs/easysync/textlinemutations.js | 2 +- 7 files changed, 8 insertions(+), 22 deletions(-) diff --git a/tests/backend/specs/easysync/attributionlinemutations.js b/tests/backend/specs/easysync/attributionlinemutations.js index 3e6779c3f..f717f776d 100644 --- a/tests/backend/specs/easysync/attributionlinemutations.js +++ b/tests/backend/specs/easysync/attributionlinemutations.js @@ -1,8 +1,6 @@ var Changeset = require("ep_etherpad-lite/static/js/Changeset"); var AttributePool = require("ep_etherpad-lite/static/js/AttributePool"); var helper = require("./helper.js") -var assert = helper.assert; -var literal = helper.literal; var assertEqualStrings = helper.assertEqualStrings; var assertEqualArrays = helper.assertEqualArrays; diff --git a/tests/backend/specs/easysync/compose.js b/tests/backend/specs/easysync/compose.js index 3805bca2d..93e7be924 100644 --- a/tests/backend/specs/easysync/compose.js +++ b/tests/backend/specs/easysync/compose.js @@ -123,12 +123,12 @@ function random() { outTextAssem.append(txt); appendMultilineOp('+', txt); } else if (o.skip) { - var txt = textLeft.substring(0, o.skip); + txt = textLeft.substring(0, o.skip); textLeft = textLeft.substring(o.skip); outTextAssem.append(txt); appendMultilineOp('=', txt); } else if (o.remove) { - var txt = textLeft.substring(0, o.remove); + txt = textLeft.substring(0, o.remove); textLeft = textLeft.substring(o.remove); appendMultilineOp('-', txt); } diff --git a/tests/backend/specs/easysync/follow.js b/tests/backend/specs/easysync/follow.js index 88dbfff1f..a9c7d9210 100644 --- a/tests/backend/specs/easysync/follow.js +++ b/tests/backend/specs/easysync/follow.js @@ -26,8 +26,7 @@ describe("follow",function(){ }) function testCharacterRangeFollow(testId, cs, oldRange, insertionsAfter, correctNewRange) { - - var cs = Changeset.checkRep(cs); + cs = Changeset.checkRep(cs); assertEqualArrays(correctNewRange, Changeset.characterRangeFollow(cs, oldRange[0], oldRange[1], insertionsAfter)); } @@ -121,12 +120,12 @@ function random() { outTextAssem.append(txt); appendMultilineOp('+', txt); } else if (o.skip) { - var txt = textLeft.substring(0, o.skip); + txt = textLeft.substring(0, o.skip); textLeft = textLeft.substring(o.skip); outTextAssem.append(txt); appendMultilineOp('=', txt); } else if (o.remove) { - var txt = textLeft.substring(0, o.remove); + txt = textLeft.substring(0, o.remove); textLeft = textLeft.substring(o.remove); appendMultilineOp('-', txt); } diff --git a/tests/backend/specs/easysync/inverserandom.js b/tests/backend/specs/easysync/inverserandom.js index e8db33da3..999f41c69 100644 --- a/tests/backend/specs/easysync/inverserandom.js +++ b/tests/backend/specs/easysync/inverserandom.js @@ -1,9 +1,7 @@ var Changeset = require("ep_etherpad-lite/static/js/Changeset"); var AttributePool = require("ep_etherpad-lite/static/js/AttributePool"); var helper = require("./helper.js") -var assertEqualStrings = helper.assertEqualStrings; var assertEqualArrays = helper.assertEqualArrays; -var assert = helper.assert; describe("inverseRandom",function(){ it("inverseRandom",function(done){ @@ -135,12 +133,12 @@ function random() { outTextAssem.append(txt); appendMultilineOp('+', txt); } else if (o.skip) { - var txt = textLeft.substring(0, o.skip); + txt = textLeft.substring(0, o.skip); textLeft = textLeft.substring(o.skip); outTextAssem.append(txt); appendMultilineOp('=', txt); } else if (o.remove) { - var txt = textLeft.substring(0, o.remove); + txt = textLeft.substring(0, o.remove); textLeft = textLeft.substring(o.remove); appendMultilineOp('-', txt); } @@ -273,7 +271,4 @@ function random() { } } } - function assertEqualArrays(a, b) { - assert("JSON.stringify(" + literal(a) + ") == JSON.stringify(" + literal(b) + ")"); - } diff --git a/tests/backend/specs/easysync/testAppendATextToAssembler.js b/tests/backend/specs/easysync/testAppendATextToAssembler.js index d2efafdf8..98e12bd28 100644 --- a/tests/backend/specs/easysync/testAppendATextToAssembler.js +++ b/tests/backend/specs/easysync/testAppendATextToAssembler.js @@ -1,9 +1,6 @@ - var Changeset = require("ep_etherpad-lite/static/js/Changeset"); -var AttributePool = require("ep_etherpad-lite/static/js/AttributePool"); var helper = require("./helper.js") var assertEqualStrings = helper.assertEqualStrings; -var assertEqualArrays = helper.assertEqualArrays; describe("testAppendATextToAssembler",function(){ it("testAppendATextToAssembler",function(done){ diff --git a/tests/backend/specs/easysync/testSplitJoinAttributionLines.js b/tests/backend/specs/easysync/testSplitJoinAttributionLines.js index c03a5de23..2a40ff045 100644 --- a/tests/backend/specs/easysync/testSplitJoinAttributionLines.js +++ b/tests/backend/specs/easysync/testSplitJoinAttributionLines.js @@ -1,7 +1,4 @@ - - var Changeset = require("ep_etherpad-lite/static/js/Changeset"); -var AttributePool = require("ep_etherpad-lite/static/js/AttributePool"); var helper = require("./helper.js") var assertEqualStrings = helper.assertEqualStrings; var assertEqualArrays = helper.assertEqualArrays; diff --git a/tests/backend/specs/easysync/textlinemutations.js b/tests/backend/specs/easysync/textlinemutations.js index 7799a310f..bb6aacd7c 100644 --- a/tests/backend/specs/easysync/textlinemutations.js +++ b/tests/backend/specs/easysync/textlinemutations.js @@ -231,7 +231,7 @@ function runMutationTest(origLines, muts) { var inText = origLines.join(''); var cs = mutationsToChangeset(inText.length, muts); - lines2 = origLines.slice(); + var lines2 = origLines.slice(); Changeset.mutateTextLines(cs, lines2); var outText = Changeset.applyToText(cs, inText);