From d98a11e6f7858c26ed91188d3ab7e2813af87b30 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Wed, 10 Sep 2014 11:54:10 -0700 Subject: [PATCH] Modified tests and added a test for labeled continues in a switch block. --- .../getOccurrencesLoopBreakContinue.ts | 2 ++ .../getOccurrencesLoopBreakContinue2.ts | 2 ++ .../getOccurrencesLoopBreakContinue3.ts | 1 + .../getOccurrencesLoopBreakContinue4.ts | 2 ++ .../getOccurrencesLoopBreakContinue5.ts | 2 ++ .../getOccurrencesSwitchCaseDefault.ts | 26 +++++++++---------- .../getOccurrencesSwitchCaseDefault2.ts | 21 +++++---------- .../getOccurrencesSwitchCaseDefault3.ts | 1 + .../getOccurrencesSwitchCaseDefault4.ts | 25 ++++++++++++++++++ 9 files changed, 54 insertions(+), 28 deletions(-) create mode 100644 tests/cases/fourslash/getOccurrencesSwitchCaseDefault4.ts diff --git a/tests/cases/fourslash/getOccurrencesLoopBreakContinue.ts b/tests/cases/fourslash/getOccurrencesLoopBreakContinue.ts index aad909f9737..81aaaed5c58 100644 --- a/tests/cases/fourslash/getOccurrencesLoopBreakContinue.ts +++ b/tests/cases/fourslash/getOccurrencesLoopBreakContinue.ts @@ -65,6 +65,7 @@ test.ranges().forEach(r => { goTo.position(r.start); + verify.occurrencesAtPositionCount(test.ranges().length); test.ranges().forEach(range => { verify.occurrencesAtPositionContains(range, false); @@ -72,6 +73,7 @@ test.ranges().forEach(r => { }); goTo.marker(); +verify.occurrencesAtPositionCount(test.ranges().length); test.ranges().forEach(range => { verify.occurrencesAtPositionContains(range, false); }); \ No newline at end of file diff --git a/tests/cases/fourslash/getOccurrencesLoopBreakContinue2.ts b/tests/cases/fourslash/getOccurrencesLoopBreakContinue2.ts index cae9845e06f..51d4d89b657 100644 --- a/tests/cases/fourslash/getOccurrencesLoopBreakContinue2.ts +++ b/tests/cases/fourslash/getOccurrencesLoopBreakContinue2.ts @@ -65,6 +65,7 @@ test.ranges().forEach(r => { goTo.position(r.start); + verify.occurrencesAtPositionCount(test.ranges().length); test.ranges().forEach(range => { verify.occurrencesAtPositionContains(range, false); @@ -72,6 +73,7 @@ test.ranges().forEach(r => { }); goTo.marker(); +verify.occurrencesAtPositionCount(test.ranges().length); test.ranges().forEach(range => { verify.occurrencesAtPositionContains(range, false); }); \ No newline at end of file diff --git a/tests/cases/fourslash/getOccurrencesLoopBreakContinue3.ts b/tests/cases/fourslash/getOccurrencesLoopBreakContinue3.ts index 571114ea153..8777c912afd 100644 --- a/tests/cases/fourslash/getOccurrencesLoopBreakContinue3.ts +++ b/tests/cases/fourslash/getOccurrencesLoopBreakContinue3.ts @@ -65,6 +65,7 @@ test.ranges().forEach(r => { goTo.position(r.start); + verify.occurrencesAtPositionCount(test.ranges().length); test.ranges().forEach(range => { verify.occurrencesAtPositionContains(range, false); diff --git a/tests/cases/fourslash/getOccurrencesLoopBreakContinue4.ts b/tests/cases/fourslash/getOccurrencesLoopBreakContinue4.ts index 587fb1a0938..1bca62ba013 100644 --- a/tests/cases/fourslash/getOccurrencesLoopBreakContinue4.ts +++ b/tests/cases/fourslash/getOccurrencesLoopBreakContinue4.ts @@ -65,6 +65,7 @@ test.ranges().forEach(r => { goTo.position(r.start); + verify.occurrencesAtPositionCount(test.ranges().length); test.ranges().forEach(range => { verify.occurrencesAtPositionContains(range, false); @@ -72,6 +73,7 @@ test.ranges().forEach(r => { }); goTo.marker(); +verify.occurrencesAtPositionCount(test.ranges().length); test.ranges().forEach(range => { verify.occurrencesAtPositionContains(range, false); }); \ No newline at end of file diff --git a/tests/cases/fourslash/getOccurrencesLoopBreakContinue5.ts b/tests/cases/fourslash/getOccurrencesLoopBreakContinue5.ts index d558e6f3854..f4e62c554e4 100644 --- a/tests/cases/fourslash/getOccurrencesLoopBreakContinue5.ts +++ b/tests/cases/fourslash/getOccurrencesLoopBreakContinue5.ts @@ -65,6 +65,7 @@ test.ranges().forEach(r => { goTo.position(r.start); + verify.occurrencesAtPositionCount(test.ranges().length); test.ranges().forEach(range => { verify.occurrencesAtPositionContains(range, false); @@ -72,6 +73,7 @@ test.ranges().forEach(r => { }); goTo.marker(); +verify.occurrencesAtPositionCount(test.ranges().length); test.ranges().forEach(range => { verify.occurrencesAtPositionContains(range, false); }); \ No newline at end of file diff --git a/tests/cases/fourslash/getOccurrencesSwitchCaseDefault.ts b/tests/cases/fourslash/getOccurrencesSwitchCaseDefault.ts index a3d51e642d1..f32ff0e8f82 100644 --- a/tests/cases/fourslash/getOccurrencesSwitchCaseDefault.ts +++ b/tests/cases/fourslash/getOccurrencesSwitchCaseDefault.ts @@ -1,10 +1,10 @@ /// -////[|sw/*1*/itch|] (10) { -//// [|/*2*/case|] 1: -//// [|cas/*3*/e|] 2: -//// [|c/*4*/ase|] 4: -//// [|c/*5*/ase|] 8: +////[|switch|] (10) { +//// [|case|] 1: +//// [|case|] 2: +//// [|case|] 4: +//// [|case|] 8: //// foo: switch (20) { //// case 1: //// case 2: @@ -12,18 +12,18 @@ //// default: //// break foo; //// } -//// [|cas/*6*/e|] 0xBEEF: -//// [|defa/*7*/ult|]: -//// [|bre/*9*/ak|]; -//// [|/*8*/case|] 16: +//// [|case|] 0xBEEF: +//// [|default|]: +//// [|break|]; +//// [|case|] 16: ////} -for (var i = 1; i <= test.markers().length; i++) { - goTo.marker("" + i); - verify.occurrencesAtPositionCount(9); +test.ranges().forEach(r => { + goTo.position(r.start); + verify.occurrencesAtPositionCount(test.ranges().length); test.ranges().forEach(range => { verify.occurrencesAtPositionContains(range, false); }); -} +}); diff --git a/tests/cases/fourslash/getOccurrencesSwitchCaseDefault2.ts b/tests/cases/fourslash/getOccurrencesSwitchCaseDefault2.ts index dc0db1f4b35..dd4577faa1f 100644 --- a/tests/cases/fourslash/getOccurrencesSwitchCaseDefault2.ts +++ b/tests/cases/fourslash/getOccurrencesSwitchCaseDefault2.ts @@ -5,11 +5,11 @@ //// case 2: //// case 4: //// case 8: -//// foo: [|swi/*1*/tch|] (20) { -//// [|/*2*/case|] 1: -//// [|cas/*3*/e|] 2: -//// [|b/*4*/reak|]; -//// [|defaul/*5*/t|]: +//// foo: [|switch|] (20) { +//// [|case|] 1: +//// [|case|] 2: +//// [|break|]; +//// [|default|]: //// [|break|] foo; //// } //// case 0xBEEF: @@ -21,18 +21,9 @@ test.ranges().forEach(r => { goTo.position(r.start); + verify.occurrencesAtPositionCount(test.ranges().length); test.ranges().forEach(range => { verify.occurrencesAtPositionContains(range, false); }); }); - - -for (var i = 1; i <= test.markers().length; i++) { - goTo.marker("" + i); - verify.occurrencesAtPositionCount(6); - - test.ranges().forEach(range => { - verify.occurrencesAtPositionContains(range, false); - }); -} diff --git a/tests/cases/fourslash/getOccurrencesSwitchCaseDefault3.ts b/tests/cases/fourslash/getOccurrencesSwitchCaseDefault3.ts index 959ce9d9939..24330ca1912 100644 --- a/tests/cases/fourslash/getOccurrencesSwitchCaseDefault3.ts +++ b/tests/cases/fourslash/getOccurrencesSwitchCaseDefault3.ts @@ -18,6 +18,7 @@ test.ranges().forEach(r => { goTo.position(r.start); + verify.occurrencesAtPositionCount(test.ranges().length); test.ranges().forEach(range => { verify.occurrencesAtPositionContains(range, false); diff --git a/tests/cases/fourslash/getOccurrencesSwitchCaseDefault4.ts b/tests/cases/fourslash/getOccurrencesSwitchCaseDefault4.ts new file mode 100644 index 00000000000..039009746dd --- /dev/null +++ b/tests/cases/fourslash/getOccurrencesSwitchCaseDefault4.ts @@ -0,0 +1,25 @@ +/// + +////foo: [|switch|] (10) { +//// [|case|] 1: +//// [|case|] 2: +//// [|case|] 3: +//// [|break|]; +//// [|break|] foo; +//// co/*1*/ntinue; +//// contin/*2*/ue foo; +////} + +test.ranges().forEach(r => { + goTo.position(r.start); + verify.occurrencesAtPositionCount(test.ranges().length); + + test.ranges().forEach(range => { + verify.occurrencesAtPositionContains(range, false); + }); +}); + +test.markers().forEach(m => { + goTo.position(m.position); + verify.occurrencesAtPositionCount(0); +}); \ No newline at end of file