@@ -31,7 +31,7 @@ public void Setup()
_mockLogger = new Mock<ILog>();
_location = Path.Combine(Environment.CurrentDirectory, "OpenCover.Test.dll");

_reader = new CecilSymbolManager(_mockCommandLine.Object, _mockFilter.Object, _mockLogger.Object);
_reader = new CecilSymbolManager(_mockCommandLine.Object, _mockFilter.Object, _mockLogger.Object, null);
_reader.Initialise(_location, "OpenCover.Test");
}

@@ -86,7 +86,7 @@ public void GetInstrumentableTypes_Does_Not_Return_Structs_With_No_Instrumentabl

// assert
Assert.NotNull(types);
Assert.IsNull(types.Where(x => x.FullName == typeof(NotCoveredStruct).FullName).FirstOrDefault());
Assert.IsNull(types.FirstOrDefault(x => x.FullName == typeof(NotCoveredStruct).FullName));
}

[Test]
@@ -102,7 +102,7 @@ public void GetInstrumentableTypes_Does_Return_Structs_With_Instrumentable_Code(

// assert
Assert.NotNull(types);
Assert.IsNotNull(types.Where(x => x.FullName == typeof(CoveredStruct).FullName).FirstOrDefault());
Assert.IsNotNull(types.FirstOrDefault(x => x.FullName == typeof(CoveredStruct).FullName));
}

[Test]
@@ -114,7 +114,7 @@ public void GetMethodsForType_Returns_AllDeclared_ForType()
.Returns(true);

var types = _reader.GetInstrumentableTypes();
var type = types.Where(x => x.FullName == typeof(DeclaredMethodClass).FullName).First();
var type = types.First(x => x.FullName == typeof(DeclaredMethodClass).FullName);


// act
@@ -133,7 +133,7 @@ public void GetSequencePointsForMethodToken()
.Returns(true);

var types = _reader.GetInstrumentableTypes();
var type = types.Where(x => x.FullName == typeof(DeclaredMethodClass).FullName).First();
var type = types.First(x => x.FullName == typeof(DeclaredMethodClass).FullName);
var methods = _reader.GetMethodsForType(type, new File[0]);

// act
@@ -152,11 +152,11 @@ public void GetBranchPointsForMethodToken_OneBranch()
.Returns(true);

var types = _reader.GetInstrumentableTypes();
var type = types.Where(x => x.FullName == typeof(DeclaredConstructorClass).FullName).First();
var type = types.First(x => x.FullName == typeof(DeclaredConstructorClass).FullName);
var methods = _reader.GetMethodsForType(type, new File[0]);

// act
var points = _reader.GetBranchPointsForToken(methods.Where(x => x.Name.Contains("::HasSingleDecision")).First().MetadataToken);
var points = _reader.GetBranchPointsForToken(methods.First(x => x.Name.Contains("::HasSingleDecision")).MetadataToken);

// assert
Assert.IsNotNull(points);
@@ -175,11 +175,11 @@ public void GetBranchPointsForMethodToken_TwoBranch()
.Returns(true);

var types = _reader.GetInstrumentableTypes();
var type = types.Where(x => x.FullName == typeof(DeclaredConstructorClass).FullName).First();
var type = types.First(x => x.FullName == typeof(DeclaredConstructorClass).FullName);
var methods = _reader.GetMethodsForType(type, new File[0]);

// act
var points = _reader.GetBranchPointsForToken(methods.Where(x => x.Name.Contains("::HasTwoDecisions")).First().MetadataToken);
var points = _reader.GetBranchPointsForToken(methods.First(x => x.Name.Contains("::HasTwoDecisions")).MetadataToken);

// assert
Assert.IsNotNull(points);
@@ -197,11 +197,11 @@ public void GetBranchPointsForMethodToken_Switch()
.Returns(true);

var types = _reader.GetInstrumentableTypes();
var type = types.Where(x => x.FullName == typeof(DeclaredConstructorClass).FullName).First();
var type = types.First(x => x.FullName == typeof(DeclaredConstructorClass).FullName);
var methods = _reader.GetMethodsForType(type, new File[0]);

// act
var points = _reader.GetBranchPointsForToken(methods.Where(x => x.Name.Contains("::HasSwitch")).First().MetadataToken);
var points = _reader.GetBranchPointsForToken(methods.First(x => x.Name.Contains("::HasSwitch")).MetadataToken);

// assert
Assert.IsNotNull(points);
@@ -123,6 +123,8 @@
<Compile Include="Framework\Persistance\FilePersistenceTests.cs" />
<Compile Include="Framework\ProfilerRegistrationTests.cs" />
<Compile Include="Framework\Service\ProfilerCommunicationTests.cs" />
<Compile Include="Framework\Strategy\TrackMSTestTestMethodsTests.cs" />
<Compile Include="Framework\Strategy\TrackNUnitTestMethodsTests.cs" />
<Compile Include="Framework\Symbols\CecilSymbolManagerTests.cs" />
<Compile Include="Integration\SimpleBranchTests.cs" />
<Compile Include="Integration\SimpleExceptionTests.cs" />