Merge branch 'fix-mdreader-tests' of https://github.com/nguerrera/corefx

bdhawks · Nov 12, 2014 · 518e13e · 518e13e
2 parents 466df1f + d3b3ac3
commit 518e13e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 32 deletions.
diff --git a/src/System.Numerics.Vectors.sln b/src/System.Numerics.Vectors.sln
@@ -1,4 +1,3 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.30324.0

diff --git a/src/System.Reflection.Metadata.sln b/src/System.Reflection.Metadata.sln
@@ -1,4 +1,3 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.30110.0

diff --git a/src/System.Reflection.Metadata/tests/Metadata/HandleCollectionTests.cs b/src/System.Reflection.Metadata/tests/Metadata/HandleCollectionTests.cs
diff --git a/src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj b/src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj
@@ -1,12 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-
   <PropertyGroup>
     <!-- Work around known Dev14 bug - see
          https://connect.microsoft.com/VisualStudio/feedback/details/1000796/connect-file-uap-props-not-found-cant-build-a-portable-lib-on-vs14
-    --> 
-
+    -->
     <_WindowsKitBinPath>C:\Program Files (x86)\Windows Kits\8.1\bin\x86</_WindowsKitBinPath>
     <_WindowsPhoneKitBinPath>C:\Program Files (x86)\Windows Phone Kits\8.1\bin</_WindowsPhoneKitBinPath>
     <MakePriExeFullPath>$(_WindowsKitBinPath)\makepri.exe</MakePriExeFullPath>
@@ -15,7 +13,6 @@
     <MakePriExtensionPath>$(_WindowsPhoneKitBinPath)\x86\MrmEnvironmentExtDl.dll</MakePriExtensionPath>
     <MakePriExtensionPath_x64>$(_WindowsPhoneKitBinPath)\x64\MrmEnvironmentExtDl.dll</MakePriExtensionPath_x64>
   </PropertyGroup>
-
   <PropertyGroup>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
@@ -72,7 +69,6 @@
     <Compile Include="Metadata\ClassLayoutRow.cs" />
     <Compile Include="Metadata\Ecma335\MetadataAggregatorTests.cs" />
     <Compile Include="Metadata\Ecma335\MetadataTokensTests.cs" />
-    <Compile Include="Metadata\HandleCollectionTests.cs" />
     <Compile Include="Metadata\HandleComparerTests.cs" />
     <Compile Include="Metadata\HandleTests.cs" />
     <Compile Include="Metadata\MetadataReaderTestHelpers.cs" />

diff --git a/src/System.Reflection.Metadata/tests/Utilities/MemoryBlockTests.cs b/src/System.Reflection.Metadata/tests/Utilities/MemoryBlockTests.cs
@@ -234,8 +234,9 @@ private unsafe void TestComparisons(string heapValue, int offset, string value,
             }
         }
 
-        // Add more test cases when fixing this.
-        [Fact(Skip = "TODO: MetadataStringComparer needs to use the user-supplied encoding.")]
+        // TODO: Issue #26: MetadataStringComparer needs to use the user-supplied encoding.
+        //       Add more test cases when fixing this and re-enabling the test.
+        /*[Fact]*/
         public unsafe void ComparisonToInvalidByteSequenceMatchesFallback()
         {
             // dangling lead byte
@@ -248,7 +249,7 @@ public unsafe void ComparisonToInvalidByteSequenceMatchesFallback()
                 Assert.False(new MemoryBlock(ptr, buffer.Length).Utf8NullTerminatedEquals(0, Encoding.UTF8.GetString(buffer)));
             }
 
-            // overload encoding
+            // overlong encoding
             fixed (byte* ptr = (buffer = new byte[] { (byte)'a', 0xC0, 0xAF, (byte)'b', 0x0 }))
             {
                 var block = new MemoryBlock(ptr, buffer.Length);