Implement XamlBackgroundReader.
authorAtsushi Eno <atsushi@ximian.com>
Wed, 12 Jan 2011 07:49:38 +0000 (16:49 +0900)
committerAtsushi Eno <atsushi@ximian.com>
Wed, 12 Jan 2011 07:49:38 +0000 (16:49 +0900)
mcs/class/System.Xaml/System.Xaml/XamlBackgroundReader.cs
mcs/class/System.Xaml/System.Xaml_test.dll.sources
mcs/class/System.Xaml/Test/System.Xaml/XamlBackgroundReaderTest.cs [new file with mode: 0644]

index eea71752f18c7c6587c831a9aaab3c095c258f07..1473deda55bc6ff8240d01d22f9288597ce9778b 100644 (file)
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2010 Novell Inc. http://novell.com
+// Copyright (C) 2011 Novell Inc. http://novell.com
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -22,6 +22,7 @@
 //
 using System;
 using System.Collections.Generic;
+using System.Threading;
 
 namespace System.Xaml
 {
@@ -29,58 +30,90 @@ namespace System.Xaml
        {
                public XamlBackgroundReader (XamlReader wrappedReader)
                {
-                       throw new NotImplementedException ();
+                       if (wrappedReader == null)
+                               throw new ArgumentNullException ("wrappedReader");
+                       r = wrappedReader;
+                       q = new XamlNodeQueue (r.SchemaContext);
                }
                
+               Thread thread;
+               XamlReader r;
+               XamlNodeQueue q;
+               bool read_all_done, do_work = true;
+               ManualResetEvent wait = new ManualResetEvent (true);
+
+               [MonoTODO ("always returns false")]
                public bool HasLineInfo {
-                       get { throw new NotImplementedException (); }
+                       get { return false; }
                }
+               
                public override bool IsEof {
-                       get { throw new NotImplementedException (); }
+                       get { return read_all_done && q.IsEmpty; }
                }
+               
+               [MonoTODO ("always returns 0")]
                public int LineNumber {
-                       get { throw new NotImplementedException (); }
+                       get { return 0; }
                }
+               
+               [MonoTODO ("always returns 0")]
                public int LinePosition {
-                       get { throw new NotImplementedException (); }
+                       get { return 0; }
                }
+               
                public override XamlMember Member {
-                       get { throw new NotImplementedException (); }
+                       get { return q.Reader.Member; }
                }
+               
                public override NamespaceDeclaration Namespace {
-                       get { throw new NotImplementedException (); }
+                       get { return q.Reader.Namespace; }
                }
+               
                public override XamlNodeType NodeType {
-                       get { throw new NotImplementedException (); }
+                       get { return q.Reader.NodeType; }
                }
+               
                public override XamlSchemaContext SchemaContext {
-                       get { throw new NotImplementedException (); }
+                       get { return q.Reader.SchemaContext; }
                }
+               
                public override XamlType Type {
-                       get { throw new NotImplementedException (); }
+                       get { return q.Reader.Type; }
                }
+               
                public override object Value {
-                       get { throw new NotImplementedException (); }
+                       get { return q.Reader.Value; }
                }
 
                protected override void Dispose (bool disposing)
                {
-                       throw new NotImplementedException ();
+                       do_work = false;
                }
                
                public override bool Read ()
                {
-                       throw new NotImplementedException ();
+                       if (q.IsEmpty)
+                               wait.WaitOne ();
+                       return q.Reader.Read ();
                }
                
                public void StartThread ()
                {
-                       throw new NotImplementedException ();
+                       StartThread ("XAML reader thread"); // documented name
                }
                
                public void StartThread (string threadName)
                {
-                       throw new NotImplementedException ();
+                       if (thread != null)
+                               throw new InvalidOperationException ("Thread has already started");
+                       thread = new Thread (new ParameterizedThreadStart (delegate {
+                               while (do_work && r.Read ()) {
+                                       q.Writer.WriteNode (r);
+                                       wait.Set ();
+                               }
+                               read_all_done = true;
+                       })) { Name = threadName };
+                       thread.Start ();
                }
        }
 }
index 79e618f8ecba2eba192b9dc166075bde104615c6..884e9e77a4757c6b80743ba3effccd7aa2c4dc19 100644 (file)
@@ -17,6 +17,7 @@ System.Xaml/DummyValueSerializerContext.cs
 System.Xaml/NamespaceDeclarationTest.cs
 System.Xaml/TestedTypes.cs
 System.Xaml/ValueSerializerContextTest.cs
+System.Xaml/XamlBackgroundReaderTest.cs
 System.Xaml/XamlDirectiveTest.cs
 System.Xaml/XamlDuplicateMemberExceptionTest.cs
 System.Xaml/XamlLanguageTest.cs
diff --git a/mcs/class/System.Xaml/Test/System.Xaml/XamlBackgroundReaderTest.cs b/mcs/class/System.Xaml/Test/System.Xaml/XamlBackgroundReaderTest.cs
new file mode 100644 (file)
index 0000000..5f40fe5
--- /dev/null
@@ -0,0 +1,110 @@
+//
+// Copyright (C) 2010 Novell Inc. http://novell.com
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Windows.Markup;
+using System.Xaml;
+using System.Xaml.Schema;
+using System.Xml;
+using NUnit.Framework;
+
+using CategoryAttribute = NUnit.Framework.CategoryAttribute;
+
+namespace MonoTests.System.Xaml
+{
+       [TestFixture]
+       public partial class XamlBackgroundReaderTest : XamlReaderTestBase
+       {
+               XamlReader GetReader (string filename)
+               {
+                       return new XamlXmlReader (XmlReader.Create (Path.Combine ("Test/XmlFiles", filename), new XmlReaderSettings () { CloseInput =true }));
+               }
+
+               void ReadTest (string filename)
+               {
+                       var r = new XamlBackgroundReader (GetReader (filename));
+                       r.StartThread ();
+                       while (!r.IsEof)
+                               r.Read ();
+               }
+
+               [Test]
+               public void Read_Int32 ()
+               {
+                       ReadTest ("Int32.xml");
+               }
+
+               [Test]
+               public void Read_DateTime ()
+               {
+                       ReadTest ("DateTime.xml");
+               }
+
+               [Test]
+               public void Read_TimeSpan ()
+               {
+                       ReadTest ("TimeSpan.xml");
+               }
+
+               [Test]
+               public void Read_ArrayInt32 ()
+               {
+                       ReadTest ("Array_Int32.xml");
+               }
+
+               [Test]
+               public void Read_DictionaryInt32String ()
+               {
+                       ReadTest ("Dictionary_Int32_String.xml");
+               }
+
+               [Test]
+               public void Read_DictionaryStringType ()
+               {
+                       ReadTest ("Dictionary_String_Type.xml");
+               }
+
+               [Test]
+               public void Read_SilverlightApp1 ()
+               {
+                       ReadTest ("SilverlightApp1.xaml");
+               }
+
+               [Test]
+               public void Read_Guid ()
+               {
+                       ReadTest ("Guid.xml");
+               }
+
+               [Test]
+               public void Read_GuidFactoryMethod ()
+               {
+                       ReadTest ("GuidFactoryMethod.xml");
+               }
+       }
+}