@@ -61,20 +61,18 @@ private void SimpleTextInfoSetUp(bool editorCoverageOff = false,string contentTy
6161 autoMoqer . SetInstance ( textInfo ) ;
6262 }
6363
64- [ TestCase ( "CSharp" , Language . CSharp ) ]
65- [ TestCase ( "Basic" , Language . VB ) ]
66- [ TestCase ( "C/C++" , Language . CPP ) ]
67- public void Should_Create_Tracked_Lines_From_Existing_Coverage_Based_Upon_The_Content_Type_Language ( string contentTypeName , Language expectedLanguage )
64+ [ Test ]
65+ public void Should_Create_Tracked_Lines_From_Existing_Coverage ( )
6866 {
69- SimpleTextInfoSetUp ( false , contentTypeName ) ;
67+ SimpleTextInfoSetUp ( false , "CSharp" ) ;
7068
7169 var lines = new List < ILine > { CreateLine ( ) } ;
7270 var mockFileLineCoverage = autoMoqer . GetMock < IFileLineCoverage > ( ) ;
7371 mockFileLineCoverage . Setup ( fileLineCoverage => fileLineCoverage . GetLines ( "filepath" ) ) . Returns ( lines ) ;
7472
7573 var bufferLineCoverage = autoMoqer . Create < BufferLineCoverage > ( ) ;
7674
77- autoMoqer . Verify < ITrackedLinesFactory > ( trackedLinesFactory => trackedLinesFactory . Create ( lines , textSnapshot , expectedLanguage ) ) ;
75+ autoMoqer . Verify < ITrackedLinesFactory > ( trackedLinesFactory => trackedLinesFactory . Create ( lines , textSnapshot ) ) ;
7876 }
7977
8078 [ Test ]
@@ -84,7 +82,7 @@ public void Should_Not_Create_TrackedLines_If_EditorCoverageColouringMode_Is_Off
8482
8583 var bufferLineCoverage = autoMoqer . Create < BufferLineCoverage > ( ) ;
8684
87- autoMoqer . Verify < ITrackedLinesFactory > ( trackedLinesFactory => trackedLinesFactory . Create ( It . IsAny < List < ILine > > ( ) , It . IsAny < ITextSnapshot > ( ) , It . IsAny < Language > ( ) ) , Times . Never ( ) ) ;
85+ autoMoqer . Verify < ITrackedLinesFactory > ( trackedLinesFactory => trackedLinesFactory . Create ( It . IsAny < List < ILine > > ( ) , It . IsAny < ITextSnapshot > ( ) ) , Times . Never ( ) ) ;
8886 }
8987
9088 [ Test ]
@@ -97,7 +95,7 @@ public void Should_Not_Create_TrackedLines_From_NewCoverageLinesMessage_If_Edito
9795 var newCoverageLinesMessage = new NewCoverageLinesMessage { CoverageLines = new Mock < IFileLineCoverage > ( ) . Object } ;
9896 bufferLineCoverage . Handle ( newCoverageLinesMessage ) ;
9997
100- autoMoqer . Verify < ITrackedLinesFactory > ( trackedLinesFactory => trackedLinesFactory . Create ( It . IsAny < List < ILine > > ( ) , It . IsAny < ITextSnapshot > ( ) , It . IsAny < Language > ( ) ) , Times . Never ( ) ) ;
98+ autoMoqer . Verify < ITrackedLinesFactory > ( trackedLinesFactory => trackedLinesFactory . Create ( It . IsAny < List < ILine > > ( ) , It . IsAny < ITextSnapshot > ( ) ) , Times . Never ( ) ) ;
10199 }
102100
103101 [ Test ]
@@ -118,7 +116,7 @@ public void GetLines_Should_Delegate_To_TrackedLines()
118116 mockTrackedLines . Setup ( trackedLines => trackedLines . GetLines ( 2 , 5 ) ) . Returns ( lines ) ;
119117
120118 autoMoqer . Setup < ITrackedLinesFactory , ITrackedLines > (
121- trackedLinesFactory => trackedLinesFactory . Create ( It . IsAny < List < ILine > > ( ) , It . IsAny < ITextSnapshot > ( ) , It . IsAny < Language > ( ) ) )
119+ trackedLinesFactory => trackedLinesFactory . Create ( It . IsAny < List < ILine > > ( ) , It . IsAny < ITextSnapshot > ( ) ) )
122120 . Returns ( mockTrackedLines . Object ) ;
123121
124122 var bufferLineCoverage = autoMoqer . Create < BufferLineCoverage > ( ) ;
@@ -142,7 +140,7 @@ public void Should_Have_Empty_Lines_When_Coverage_Cleared()
142140 SimpleTextInfoSetUp ( ) ;
143141
144142 autoMoqer . Setup < ITrackedLinesFactory , ITrackedLines > (
145- trackedLinesFactory => trackedLinesFactory . Create ( It . IsAny < List < ILine > > ( ) , It . IsAny < ITextSnapshot > ( ) , It . IsAny < Language > ( ) ) )
143+ trackedLinesFactory => trackedLinesFactory . Create ( It . IsAny < List < ILine > > ( ) , It . IsAny < ITextSnapshot > ( ) ) )
146144 . Returns ( new Mock < ITrackedLines > ( ) . Object ) ;
147145
148146 var bufferLineCoverage = autoMoqer . Create < BufferLineCoverage > ( ) ;
@@ -182,7 +180,7 @@ public void Should_Create_New_TextLines_When_Coverage_Changed_And_Not_Off_In_App
182180 var dynamicLines = new List < IDynamicLine > ( ) ;
183181 mockTrackedLines . Setup ( trackedLines => trackedLines . GetLines ( 2 , 5 ) ) . Returns ( dynamicLines ) ;
184182 autoMoqer . Setup < ITrackedLinesFactory , ITrackedLines > (
185- trackedLinesFactory => trackedLinesFactory . Create ( lines , mockCurrentSnapshot . Object , Language . CSharp )
183+ trackedLinesFactory => trackedLinesFactory . Create ( lines , mockCurrentSnapshot . Object )
186184 ) . Returns ( mockTrackedLines . Object ) ;
187185
188186
@@ -214,7 +212,7 @@ public void Should_Send_CoverageChangedMessage_When_Necessary(
214212 SimpleTextInfoSetUp ( ) ;
215213 var trackedLines = new Mock < ITrackedLines > ( ) . Object ;
216214 var mockTrackedLinesFactory = autoMoqer . GetMock < ITrackedLinesFactory > ( ) ;
217- mockTrackedLinesFactory . SetupSequence ( trackedLinesFactory => trackedLinesFactory . Create ( It . IsAny < List < ILine > > ( ) , It . IsAny < ITextSnapshot > ( ) , It . IsAny < Language > ( ) ) )
215+ mockTrackedLinesFactory . SetupSequence ( trackedLinesFactory => trackedLinesFactory . Create ( It . IsAny < List < ILine > > ( ) , It . IsAny < ITextSnapshot > ( ) ) )
218216 . Returns ( initialTrackedLines ? trackedLines : null )
219217 . Returns ( nextTrackedLines ? trackedLines : null ) ;
220218 var bufferLineCoverage = autoMoqer . Create < BufferLineCoverage > ( ) ;
@@ -247,7 +245,7 @@ public void Should_Update_TrackedLines_When_Text_Buffer_ChangedOnBackground(bool
247245 var changedLineNumbers = new List < int > { 11 , 12 } ;
248246 mockTrackedLines . Setup ( trackedLines => trackedLines . GetChangedLineNumbers ( mockAfterSnapshot . Object , new List < Span > { newSpan } ) )
249247 . Returns ( changedLineNumbers ) ;
250- autoMoqer . Setup < ITrackedLinesFactory , ITrackedLines > ( trackedLinesFactory => trackedLinesFactory . Create ( It . IsAny < List < ILine > > ( ) , It . IsAny < ITextSnapshot > ( ) , It . IsAny < Language > ( ) ) )
248+ autoMoqer . Setup < ITrackedLinesFactory , ITrackedLines > ( trackedLinesFactory => trackedLinesFactory . Create ( It . IsAny < List < ILine > > ( ) , It . IsAny < ITextSnapshot > ( ) ) )
251249 . Returns ( mockTrackedLines . Object ) ;
252250
253251
@@ -269,7 +267,7 @@ public void Should_Not_Throw_When_Text_Buffer_Changed_And_No_Coverage()
269267 SimpleTextInfoSetUp ( ) ;
270268
271269 autoMoqer . Setup < ITrackedLinesFactory , ITrackedLines > (
272- trackedLinesFactory => trackedLinesFactory . Create ( It . IsAny < List < ILine > > ( ) , It . IsAny < ITextSnapshot > ( ) , It . IsAny < Language > ( ) ) )
270+ trackedLinesFactory => trackedLinesFactory . Create ( It . IsAny < List < ILine > > ( ) , It . IsAny < ITextSnapshot > ( ) ) )
273271 . Returns ( new Mock < ITrackedLines > ( ) . Object ) ;
274272
275273 var bufferLineCoverage = autoMoqer . Create < BufferLineCoverage > ( ) ;
@@ -327,7 +325,7 @@ public void Should_SaveSerializedCoverage_When_TextView_Closed_And_There_Has_Bee
327325 ) . Returns ( new List < ILine > { } ) ;
328326 var trackedLines = new Mock < ITrackedLines > ( ) . Object ;
329327 autoMoqer . Setup < ITrackedLinesFactory , ITrackedLines > (
330- trackedLinesFactory => trackedLinesFactory . Create ( It . IsAny < List < ILine > > ( ) , It . IsAny < ITextSnapshot > ( ) , It . IsAny < Language > ( ) )
328+ trackedLinesFactory => trackedLinesFactory . Create ( It . IsAny < List < ILine > > ( ) , It . IsAny < ITextSnapshot > ( ) )
331329 ) . Returns ( trackedLines ) ;
332330 autoMoqer . Setup < ITrackedLinesFactory , string > (
333331 trackedLinesFactory => trackedLinesFactory . Serialize ( trackedLines )
@@ -356,7 +354,7 @@ public void Should_Remove_Serialized_Coverage_When_TextView_Closed_And_No_Tracke
356354 ) . Returns ( new List < ILine > { } ) ;
357355 var trackedLines = new Mock < ITrackedLines > ( ) . Object ;
358356 autoMoqer . Setup < ITrackedLinesFactory , ITrackedLines > (
359- trackedLinesFactory => trackedLinesFactory . Create ( It . IsAny < List < ILine > > ( ) , It . IsAny < ITextSnapshot > ( ) , It . IsAny < Language > ( ) )
357+ trackedLinesFactory => trackedLinesFactory . Create ( It . IsAny < List < ILine > > ( ) , It . IsAny < ITextSnapshot > ( ) )
360358 ) . Returns ( trackedLines ) ;
361359 autoMoqer . Setup < ITrackedLinesFactory , string > (
362360 trackedLinesFactory => trackedLinesFactory . Serialize ( trackedLines )
@@ -371,16 +369,14 @@ public void Should_Remove_Serialized_Coverage_When_TextView_Closed_And_No_Tracke
371369 autoMoqer . Verify < IDynamicCoverageStore > ( dynamicCoverageStore => dynamicCoverageStore . RemoveSerializedCoverage ( "filepath" ) ) ;
372370 }
373371
374- [ TestCase ( true , "CSharp" , Language . CSharp ) ]
375- [ TestCase ( true , "Basic" , Language . VB ) ]
376- [ TestCase ( true , "C/C++" , Language . CPP ) ]
377- [ TestCase ( false , "" , Language . CPP ) ]
378- public void Should_Create_From_Serialized_Coverage_If_Present ( bool hasSerialized , string contentTypeLanguage , Language expectedLanguage )
372+ [ TestCase ( true ) ]
373+ [ TestCase ( false ) ]
374+ public void Should_Create_From_Serialized_Coverage_If_Present ( bool hasSerialized )
379375 {
380376 var autoMoqer = new AutoMoqer ( ) ;
381377 SetupEditorCoverageColouringMode ( autoMoqer ) ;
382378 var mockTextInfo = autoMoqer . GetMock < ITextInfo > ( ) ;
383- mockTextInfo . SetupGet ( textInfo => textInfo . TextBuffer . ContentType . TypeName ) . Returns ( contentTypeLanguage ) ;
379+ mockTextInfo . SetupGet ( textInfo => textInfo . TextBuffer . ContentType . TypeName ) . Returns ( " contentTypeLanguage" ) ;
384380 mockTextInfo . SetupGet ( textInfo => textInfo . TextView ) . Returns ( new Mock < ITextView > ( ) . Object ) ;
385381 var currentTextSnaphot = new Mock < ITextSnapshot > ( ) . Object ;
386382 mockTextInfo . SetupGet ( textInfo => textInfo . TextBuffer . CurrentSnapshot ) . Returns ( currentTextSnaphot ) ;
@@ -390,12 +386,12 @@ public void Should_Create_From_Serialized_Coverage_If_Present(bool hasSerialized
390386
391387 var mockTrackedLinesNoSerialized = new Mock < ITrackedLines > ( ) ;
392388 autoMoqer . Setup < ITrackedLinesFactory , ITrackedLines > (
393- trackedLinesFactory => trackedLinesFactory . Create ( It . IsAny < List < ILine > > ( ) , It . IsAny < ITextSnapshot > ( ) , It . IsAny < Language > ( ) )
389+ trackedLinesFactory => trackedLinesFactory . Create ( It . IsAny < List < ILine > > ( ) , It . IsAny < ITextSnapshot > ( ) )
394390 ) . Returns ( mockTrackedLinesNoSerialized . Object ) ;
395391
396392 var mockTrackedLinesFromSerialized = new Mock < ITrackedLines > ( ) ;
397393 autoMoqer . Setup < ITrackedLinesFactory , ITrackedLines > (
398- trackedLinesFactory => trackedLinesFactory . Create ( "serialized" , currentTextSnaphot , expectedLanguage )
394+ trackedLinesFactory => trackedLinesFactory . Create ( "serialized" , currentTextSnaphot )
399395 ) . Returns ( mockTrackedLinesFromSerialized . Object ) ;
400396
401397
@@ -415,7 +411,7 @@ public void Should_Remove_TrackedLines_When_AppOptions_Changed_And_EditorCoverag
415411 mockTrackedLines . Setup ( trackedLines => trackedLines . GetLines ( It . IsAny < int > ( ) , It . IsAny < int > ( ) ) )
416412 . Returns ( new List < IDynamicLine > { new Mock < IDynamicLine > ( ) . Object } ) ;
417413 autoMoqer . Setup < ITrackedLinesFactory , ITrackedLines > (
418- trackedCoverageLinesFactory => trackedCoverageLinesFactory . Create ( It . IsAny < List < ILine > > ( ) , It . IsAny < ITextSnapshot > ( ) , It . IsAny < Language > ( ) )
414+ trackedCoverageLinesFactory => trackedCoverageLinesFactory . Create ( It . IsAny < List < ILine > > ( ) , It . IsAny < ITextSnapshot > ( ) )
419415 ) . Returns ( mockTrackedLines . Object ) ;
420416
421417 var bufferLineCoverage = autoMoqer . Create < BufferLineCoverage > ( ) ;
@@ -438,7 +434,7 @@ public void Should_Not_Remove_TrackedLines_When_AppOptions_Changed_And_EditorCov
438434 mockTrackedLines . Setup ( trackedLines => trackedLines . GetLines ( It . IsAny < int > ( ) , It . IsAny < int > ( ) ) )
439435 . Returns ( new List < IDynamicLine > { new Mock < IDynamicLine > ( ) . Object } ) ;
440436 autoMoqer . Setup < ITrackedLinesFactory , ITrackedLines > (
441- trackedCoverageLinesFactory => trackedCoverageLinesFactory . Create ( It . IsAny < List < ILine > > ( ) , It . IsAny < ITextSnapshot > ( ) , It . IsAny < Language > ( ) )
437+ trackedCoverageLinesFactory => trackedCoverageLinesFactory . Create ( It . IsAny < List < ILine > > ( ) , It . IsAny < ITextSnapshot > ( ) )
442438 ) . Returns ( mockTrackedLines . Object ) ;
443439
444440 var bufferLineCoverage = autoMoqer . Create < BufferLineCoverage > ( ) ;
0 commit comments