Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 47 additions & 1 deletion Test/Mono.Cecil.Tests/BaseTestFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,11 @@ public static void TestIL (string file, Action<ModuleDefinition> test, bool veri
Run (new ILTestCase (file, test, verify, readOnly, symbolReaderProvider, symbolWriterProvider, assemblyResolver, applyWindowsRuntimeProjections, sourceFilePath));
}

public static void TestBinary (string file, Action<ModuleDefinition> test, bool verify = true, bool readOnly = true, Type symbolReaderProvider = null, Type symbolWriterProvider = null, IAssemblyResolver assemblyResolver = null, bool applyWindowsRuntimeProjections = false, [CallerFilePath] string sourceFilePath = "")
{
Run (new BinaryTestCase (file, test, verify, readOnly, symbolReaderProvider, symbolWriterProvider, assemblyResolver, applyWindowsRuntimeProjections, sourceFilePath));
}

static void Run (TestCase testCase)
{
using (var runner = new TestRunner (testCase, TestCaseType.ReadDeferred))
Expand Down Expand Up @@ -235,7 +240,22 @@ public override string ModuleLocation
}
}
}
class BinaryTestCase : ModuleTestCase {

public BinaryTestCase (string file, Action<ModuleDefinition> test, bool verify, bool readOnly, Type symbolReaderProvider, Type symbolWriterProvider, IAssemblyResolver assemblyResolver, bool applyWindowsRuntimeProjections, string sourceFilePath = "")
: base (file, test, verify, readOnly, symbolReaderProvider, symbolWriterProvider, assemblyResolver, applyWindowsRuntimeProjections, sourceFilePath)
{
}

public byte[] BinaryStream
{
get
{
byte[] bytes = System.IO.File.ReadAllBytes(ModuleLocation);
return bytes;
}
}
}
class TestRunner : IDisposable {

readonly TestCase test_case;
Expand Down Expand Up @@ -278,6 +298,28 @@ ModuleDefinition GetModule ()
}
}

ModuleDefinition GetModuleFromBinary ()
{
var test_case_binary = test_case as BinaryTestCase;
var stream = test_case_binary.BinaryStream;

var parameters = new ReaderParameters {
SymbolReaderProvider = GetSymbolReaderProvider (),
AssemblyResolver = GetAssemblyResolver ()
};

switch (type) {
case TestCaseType.ReadImmediate:
parameters.ReadingMode = ReadingMode.Immediate;
return ModuleDefinition.ReadModule (new MemoryStream(stream), parameters);
case TestCaseType.ReadDeferred:
parameters.ReadingMode = ReadingMode.Deferred;
return ModuleDefinition.ReadModule (new MemoryStream (stream), parameters);
default:
return null;
}
}

ISymbolReaderProvider GetSymbolReaderProvider ()
{
if (test_case.SymbolReaderProvider == null)
Expand Down Expand Up @@ -330,7 +372,11 @@ ModuleDefinition RoundTrip (string location, ReaderParameters reader_parameters,

public void RunTest ()
{
var module = GetModule ();
ModuleDefinition module;
if (test_case is BinaryTestCase)
module = GetModuleFromBinary();
else
module = GetModule ();
if (module == null)
return;

Expand Down
23 changes: 23 additions & 0 deletions Test/Mono.Cecil.Tests/PortablePdbTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using NUnit.Framework;

using Mono.Cecil.Cil;
using Mono.Cecil.Pdb;
using Mono.Cecil.PE;

namespace Mono.Cecil.Tests {
Expand Down Expand Up @@ -368,6 +369,28 @@ public void EmbeddedCompressedPortablePdb ()
}, symbolReaderProvider: typeof (EmbeddedPortablePdbReaderProvider), symbolWriterProvider: typeof (EmbeddedPortablePdbWriterProvider));
}

[Test]
public void EmbeddedCompressedPortablePdbFromStream ()
{
TestBinary("EmbeddedCompressedPdbTarget.exe", module => {

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can make this simpler and not create infrastructure for reading modules as in memory. You can undo all the changes in BaseTestFixture, and in this test you can use:

var bytes = File.ReadAllBytes (GetAssemblyResourcePath ("EmbeddedCompressedPdbTarget.exe"))

Create the module from that and run the test.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

Assert.IsTrue (module.HasDebugHeader);

var header = module.GetDebugHeader ();

Assert.IsNotNull (header);
Assert.AreEqual (2, header.Entries.Length);

var cv = header.Entries [0];
Assert.AreEqual (ImageDebugType.CodeView, cv.Directory.Type);

var eppdb = header.Entries [1];
Assert.AreEqual (ImageDebugType.EmbeddedPortablePdb, eppdb.Directory.Type);
Assert.AreEqual (0x0100, eppdb.Directory.MajorVersion);
Assert.AreEqual (0x0100, eppdb.Directory.MinorVersion);
}, symbolReaderProvider: typeof (PdbReaderProvider), symbolWriterProvider: null);
}


void TestPortablePdbModule (Action<ModuleDefinition> test)
{
TestModule ("PdbTarget.exe", test, symbolReaderProvider: typeof (PortablePdbReaderProvider), symbolWriterProvider: typeof (PortablePdbWriterProvider));
Expand Down
3 changes: 2 additions & 1 deletion symbols/pdb/Mono.Cecil.Pdb/PdbHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,15 @@ public sealed class PdbReaderProvider : ISymbolReaderProvider {
public ISymbolReader GetSymbolReader (ModuleDefinition module, string fileName)
{
Mixin.CheckModule (module);
Mixin.CheckFileName (fileName);

if (module.HasDebugHeader) {
var header = module.GetDebugHeader ();
var entry = header.GetEmbeddedPortablePdbEntry ();
if (entry != null)
return new EmbeddedPortablePdbReaderProvider ().GetSymbolReader (module, fileName);
}

Mixin.CheckFileName (fileName);

return Mixin.IsPortablePdb (Mixin.GetPdbFileName (fileName))
? new PortablePdbReaderProvider ().GetSymbolReader (module, fileName)
Expand Down