Merge branch 'v2.5' into monoorigin/mono

Conflicts:
	src/DotNetOpenId/Properties/AssemblyInfo.cs
	src/DotNetOpenId/RelyingParty/AuthenticationResponse.cs

5 files changed, 220 insertions, 0 deletions

diff --git a/tools/NUnit/doc/files/QuickStart.Spanish.doc b/tools/NUnit/doc/files/QuickStart.Spanish.doc
new file mode 100644
index 0000000..b60a15a
--- /dev/null
+++ b/tools/NUnit/doc/files/QuickStart.Spanish.doc
diff --git a/tools/NUnit/doc/files/QuickStart.doc b/tools/NUnit/doc/files/QuickStart.doc
new file mode 100644
index 0000000..d92ad94
--- /dev/null
+++ b/tools/NUnit/doc/files/QuickStart.doc
diff --git a/tools/NUnit/doc/files/Results.xsd b/tools/NUnit/doc/files/Results.xsd
new file mode 100644
index 0000000..6d3d77b
--- /dev/null
+++ b/tools/NUnit/doc/files/Results.xsd
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" ?>

+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">

+	<xs:complexType name="failureType">

+		<xs:sequence>

+			<xs:element ref="message" />

+			<xs:element ref="stack-trace" />

+		</xs:sequence>

+	</xs:complexType>

+	<xs:complexType name="reasonType">

+		<xs:sequence>

+			<xs:element ref="message" />

+		</xs:sequence>

+	</xs:complexType>

+	<xs:element name="message" type="xs:string" />

+	<xs:complexType name="resultsType">

+		<xs:choice>

+			<xs:element name="test-suite" type="test-suiteType" maxOccurs="unbounded" />

+			<xs:element name="test-case" type="test-caseType" maxOccurs="unbounded" minOccurs="0" />

+		</xs:choice>

+	</xs:complexType>

+	<xs:element name="stack-trace" type="xs:string" />

+	<xs:element name="test-results" type="resultType" />

+	<xs:complexType name="categoriesType">

+		<xs:sequence>

+			<xs:element name="category" type="categoryType" maxOccurs="unbounded" minOccurs="1"/>

+		</xs:sequence>

+	</xs:complexType>

+	<xs:complexType name="categoryType">

+		<xs:attribute name="name" type="xs:string" use="required"/>

+	</xs:complexType>

+	<xs:complexType name="resultType">

+		<xs:sequence>

+			<xs:element name="test-suite" type="test-suiteType" />

+		</xs:sequence>

+		<xs:attribute name="name" type="xs:string" use="required" />

+		<xs:attribute name="total" type="xs:decimal" use="required" />

+		<xs:attribute name="failures" type="xs:decimal" use="required" />

+		<xs:attribute name="not-run" type="xs:decimal" use="required" />

+		<xs:attribute name="date" type="xs:string" use="required" />

+		<xs:attribute name="time" type="xs:string" use="required" />

+	</xs:complexType>

+	<xs:complexType name="test-caseType">

+		<xs:sequence>

+			<xs:element name="categories" type="categoriesType" minOccurs="0" maxOccurs="1" />

+			<xs:choice>

+				<xs:element name="failure" type="failureType" minOccurs="0" />

+				<xs:element name="reason" type="reasonType" minOccurs="0" />

+			</xs:choice>

+		</xs:sequence>

+			

+		<xs:attribute name="name" type="xs:string" use="required" />

+		<xs:attribute name="description" type="xs:string" use="optional" />

+		<xs:attribute name="success" type="xs:string" use="optional" />

+		<xs:attribute name="time" type="xs:string" use="optional" />

+		<xs:attribute name="executed" type="xs:string" use="required" />

+		<xs:attribute name="asserts" type="xs:string" use="optional" />

+	</xs:complexType>

+	<xs:complexType name="test-suiteType">

+		<xs:sequence>

+			<xs:element name="categories" type="categoriesType" minOccurs="0" maxOccurs="1" />

+			<xs:element name="results" type="resultsType" />

