Enable native tests

dotnet · Aug 3, 2016 · 2ee9308 · 2ee9308
1 parent fad6211
commit 2ee9308
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 22 deletions.
diff --git a/src/Microsoft.DiaSymReader.PortablePdb.Tests/EmbeddedSourceTests.cs b/src/Microsoft.DiaSymReader.PortablePdb.Tests/EmbeddedSourceTests.cs
@@ -11,6 +11,7 @@
 
 namespace Microsoft.DiaSymReader.PortablePdb.UnitTests
 {
+    using System.Diagnostics;
     using System.Linq;
     using static SymTestHelpers;
 
@@ -25,14 +26,15 @@ public void EmbeddedSource_Portable()
         [Fact]
         public void EmbeddedSource_Native()
         {
-            NativeNotYetImplemented();
-            //EmbeddedSource(TestResources.EmbeddedSource.DllAndPdb);
+            EmbeddedSource(TestResources.EmbeddedSource.DllAndPdb);
         }
 
         private void EmbeddedSource(KeyValuePair<byte[], byte[]> dllAndPdb)
         {
             ISymUnmanagedReader symReader = CreateSymReaderFromResource(dllAndPdb);
 
+            Debugger.Launch();
+
             foreach (string file in new[] { @"C:\EmbeddedSource.cs", @"C:\EmbeddedSourceSmall.cs" })
             {
                 bool hasEmbeddedSource;
@@ -58,7 +60,7 @@ private void EmbeddedSource(KeyValuePair<byte[], byte[]> dllAndPdb)
                     }
                 }
 
-                byte[] expectedContent, content;
+                byte[] expectedContent;
                 if (uncompressedSize == 0)
                 {
                     Assert.Equal(@"C:\EmbeddedSourceSmall.cs", file);
@@ -84,8 +86,7 @@ public void NoEmbeddedSource_Portable()
         [Fact]
         public void NoEmbeddedSource_Native()
         {
-            NativeNotYetImplemented();
-            //NoEmbeddedSource(TestResources.Documents.DllAndPdb);
+            NoEmbeddedSource(TestResources.Documents.DllAndPdb);
         }
 
         private void NoEmbeddedSource(KeyValuePair<byte[], byte[]> dllAndPdb)
@@ -114,8 +115,7 @@ public void BadArgs_Portable()
         [Fact]
         public void BadArgs_Native()
         {
-            NativeNotYetImplemented();
-            //EmbeddedSource(TestResources.EmbeddedSource.DllAndPdb);
+            BadArgs(TestResources.EmbeddedSource.DllAndPdb);
         }
 
         private void BadArgs(KeyValuePair<byte[], byte[]> dllAndPdb)
@@ -189,19 +189,5 @@ private static DocumentHandle GetDocumentHandle(MetadataReader portablePdbReader
             Assert.False(true, "Document not found.");
             throw null;
         }
-
-        private void NativeNotYetImplemented()
-        {
-            // TODO: This checks the behavior of Microsoft.DiaSymReader.Native before the update that
-            // has native code support. When this starts to fail, remove this and uncomment the
-            // tests that pass native PDB to same worker routines as portable PDB.
-            ISymUnmanagedReader symReader = CreateSymReaderFromResource(TestResources.EmbeddedSource.DllAndPdb);
-
-            ISymUnmanagedDocument doc;
-            Assert.Equal(HResult.S_OK, symReader.GetDocument(@"C:\EmbeddedSource.cs", default(Guid), default(Guid), default(Guid), out doc));
-
-            bool hasEmbeddedSource;
-            Assert.Equal(HResult.E_NOTIMPL, doc.HasEmbeddedSource(out hasEmbeddedSource));
-        }
     }
 }
diff --git a/src/Microsoft.DiaSymReader.PortablePdb/project.json b/src/Microsoft.DiaSymReader.PortablePdb/project.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "System.Collections.Immutable": "1.2.0",
-    "System.Reflection.Metadata": "1.4.1-beta-24322-03",
+    "System.Reflection.Metadata": "1.4.1-beta-24403-05",
     "Microsoft.DiaSymReader": "1.1.0-beta1-60625-03",
     "System.Collections": "4.0.11",
     "System.Diagnostics.Debug": "4.0.11",