Working to reduce number of conditional complication directives, and migrate towards feature-based condtions rather than platform-based

1 files changed, 3 insertions, 7 deletions

diff --git a/src/ProtocolBuffers.Test/TextFormatTest.cs b/src/ProtocolBuffers.Test/TextFormatTest.cs
index 10ab4e15..3008c599 100644
--- a/src/ProtocolBuffers.Test/TextFormatTest.cs
+++ b/src/ProtocolBuffers.Test/TextFormatTest.cs
@@ -41,17 +41,14 @@ using Google.ProtocolBuffers.TestProtos;
 using Microsoft.VisualStudio.TestTools.UnitTesting;

 using System.Globalization;

 using System.Threading;

-#if !SILVERLIGHT && !COMPACT_FRAMEWORK

 

 namespace Google.ProtocolBuffers

 {

     [TestClass]

     public class TextFormatTest

     {

-        private static readonly string AllFieldsSetText = TestUtil.ReadTextFromFile("text_format_unittest_data.txt");

-

-        private static readonly string AllExtensionsSetText =

-            TestUtil.ReadTextFromFile("text_format_unittest_extensions_data.txt");

+        private static readonly string AllFieldsSetText = TestResources.text_format_unittest_data;

+        private static readonly string AllExtensionsSetText = TestResources.text_format_unittest_extensions_data;

 

         /// <summary>

         /// Note that this is slightly different to the Java - 123.0 becomes 123, and 1.23E17 becomes 1.23E+17.

@@ -572,5 +569,4 @@ namespace Google.ProtocolBuffers
             Assert.AreEqual(longText, builder.OptionalString);

         }

     }

-}

-#endif
\ No newline at end of file
+}
\ No newline at end of file