+		</xs:sequence>

+		<xs:attribute name="name" type="xs:string" use="required" />

+		<xs:attribute name="description" type="xs:string" use="optional" />

+		<xs:attribute name="success" type="xs:string" use="required" />

+		<xs:attribute name="time" type="xs:string" use="required" />

+		<xs:attribute name="asserts" type="xs:string" use="optional" />

+	</xs:complexType>

+

+</xs:schema>
\ No newline at end of file
diff --git a/tools/NUnit/doc/files/Summary.xslt b/tools/NUnit/doc/files/Summary.xslt
new file mode 100644
index 0000000..675ff5e
--- /dev/null
+++ b/tools/NUnit/doc/files/Summary.xslt
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" ?>

+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

+<xsl:output method='text'/>

+

+<xsl:template match="/">

+	<xsl:apply-templates/>

+</xsl:template>

+

+<xsl:template match="test-results">

+<xsl:text>Tests run: </xsl:text>

+<xsl:value-of select="@total"/>

+<xsl:text>, Failures: </xsl:text>

+<xsl:value-of select="@failures"/>

+<xsl:text>, Not run: </xsl:text>

+<xsl:value-of select="@not-run"/>

+<xsl:text>, Time: </xsl:text>

+<xsl:value-of select="test-suite/@time"/>

+<xsl:text> seconds

+</xsl:text>

+<xsl:text>

+</xsl:text>

+

+<xsl:if test="//test-case[failure]"><xsl:text>Failures:

+</xsl:text></xsl:if>

+<xsl:apply-templates select="//test-case[failure]"/>

+<xsl:if test="//test-case[@executed='False']"><xsl:text>Tests not run:

+</xsl:text></xsl:if>

+<xsl:apply-templates select="//test-case[@executed='False']"/>

+<xsl:text disable-output-escaping='yes'>&#xD;&#xA;</xsl:text>

+</xsl:template>

+

+<xsl:template match="test-case">

+	<xsl:value-of select="position()"/><xsl:text>) </xsl:text>

+	<xsl:value-of select="@name"/>

+	<xsl:text> : </xsl:text>

+	<xsl:value-of select="child::node()/message"/>

+<xsl:text disable-output-escaping='yes'>&#xD;&#xA;</xsl:text>

+	<xsl:if test="failure">

+		<xsl:value-of select="failure/stack-trace"/>

+<xsl:text>

+</xsl:text>

+	</xsl:if>

+</xsl:template>

+

+</xsl:stylesheet>

+

+  
\ No newline at end of file
diff --git a/tools/NUnit/doc/files/TestResult.xml b/tools/NUnit/doc/files/TestResult.xml
new file mode 100644
index 0000000..127a66e
--- /dev/null
+++ b/tools/NUnit/doc/files/TestResult.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>

+<!--This file represents the results of running a test suite-->

+<test-results name="C:\Program Files\NUnit 2.2.8\bin\mock-assembly.dll" total="5" failures="0" not-run="6" date="2006-04-22" time="12:47:24">

+  <environment nunit-version="2.2.8.0" clr-version="1.1.4322.2032" os-version="Microsoft Windows NT 5.1.2600.0" platform="Win32NT" cwd="C:\Program Files\NUnit 2.2.8\bin" machine-name="FERRARI" user="Charlie" user-domain="FERRARI" />

+  <culture-info current-culture="en-US" current-uiculture="en-US" />

+  <test-suite name="C:\Program Files\NUnit 2.2.8\bin\mock-assembly.dll" success="True" time="0.016" asserts="0">

+    <results>

+      <test-suite name="C:\Program Files\NUnit 2.2.8\bin\mock-assembly.dll" success="True" time="0.000" asserts="0">

+        <results>

+          <test-suite name="NUnit" success="True" time="0.000" asserts="0">

+            <results>

+              <test-suite name="NUnit.Tests" success="True" time="0.000" asserts="0">

+                <results>

+                  <test-suite name="NUnit.Tests.Assemblies" success="True" time="0.000" asserts="0">

+                    <results>

+                      <test-suite name="NUnit.Tests.Assemblies.MockTestFixture" description="Fake Test Fixture" success="True" time="0.000" asserts="0">

+                        <categories>

+                          <category name="FixtureCategory" />

+                        </categories>

+                        <results>

+                          <test-case name="NUnit.Tests.Assemblies.MockTestFixture.ExplicitlyRunTest" executed="False">

+                            <categories>

+                              <category name="Special" />

+                            </categories>

+                            <reason>

+                              <message><![CDATA[Explicit selection required]]></message>

+                            </reason>

+                          </test-case>

+                          <test-case name="NUnit.Tests.Assemblies.MockTestFixture.MockTest1" description="Mock Test #1" executed="True" success="True" time="0.000" asserts="0" />

+                          <test-case name="NUnit.Tests.Assemblies.MockTestFixture.MockTest2" executed="True" success="True" time="0.000" asserts="0">

+                            <categories>

+                              <category name="MockCategory" />

+                            </categories>

+                          </test-case>

+                          <test-case name="NUnit.Tests.Assemblies.MockTestFixture.MockTest3" executed="True" success="True" time="0.000" asserts="0">

+                            <categories>

+                              <category name="MockCategory" />

+                              <category name="AnotherCategory" />

+                            </categories>

+                          </test-case>

+                          <test-case name="NUnit.Tests.Assemblies.MockTestFixture.MockTest4" executed="False">

+                            <categories>

+                              <category name="Foo" />

+                            </categories>

+                            <reason>

+                              <message><![CDATA[ignoring this test method for now]]></message>

+                            </reason>

+                          </test-case>

+                          <test-case name="NUnit.Tests.Assemblies.MockTestFixture.MockTest5" executed="False">

+                            <reason>

+                              <message><![CDATA[Method MockTest5's signature is not correct: it must be a public method.]]></message>

+                            </reason>

+                          </test-case>

+                        </results>

+                      </test-suite>

+                    </results>

+                  </test-suite>

+                  <test-suite name="NUnit.Tests.IgnoredFixture" success="True" time="0.000" asserts="0">

+                    <results>

+                      <test-case name="NUnit.Tests.IgnoredFixture.Test1" executed="False">

+                        <reason>

+                          <message><![CDATA[]]></message>

+                        </reason>

+                      </test-case>

+                      <test-case name="NUnit.Tests.IgnoredFixture.Test2" executed="False">

+                        <reason>

+                          <message><![CDATA[]]></message>

+                        </reason>

+                      </test-case>

+                      <test-case name="NUnit.Tests.IgnoredFixture.Test3" executed="False">

+                        <reason>

+                          <message><![CDATA[]]></message>

+                        </reason>

+                      </test-case>

+                    </results>

+                  </test-suite>

+                  <test-suite name="NUnit.Tests.Singletons" success="True" time="0.000" asserts="0">

+                    <results>

+                      <test-suite name="NUnit.Tests.Singletons.OneTestCase" success="True" time="0.000" asserts="0">

+                        <results>

+                          <test-case name="NUnit.Tests.Singletons.OneTestCase.TestCase" executed="True" success="True" time="0.000" asserts="0" />

+                        </results>

+                      </test-suite>

+                    </results>

+                  </test-suite>

+                  <test-suite name="NUnit.Tests.TestAssembly" success="True" time="0.000" asserts="0">

+                    <results>

+                      <test-suite name="NUnit.Tests.TestAssembly.MockTestFixture" success="True" time="0.000" asserts="0">

+                        <results>

+                          <test-case name="NUnit.Tests.TestAssembly.MockTestFixture.MyTest" executed="True" success="True" time="0.000" asserts="0" />

+                        </results>

+                      </test-suite>

+                    </results>

+                  </test-suite>

+                </results>

+              </test-suite>

+            </results>

+          </test-suite>

+        </results>

+      </test-suite>

+    </results>

+  </test-suite>

+</test-results>
\ No newline at end of file