diff options
| author | Jon Hanna <jon@hackcraft.net> | 2017-02-17 21:31:00 +0300 |
|---|---|---|
| committer | Stephen Toub <stoub@microsoft.com> | 2017-02-17 21:31:00 +0300 |
| commit | f0ccd9742065ee2aa296448fe3dd38ef6ff77af9 (patch) | |
| tree | 2d0dc4a505cfdbb0a2125fa7df241c034d95dcb2 /src/System.Private.Xml.Linq | |
| parent | e7574660aa3257baccaf5a612dde7f0b9268ffe9 (diff) | |
Fix several typos (#16264)
* Fix several typos
coment → comment
rangecheck → range check
testcase → test case
deffer → defer
everytime → every time
whitespaces → whitespace (whitespace is uncountable)
white space → whitespace
white spaces → whitespace
the the → the
a → a
nametest → name test
scaned → scanned
and and → and
undecision → indecision
are no whitespace → is no whitespace
Whidbey casing
Everett casing
unkown → unknown
messsage → message
mesage → message
mesasage → message
publically → publicly (publically is attested but questionable).
exceptionto → exception to
mutatable → mutable
implemention → implementation
hadnt → hadn't
couldnt → couldn't
wouldnt → wouldn't
wont → won't
isntead → instead
preocessor → processor
particural → particular
interations → iterations
enterying → entering
stoppped → stopped
stoped → stopped
verication → verification
compuatation → computation
revisisted → revisited
partioner → partitioner
lock'ed → locked
table'd → table would
hashtable'ed → hashtabled (still coining, but tabled is analogous)
intialize → initialize
calcuate → calculate
perfom → perform
performr → perform
matthing → matching
corect → correct
thorw → throw
supress → suppress
reqeust → request
mutliple → multiple
ot → to
trival → trivial
upto → up to
specfices → specifies
patttern → pattern
descrepancy → discrepancy
explict → explicit
implict → implicit
usign → using
non-sensical → nonsensical
contination → continuation
producs → products
childred → children
parametr → parameter
approriate → appropriate
insted → instead
expection → exception
successsfully → successfully
funtion → function
unqiue → unique
apparant → apparent
expception → exception
conatined → contained
apssed → passed
propogate → propagate
cutoms → custom
currrent → current
curent → current
concurent → concurrent
coplted → completed
unexcepted → Unexpected (where the latter seems more appropriate)
to to → to
abd → and
refence → reference
particiant → participant
cuurrent → current
extratc → extract
cparticipant → participant
ehich → which
choosen → chosen
mske → make
alread → already
aquire → acquire
droppping → dropping
intial → initial
tru → true
aprticipant → participant
excption → exception
sempahore → semaphore
fileds → fields
threashold → threshold
duting → during
didnt → didn't
atribute → attribute
serliazation → serialization
localy → locally
channge → change
prperties → properties
attrbute → attribute
sentinal → sentinel
shoukd → should
existant → existent
commnent → comment
expeted → expected
propert → property
commnet → comment
datat → data
ther → the
mach → match
inhertiance → inheritance
convience → convenience
completley → completely
otheriwse → otherwise
actuall → actual
inefficent → inefficient
defalut → default
comparsion → comparison
charcters → characters
postion → position
aleady → already
charater → character
incosistent → inconsistent
seperate → separate
veify → verify
currentlly → currently
corect → correct
betwwen → between
omiting → omitting
readr → reader
compae → compare
allways → always
thown → thrown
with with → with
usecase → use case
avare → aware
lexem → lexeme
grammer → grammar
oposite → opposite
overrided → overridden
everithig → everything
chages → changes
memeber → member
proerties → properties
identifer → identifier
doesnot → does not
deriaved → derived
varialble → variable
* defered -> deferred
* Revert changes within clrcompression.
* Revert underreach → under-reach
* Fix casing broken while fixing spelling.
* Use type name instead of "Diagnostic sources"
Diffstat (limited to 'src/System.Private.Xml.Linq')
45 files changed, 166 insertions, 166 deletions
diff --git a/src/System.Private.Xml.Linq/src/Resources/Strings.resx b/src/System.Private.Xml.Linq/src/Resources/Strings.resx index 67c598e163..985db75a66 100644 --- a/src/System.Private.Xml.Linq/src/Resources/Strings.resx +++ b/src/System.Private.Xml.Linq/src/Resources/Strings.resx @@ -124,7 +124,7 @@ <value>A node of type {0} cannot be added to content.</value> </data> <data name="Argument_AddNonWhitespace" xml:space="preserve"> - <value>Non white space characters cannot be added to content.</value> + <value>Non-whitespace characters cannot be added to content.</value> </data> <data name="Argument_ConvertToString" xml:space="preserve"> <value>The argument cannot be converted to a string.</value> @@ -210,4 +210,4 @@ <data name="NotSupported_MoveToId" xml:space="preserve"> <value>This XPathNavigator does not support IDs.</value> </data> -</root>
\ No newline at end of file +</root> diff --git a/src/System.Private.Xml.Linq/tests/Properties/DeepEquals.cs b/src/System.Private.Xml.Linq/tests/Properties/DeepEquals.cs index 21cd99693a..000ccfb343 100644 --- a/src/System.Private.Xml.Linq/tests/Properties/DeepEquals.cs +++ b/src/System.Private.Xml.Linq/tests/Properties/DeepEquals.cs @@ -63,8 +63,8 @@ namespace System.Xml.Linq.Tests [InlineData("AAAAP", "AAAAQ", false)] // not equals, hashconflict [InlineData("AAAAP", "AAAAP", true)] // equals - [InlineData(" ", " ", false)] // Whitespaces (negative) - [InlineData(" ", " ", true)] // Whitespaces + [InlineData(" ", " ", false)] // Whitespace (negative) + [InlineData(" ", " ", true)] // Whitespace [InlineData("", "", true)] // Empty [Theory] public void Comment(string value1, string value2, bool checkHashCode) @@ -96,8 +96,8 @@ namespace System.Xml.Linq.Tests [InlineData("same", "different", false)] // different [InlineData("same", "same", true)] // same [InlineData("", "", true)] // Empty - [InlineData(" ", " ", true)] // Whitespaces - [InlineData("\n", " ", false)] // Whitespaces (negative) + [InlineData(" ", " ", true)] // Whitespace + [InlineData("\n", " ", false)] // Whitespace (negative) [Theory] public void Text(string value1, string value2, bool checkHashCode) { @@ -113,8 +113,8 @@ namespace System.Xml.Linq.Tests [InlineData("same", "different", false)] // different [InlineData("same", "same", true)] // same [InlineData("", "", true)] // Empty - [InlineData(" ", " ", true)] // Whitespaces - [InlineData("\n", " ", false)] // Whitespaces (negative) + [InlineData(" ", " ", true)] // Whitespace + [InlineData("\n", " ", false)] // Whitespace (negative) [Theory] public void CData(string value1, string value2, bool checkHashCode) { @@ -157,13 +157,13 @@ namespace System.Xml.Linq.Tests } [InlineData("<A/>", "<A></A>", false)] // smoke - [InlineData("<A/>", "<A Id='a'/>", false)] // atribute missing - [InlineData("<A Id='a'/>", "<A Id='a'/>", true)] // atributes - [InlineData("<A at='1' Id='a'/>", "<A Id='a' at='1'/>", false)] // atributes (same, different order) - [InlineData("<A at='1' Id='a'/>", "<A at='1' Id='a'/>", true)] // atributes (same, same order) - [InlineData("<A at='1' Id='a'/>", "<A at='1' Id='ab'/>", false)] // atributes (same, same order, different value) - [InlineData("<A p:at='1' xmlns:p='nsp'/>", "<A p:at='1' xmlns:p='nsp'/>", true)] // atributes (same, same order, namespace decl) - [InlineData("<A p:at='1' xmlns:p='nsp'/>", "<A q:at='1' xmlns:q='nsp'/>", false)] // atributes (same, same order, namespace decl, different prefix) + [InlineData("<A/>", "<A Id='a'/>", false)] // attribute missing + [InlineData("<A Id='a'/>", "<A Id='a'/>", true)] // attributes + [InlineData("<A at='1' Id='a'/>", "<A Id='a' at='1'/>", false)] // attributes (same, different order) + [InlineData("<A at='1' Id='a'/>", "<A at='1' Id='a'/>", true)] // attributes (same, same order) + [InlineData("<A at='1' Id='a'/>", "<A at='1' Id='ab'/>", false)] // attributes (same, same order, different value) + [InlineData("<A p:at='1' xmlns:p='nsp'/>", "<A p:at='1' xmlns:p='nsp'/>", true)] // attributes (same, same order, namespace decl) + [InlineData("<A p:at='1' xmlns:p='nsp'/>", "<A q:at='1' xmlns:q='nsp'/>", false)] // attributes (same, same order, namespace decl, different prefix) [InlineData("<A>text</A>", "<A>text</A>", true)] // String content [InlineData("<A>text<?PI click?></A>", "<A><?PI click?>text</A>", false)] // String + PI content (negative) [InlineData("<A>text<?PI click?></A>", "<A>text<?PI click?></A>", true)] // String + PI content diff --git a/src/System.Private.Xml.Linq/tests/Properties/FunctionalTests.cs b/src/System.Private.Xml.Linq/tests/Properties/FunctionalTests.cs index fc51f5bcbe..a7297b63e5 100644 --- a/src/System.Private.Xml.Linq/tests/Properties/FunctionalTests.cs +++ b/src/System.Private.Xml.Linq/tests/Properties/FunctionalTests.cs @@ -102,7 +102,7 @@ namespace CoreXml.Test.XLinq this.AddChild(new TestVariation(SmokeTest) { Attribute = new VariationAttribute("GET: Mixed content") { Params = new object[] { "<X>t0<A>t1<B/><B xmlns='a'><![CDATA[t2]]></B><C>t3</C></A>t00</X>" }, Priority = 0 } }); this.AddChild(new TestVariation(SmokeTest) { Attribute = new VariationAttribute("GET: Mixed content - empty CDATA") { Params = new object[] { "<X>t0<A>t1<B/><B xmlns='a'><![CDATA[]]></B><C>t3</C></A>t00</X>" }, Priority = 1 } }); this.AddChild(new TestVariation(SmokeTest) { Attribute = new VariationAttribute("GET: Mixed content - empty XText") { Params = new object[] { "<X>t0<A>t1<B/><B xmlns='a'><![CDATA[]]></B><C></C></A>t00</X>" }, Priority = 1 } }); - this.AddChild(new TestVariation(SmokeTest) { Attribute = new VariationAttribute("GET: Mixed content - whitespaces") { Params = new object[] { "<X>t0<A>t1\n<B/><B xmlns='a'>\t<![CDATA[]]> </B>\n<C></C></A>t00</X>" }, Priority = 1 } }); + this.AddChild(new TestVariation(SmokeTest) { Attribute = new VariationAttribute("GET: Mixed content - whitespace") { Params = new object[] { "<X>t0<A>t1\n<B/><B xmlns='a'>\t<![CDATA[]]> </B>\n<C></C></A>t00</X>" }, Priority = 1 } }); this.AddChild(new TestVariation(SmokeTest) { Attribute = new VariationAttribute("GET: Mixed content - no text nodes") { Params = new object[] { "<X>t0<A Id='a0'><B/><B xmlns='a'><?Pi c?></B><!--commm--><C></C></A>t00</X>" }, Priority = 1 } }); this.AddChild(new TestVariation(SmokeTest) { Attribute = new VariationAttribute("GET: Empty string node") { Params = new object[] { "<X>t0<A></A>t00</X>" }, Priority = 0 } }); this.AddChild(new TestVariation(APIModified1) { Attribute = new VariationAttribute("GET: Adjacent text nodes II.") { Params = new object[] { "<X>t0<A xmlns:p='p'>truck<p:Y/></A>t00</X>" }, Priority = 1 } }); diff --git a/src/System.Private.Xml.Linq/tests/Properties/ImplicitConversionsRoundTrip.cs b/src/System.Private.Xml.Linq/tests/Properties/ImplicitConversionsRoundTrip.cs index de88fff8b0..54d62d6e12 100644 --- a/src/System.Private.Xml.Linq/tests/Properties/ImplicitConversionsRoundTrip.cs +++ b/src/System.Private.Xml.Linq/tests/Properties/ImplicitConversionsRoundTrip.cs @@ -287,7 +287,7 @@ namespace CoreXml.Test.XLinq foreach (object o in _data) { string desc = o.GetType().ToString() + " : "; - // On Arabic locale DateTime and DateTimeOffset types threw on serliazation if the date was + // On Arabic locale DateTime and DateTimeOffset types threw on serialization if the date was // too big for the Arabic calendar if (o is DateTime) desc += ((DateTime)o).ToString(CultureInfo.InvariantCulture); @@ -305,7 +305,7 @@ namespace CoreXml.Test.XLinq foreach (object o in _data) { string desc = o.GetType().ToString() + " : "; - // On Arabic locale DateTime and DateTimeOffset types threw on serliazation if the date was + // On Arabic locale DateTime and DateTimeOffset types threw on serialization if the date was // too big for the Arabic calendar if (o is DateTime) desc += ((DateTime)o).ToString(CultureInfo.InvariantCulture); diff --git a/src/System.Private.Xml.Linq/tests/Properties/NamespaceAccessors.cs b/src/System.Private.Xml.Linq/tests/Properties/NamespaceAccessors.cs index c464684380..d1a09f7060 100644 --- a/src/System.Private.Xml.Linq/tests/Properties/NamespaceAccessors.cs +++ b/src/System.Private.Xml.Linq/tests/Properties/NamespaceAccessors.cs @@ -136,7 +136,7 @@ namespace System.Xml.Linq.Tests // ~ Not declared namespace // ~ Default namespace // ~ Namespace defined - // ~ localy + // ~ locally // ~ on parent (in scope) // ~ redefined // ~ Null, String.Empty @@ -186,7 +186,7 @@ namespace System.Xml.Linq.Tests Assert.Equal("b", b2.GetPrefixOfNamespace("nsA")); // original value b2.Attribute(XNamespace.Xmlns + "b").Value = "nsNEW"; - Assert.Equal("b", b2.GetPrefixOfNamespace("nsNEW")); // value channge + Assert.Equal("b", b2.GetPrefixOfNamespace("nsNEW")); // value change b2.Attribute(XNamespace.Xmlns + "b").Remove(); Assert.Equal("p", b2.GetPrefixOfNamespace("nsA")); // removed value, take one from parent diff --git a/src/System.Private.Xml.Linq/tests/Properties/XElement_Value.cs b/src/System.Private.Xml.Linq/tests/Properties/XElement_Value.cs index c5a082a709..45a3e755b0 100644 --- a/src/System.Private.Xml.Linq/tests/Properties/XElement_Value.cs +++ b/src/System.Private.Xml.Linq/tests/Properties/XElement_Value.cs @@ -185,7 +185,7 @@ namespace CoreXml.Test.XLinq //[Variation(Priority = 0, Desc = "GET: Mixed content", Params = new object[] { "<X>t0<A>t1<B/><B xmlns='a'><![CDATA[t2]]></B><C>t3</C></A>t00</X>" })] //[Variation(Priority = 1, Desc = "GET: Mixed content - empty CDATA", Params = new object[] { "<X>t0<A>t1<B/><B xmlns='a'><![CDATA[]]></B><C>t3</C></A>t00</X>" })] //[Variation(Priority = 1, Desc = "GET: Mixed content - empty XText", Params = new object[] { "<X>t0<A>t1<B/><B xmlns='a'><![CDATA[]]></B><C></C></A>t00</X>" })] - //[Variation(Priority = 1, Desc = "GET: Mixed content - whitespaces", Params = new object[] { "<X>t0<A>t1\n<B/><B xmlns='a'>\t<![CDATA[]]> </B>\n<C></C></A>t00</X>" })] + //[Variation(Priority = 1, Desc = "GET: Mixed content - whitespace", Params = new object[] { "<X>t0<A>t1\n<B/><B xmlns='a'>\t<![CDATA[]]> </B>\n<C></C></A>t00</X>" })] //[Variation(Priority = 1, Desc = "GET: Mixed content - no text nodes", Params = new object[] { "<X>t0<A Id='a0'><B/><B xmlns='a'><?Pi c?></B><!--commm--><C></C></A>t00</X>" })] //[Variation(Priority = 0, Desc = "GET: Empty string node", Params = new object[] { "<X>t0<A></A>t00</X>" })] //[Variation(Priority = 0, Desc = "GET: Empty string node", Params = new object[] { "<X>t0<A/>t00</X>" })] @@ -292,7 +292,7 @@ namespace CoreXml.Test.XLinq // ~ set null // ~ set empty string // ~ set string - // :: verify the replaced nodes prperties, node content, node value + // :: verify the replaced nodes properties, node content, node value // ~ replace: // ~ no content // ~ empty string diff --git a/src/System.Private.Xml.Linq/tests/SDMSample/SDMContainer.cs b/src/System.Private.Xml.Linq/tests/SDMSample/SDMContainer.cs index e0e93fc597..ce0d6ade93 100644 --- a/src/System.Private.Xml.Linq/tests/SDMSample/SDMContainer.cs +++ b/src/System.Private.Xml.Linq/tests/SDMSample/SDMContainer.cs @@ -25,7 +25,7 @@ namespace XDocumentTests.SDMSample element.Add(null); Assert.Empty(element.Nodes()); - // Add node, attrbute, string, some other value, and an IEnumerable. + // Add node, attribute, string, some other value, and an IEnumerable. XComment comment = new XComment("this is a comment"); XComment comment2 = new XComment("this is a comment 2"); XComment comment3 = new XComment("this is a comment 3"); @@ -103,7 +103,7 @@ namespace XDocumentTests.SDMSample element.AddFirst(null); Assert.Empty(element.Nodes()); - // Add a sentinal value. + // Add a sentinel value. XText text = new XText("abcd"); element.AddFirst(text); diff --git a/src/System.Private.Xml.Linq/tests/SDMSample/SDMElement.cs b/src/System.Private.Xml.Linq/tests/SDMSample/SDMElement.cs index 64b0351b67..a5ac9fcc4c 100644 --- a/src/System.Private.Xml.Linq/tests/SDMSample/SDMElement.cs +++ b/src/System.Private.Xml.Linq/tests/SDMSample/SDMElement.cs @@ -93,7 +93,7 @@ namespace XDocumentTests.SDMSample Assert.Empty(elementCopy.Attributes()); - // Hsh codes of equal elements shoukd be equal. + // Hsh codes of equal elements should be equal. Assert.Equal(XNode.EqualityComparer.GetHashCode(element), XNode.EqualityComparer.GetHashCode(elementCopy)); // Null element is not allowed. @@ -658,11 +658,11 @@ namespace XDocumentTests.SDMSample e2.RemoveAttributes(); Assert.Empty(e2.Attributes()); - // Removal of non-existant attribute + // Removal of non-existent attribute e1.SetAttributeValue("foo", null); Assert.Empty(e1.Attributes()); - // Add of non-existant attribute + // Add of non-existent attribute e1.SetAttributeValue("foo", "foo-value"); Assert.Equal(e1.Attribute("foo").Name.ToString(), "foo"); Assert.Equal(e1.Attribute("foo").Value, "foo-value"); @@ -723,11 +723,11 @@ namespace XDocumentTests.SDMSample { XElement e1 = new XElement("x"); - // Removal of non-existant element + // Removal of non-existent element e1.SetElementValue("foo", null); Assert.Empty(e1.Elements()); - // Add of non-existant element + // Add of non-existent element e1.SetElementValue("foo", "foo-value"); Assert.Equal(new XElement[] { new XElement("foo", "foo-value") }, e1.Elements(), XNode.EqualityComparer); diff --git a/src/System.Private.Xml.Linq/tests/TreeManipulation/AddNodeAfter.cs b/src/System.Private.Xml.Linq/tests/TreeManipulation/AddNodeAfter.cs index 4832bbe69e..190af93cd6 100644 --- a/src/System.Private.Xml.Linq/tests/TreeManipulation/AddNodeAfter.cs +++ b/src/System.Private.Xml.Linq/tests/TreeManipulation/AddNodeAfter.cs @@ -46,7 +46,7 @@ namespace XLinqTests // add valid: // - first, in the middle, last - // - elem, text/XText (concatenation), PI, Commnent - for XE + // - elem, text/XText (concatenation), PI, Comment - for XE // - elem (just root), PI, Comment, XDecl/XDocType (order!) // - on other node types //[Variation(Priority = 1, Desc = "Adding multiple (4) objects into XElement - not connected", Params = new object[] { false, 4 })] diff --git a/src/System.Private.Xml.Linq/tests/TreeManipulation/FirstNode.cs b/src/System.Private.Xml.Linq/tests/TreeManipulation/FirstNode.cs index 693391cbd3..a2704eaa13 100644 --- a/src/System.Private.Xml.Linq/tests/TreeManipulation/FirstNode.cs +++ b/src/System.Private.Xml.Linq/tests/TreeManipulation/FirstNode.cs @@ -115,7 +115,7 @@ namespace XLinqTests XNode ret = ((bool)Param) ? e.FirstNode : e.LastNode; TestLog.Compare(ret is XText, "Node is XText"); - TestLog.Compare((ret as XText).Value, expValue, "Node expeted value"); + TestLog.Compare((ret as XText).Value, expValue, "Node expected value"); TestLog.Compare(ret.Parent.Equals(e), "Node.Parent"); TestLog.Compare(ret.NextNode == null, "nextnode == null"); diff --git a/src/System.Private.Xml.Linq/tests/TreeManipulation/ParamsObjectsCreationElem.cs b/src/System.Private.Xml.Linq/tests/TreeManipulation/ParamsObjectsCreationElem.cs index 26f283e205..616b4dbbd3 100644 --- a/src/System.Private.Xml.Linq/tests/TreeManipulation/ParamsObjectsCreationElem.cs +++ b/src/System.Private.Xml.Linq/tests/TreeManipulation/ParamsObjectsCreationElem.cs @@ -64,8 +64,8 @@ namespace XLinqTests AddChild(new TestVariation(XElementNotAllowedXDocType) { Attribute = new VariationAttribute("XElement - Not allowed - XDocumentType") { Param = 3, Priority = 2 } }); AddChild(new TestVariation(XElementEmptyArray) { Attribute = new VariationAttribute("XElement - nulls") { Priority = 3 } }); AddChild(new TestVariation(BuildFromQuery) { Attribute = new VariationAttribute("XElement - build from Query result") { Priority = 2 } }); - AddChild(new TestVariation(IsEmptyProp1) { Attribute = new VariationAttribute("IsEmpty propert Manipulation I.") { Priority = 0 } }); - AddChild(new TestVariation(IsEmptyProp2) { Attribute = new VariationAttribute("IsEmpty propert Manipulation II.") { Priority = 0 } }); + AddChild(new TestVariation(IsEmptyProp1) { Attribute = new VariationAttribute("IsEmpty property Manipulation I.") { Priority = 0 } }); + AddChild(new TestVariation(IsEmptyProp2) { Attribute = new VariationAttribute("IsEmpty property Manipulation II.") { Priority = 0 } }); } //[Variation(Priority = 0, Desc = "(BVT)XElement - multiple nodes, connected", Params = new object[] { true, 2 })] @@ -97,7 +97,7 @@ namespace XLinqTests TestLog.Compare(expectedAttributes.EqualAllAttributes(e.Attributes(), Helpers.MyAttributeComparer), "Attributes"); } - //[Variation(Priority = 0, Desc = "IsEmpty propert Manipulation I.")] + //[Variation(Priority = 0, Desc = "IsEmpty property Manipulation I.")] public void IsEmptyProp1() { var e = new XElement("e"); @@ -117,7 +117,7 @@ namespace XLinqTests TestLog.Compare(e.Value, "", "value 3"); } - //[Variation(Priority = 0, Desc = "IsEmpty propert Manipulation II.")] + //[Variation(Priority = 0, Desc = "IsEmpty property Manipulation II.")] public void IsEmptyProp2() { var e = new XElement("e", ""); diff --git a/src/System.Private.Xml.Linq/tests/TreeManipulation/RemoveAttributes.cs b/src/System.Private.Xml.Linq/tests/TreeManipulation/RemoveAttributes.cs index e40697b312..366cba00c4 100644 --- a/src/System.Private.Xml.Linq/tests/TreeManipulation/RemoveAttributes.cs +++ b/src/System.Private.Xml.Linq/tests/TreeManipulation/RemoveAttributes.cs @@ -28,10 +28,10 @@ namespace XLinqTests public override void AddChildren() { AddChild(new TestVariation(NoAttributes) { Attribute = new VariationAttribute("No attributes") { Priority = 1 } }); - AddChild(new TestVariation(DeleteAttributes) { Attribute = new VariationAttribute("Single attribute") { Params = new object[] { "<square wIdth='1'>text<B/><!--commnet--></square>", new[] { "wIdth" } }, Priority = 2 } }); - AddChild(new TestVariation(DeleteAttributes) { Attribute = new VariationAttribute("Default attribute from DTD") { Params = new object[] { "<!DOCTYPE square [<!ELEMENT square (B*)><!ATTLIST square wIdth CDATA '10'>]><square>text<B/><!--commnet--></square>", new[] { "wIdth" } }, Priority = 2 } }); - AddChild(new TestVariation(DeleteAttributes) { Attribute = new VariationAttribute("Single namespace") { Params = new object[] { "<p:square xmlns:p='x'>text<B/><!--commnet--></p:square>", new[] { "{http://www.w3.org/2000/xmlns/}p" } }, Priority = 2 } }); - AddChild(new TestVariation(DeleteAttributes) { Attribute = new VariationAttribute("Single namespace (default)") { Params = new object[] { "<square xmlns='x'>text<B/><!--commnet--></square>", new[] { "xmlns" } }, Priority = 2 } }); + AddChild(new TestVariation(DeleteAttributes) { Attribute = new VariationAttribute("Single attribute") { Params = new object[] { "<square wIdth='1'>text<B/><!--comment--></square>", new[] { "wIdth" } }, Priority = 2 } }); + AddChild(new TestVariation(DeleteAttributes) { Attribute = new VariationAttribute("Default attribute from DTD") { Params = new object[] { "<!DOCTYPE square [<!ELEMENT square (B*)><!ATTLIST square wIdth CDATA '10'>]><square>text<B/><!--comment--></square>", new[] { "wIdth" } }, Priority = 2 } }); + AddChild(new TestVariation(DeleteAttributes) { Attribute = new VariationAttribute("Single namespace") { Params = new object[] { "<p:square xmlns:p='x'>text<B/><!--comment--></p:square>", new[] { "{http://www.w3.org/2000/xmlns/}p" } }, Priority = 2 } }); + AddChild(new TestVariation(DeleteAttributes) { Attribute = new VariationAttribute("Single namespace (default)") { Params = new object[] { "<square xmlns='x'>text<B/><!--comment--></square>", new[] { "xmlns" } }, Priority = 2 } }); AddChild(new TestVariation(DeleteAttributes) { Attribute = new VariationAttribute("Multiple attributes") { Params = new object[] { "<square wIdth='1' depth='11'><sub1/>text</square>", new[] { "wIdth", "depth" } }, Priority = 2 } }); AddChild(new TestVariation(DeleteAttributes) { Attribute = new VariationAttribute("Multiple namespaces") { Params = new object[] { "<p:square xmlns:p='x' xmlns='x1'><p:A/><B/></p:square>", new[] { "{http://www.w3.org/2000/xmlns/}p", "{http://www.w3.org/2000/xmlns/}p" } }, Priority = 2 } }); AddChild(new TestVariation(DeleteAttributes) { Attribute = new VariationAttribute("Multiple namespaces + attributes") { Params = new object[] { "<p:square xmlns:p='x' xmlns='x1' a1='xxx' p:a1='yyy'><p:A/><B p:x='ayay'/></p:square>", new[] { "{http://www.w3.org/2000/xmlns/}p", "{http://www.w3.org/2000/xmlns/}p", "a1", "{x}a1" } }, Priority = 2 } }); @@ -44,10 +44,10 @@ namespace XLinqTests //[Variation(Priority = 1, Desc = "No attributes")] - //[Variation(Priority = 2, Desc = "Default attribute from DTD", Params = new object[] { @"<!DOCTYPE square [<!ELEMENT square (B*)><!ATTLIST square wIdth CDATA '10'>]><square>text<B/><!--commnet--></square>", new string[] { "wIdth" } })] - //[Variation(Priority = 2, Desc = "Single attribute", Params = new object[] { @"<square wIdth='1'>text<B/><!--commnet--></square>", new string[] { "wIdth" } })] - //[Variation(Priority = 2, Desc = "Single namespace (default)", Params = new object[] { @"<square xmlns='x'>text<B/><!--commnet--></square>", new string[] { "xmlns" } })] - //[Variation(Priority = 2, Desc = "Single namespace", Params = new object[] { @"<p:square xmlns:p='x'>text<B/><!--commnet--></p:square>", new string[] { "{http://www.w3.org/2000/xmlns/}p" } })] + //[Variation(Priority = 2, Desc = "Default attribute from DTD", Params = new object[] { @"<!DOCTYPE square [<!ELEMENT square (B*)><!ATTLIST square wIdth CDATA '10'>]><square>text<B/><!--comment--></square>", new string[] { "wIdth" } })] + //[Variation(Priority = 2, Desc = "Single attribute", Params = new object[] { @"<square wIdth='1'>text<B/><!--comment--></square>", new string[] { "wIdth" } })] + //[Variation(Priority = 2, Desc = "Single namespace (default)", Params = new object[] { @"<square xmlns='x'>text<B/><!--comment--></square>", new string[] { "xmlns" } })] + //[Variation(Priority = 2, Desc = "Single namespace", Params = new object[] { @"<p:square xmlns:p='x'>text<B/><!--comment--></p:square>", new string[] { "{http://www.w3.org/2000/xmlns/}p" } })] //[Variation(Priority = 2, Desc = "Multiple attributes", Params = new object[] { @"<square wIdth='1' depth='11'><sub1/>text</square>", new string[] { "wIdth", "depth" } })] //[Variation(Priority = 2, Desc = "Multiple namespaces", Params = new object[] { @"<p:square xmlns:p='x' xmlns='x1'><p:A/><B/></p:square>", new string[] { "{http://www.w3.org/2000/xmlns/}p", "{http://www.w3.org/2000/xmlns/}p" } })] //[Variation(Priority = 2, Desc = "Multiple namespaces + attributes", Params = new object[] { @"<p:square xmlns:p='x' xmlns='x1' a1='xxx' p:a1='yyy'><p:A/><B p:x='ayay'/></p:square>", new string[] { "{http://www.w3.org/2000/xmlns/}p", "{http://www.w3.org/2000/xmlns/}p", "a1", "{x}a1" } })] diff --git a/src/System.Private.Xml.Linq/tests/TreeManipulation/SimpleObjectsCreation.cs b/src/System.Private.Xml.Linq/tests/TreeManipulation/SimpleObjectsCreation.cs index 8bdb106dc2..a17e8e645a 100644 --- a/src/System.Private.Xml.Linq/tests/TreeManipulation/SimpleObjectsCreation.cs +++ b/src/System.Private.Xml.Linq/tests/TreeManipulation/SimpleObjectsCreation.cs @@ -933,7 +933,7 @@ namespace XLinqTests var dtd = new XDocumentType(data[0], data[1], data[2], data[3]); TestLog.Compare(dtd.Name, data[0], "dtd.Name, data[0]"); TestLog.Compare(dtd.PublicId, data[1], "dtd.SystemId, data[1]"); - TestLog.Compare(dtd.SystemId, data[2], "dtd.PublicId, datat[2]"); + TestLog.Compare(dtd.SystemId, data[2], "dtd.PublicId, data[2]"); TestLog.Compare(dtd.InternalSubset, data[3], "dtd.InternalSubset, data[3]"); TestLog.Compare(dtd.NodeType, XmlNodeType.DocumentType, "nodetype"); TestLog.Compare(dtd.ToString(), serial, "DTD construction"); diff --git a/src/System.Private.Xml.Linq/tests/TreeManipulation/XAttributeEnumRemove.cs b/src/System.Private.Xml.Linq/tests/TreeManipulation/XAttributeEnumRemove.cs index cfe7507b5f..63cc8e3a65 100644 --- a/src/System.Private.Xml.Linq/tests/TreeManipulation/XAttributeEnumRemove.cs +++ b/src/System.Private.Xml.Linq/tests/TreeManipulation/XAttributeEnumRemove.cs @@ -281,7 +281,7 @@ namespace XLinqTests TestLog.Compare(parent.Attributes().Where(x => x.Name == a.Name).IsEmpty(), "Attributes node"); // Compare the rest of the elements - TestLog.Compare(expectedAttrsForParent[parent].EqualAllAttributes(parent.Attributes(), Helpers.MyAttributeComparer), "The rest of ther attributes"); + TestLog.Compare(expectedAttrsForParent[parent].EqualAllAttributes(parent.Attributes(), Helpers.MyAttributeComparer), "The rest of the attributes"); } } } diff --git a/src/System.Private.Xml.Linq/tests/TreeManipulation/XContainerRemoveNodesOnXDocument.cs b/src/System.Private.Xml.Linq/tests/TreeManipulation/XContainerRemoveNodesOnXDocument.cs index 465521ad02..056f2b46cf 100644 --- a/src/System.Private.Xml.Linq/tests/TreeManipulation/XContainerRemoveNodesOnXDocument.cs +++ b/src/System.Private.Xml.Linq/tests/TreeManipulation/XContainerRemoveNodesOnXDocument.cs @@ -20,8 +20,8 @@ namespace XLinqTests AddChild(new TestVariation(OnXDocument1) { Attribute = new VariationAttribute("On XDocument - root element only") { Param = "<A/>", Priority = 1 } }); AddChild(new TestVariation(OnXDocument1) { Attribute = new VariationAttribute("On XDocument - Empty") { Param = "", Priority = 1 } }); AddChild(new TestVariation(OnXDocument1) { Attribute = new VariationAttribute("On XDocument - Decl + root element only") { Param = "<?xml version='1.0'?><A/>", Priority = 1 } }); - AddChild(new TestVariation(OnXDocument1) { Attribute = new VariationAttribute("On XDocument - Decl + DTD + nodes") { Param = "<?xml version='1.0'?><!DOCTYPE square [<!ELEMENT square (B*)><!ATTLIST square wIdth CDATA '10'>]><square>text<B/><!--commnet--></square>", Priority = 0 } }); - AddChild(new TestVariation(OnXDocument1) { Attribute = new VariationAttribute("On XDocument - Decl + DTD + nodes") { Param = "<?xml version='1.0'?><!DOCTYPE square [<!ELEMENT square (B*)><!ATTLIST square wIdth CDATA '10'>]>\t\n<?PI?><square>text<B/><!--commnet--></square>\n\t<!--here is the end ... -->", Priority = 1 } }); + AddChild(new TestVariation(OnXDocument1) { Attribute = new VariationAttribute("On XDocument - Decl + DTD + nodes") { Param = "<?xml version='1.0'?><!DOCTYPE square [<!ELEMENT square (B*)><!ATTLIST square wIdth CDATA '10'>]><square>text<B/><!--comment--></square>", Priority = 0 } }); + AddChild(new TestVariation(OnXDocument1) { Attribute = new VariationAttribute("On XDocument - Decl + DTD + nodes") { Param = "<?xml version='1.0'?><!DOCTYPE square [<!ELEMENT square (B*)><!ATTLIST square wIdth CDATA '10'>]>\t\n<?PI?><square>text<B/><!--comment--></square>\n\t<!--here is the end ... -->", Priority = 1 } }); } /// <summary> diff --git a/src/System.Private.Xml.Linq/tests/TreeManipulation/XContainerReplaceNodesOnXElement.cs b/src/System.Private.Xml.Linq/tests/TreeManipulation/XContainerReplaceNodesOnXElement.cs index 1d34d53102..806aac763e 100644 --- a/src/System.Private.Xml.Linq/tests/TreeManipulation/XContainerReplaceNodesOnXElement.cs +++ b/src/System.Private.Xml.Linq/tests/TreeManipulation/XContainerReplaceNodesOnXElement.cs @@ -11,11 +11,11 @@ namespace XLinqTests public override void AddChildren() { AddChild(new TestVariation(OnXElement) { Attribute = new VariationAttribute("(BVT)XElement (text content): Replace with multiple nodes") { Params = new object[] { 2, "<A xmlns='ns1' xmlns:p='nsp'>_text_content_</A>", false }, Priority = 0 } }); - AddChild(new TestVariation(OnXElement) { Attribute = new VariationAttribute("(BVT)XElement: Replace with multiple nodes") { Params = new object[] { 2, "<A xmlns='ns1' xmlns:p='nsp'><e1/>text1<p:e2>innertext<innerelem/></p:e2>text2<!--coment-->text3<?PI clicl?></A>", true }, Priority = 0 } }); + AddChild(new TestVariation(OnXElement) { Attribute = new VariationAttribute("(BVT)XElement: Replace with multiple nodes") { Params = new object[] { 2, "<A xmlns='ns1' xmlns:p='nsp'><e1/>text1<p:e2>innertext<innerelem/></p:e2>text2<!--comment-->text3<?PI clicl?></A>", true }, Priority = 0 } }); AddChild(new TestVariation(OnXElement) { Attribute = new VariationAttribute("XElement (text content): Replace with single node") { Params = new object[] { 1, "<A xmlns='ns1' xmlns:p='nsp'>_text_content_</A>", false }, Priority = 0 } }); AddChild(new TestVariation(OnXElement) { Attribute = new VariationAttribute("XElement (text content): Replace with multiple nodes") { Params = new object[] { 4, "<A xmlns='ns1' xmlns:p='nsp'>_text_content_</A>", false }, Priority = 1 } }); - AddChild(new TestVariation(OnXElement) { Attribute = new VariationAttribute("XElement: Replace with single node") { Params = new object[] { 1, "<A xmlns='ns1' xmlns:p='nsp'><e1/>text1<p:e2>innertext<innerelem/></p:e2>text2<!--coment-->text3<?PI clicl?></A>", true }, Priority = 0 } }); - AddChild(new TestVariation(OnXElement) { Attribute = new VariationAttribute("XElement: Replace with multiple nodes") { Params = new object[] { 4, "<A xmlns='ns1' xmlns:p='nsp'><e1/>text1<p:e2>innertext<innerelem/></p:e2>text2<!--coment-->text3<?PI clicl?></A>", true }, Priority = 1 } }); + AddChild(new TestVariation(OnXElement) { Attribute = new VariationAttribute("XElement: Replace with single node") { Params = new object[] { 1, "<A xmlns='ns1' xmlns:p='nsp'><e1/>text1<p:e2>innertext<innerelem/></p:e2>text2<!--comment-->text3<?PI clicl?></A>", true }, Priority = 0 } }); + AddChild(new TestVariation(OnXElement) { Attribute = new VariationAttribute("XElement: Replace with multiple nodes") { Params = new object[] { 4, "<A xmlns='ns1' xmlns:p='nsp'><e1/>text1<p:e2>innertext<innerelem/></p:e2>text2<!--comment-->text3<?PI clicl?></A>", true }, Priority = 1 } }); } } } diff --git a/src/System.Private.Xml.Linq/tests/TreeManipulation/XNodeReplaceOnElement.cs b/src/System.Private.Xml.Linq/tests/TreeManipulation/XNodeReplaceOnElement.cs index ccb30ac2e4..d3b6d6cbe0 100644 --- a/src/System.Private.Xml.Linq/tests/TreeManipulation/XNodeReplaceOnElement.cs +++ b/src/System.Private.Xml.Linq/tests/TreeManipulation/XNodeReplaceOnElement.cs @@ -10,16 +10,16 @@ namespace XLinqTests { public override void AddChildren() { - AddChild(new TestVariation(OnXElement) { Attribute = new VariationAttribute("XElement: Replace with multiple nodes") { Params = new object[] { 4, "<A xmlns='ns1' xmlns:p='nsp'><e1/>text1<p:e2>innertext<innerelem/></p:e2>text2<!--coment-->text3<?PI clicl?></A>" }, Priority = 1 } }); - AddChild(new TestVariation(OnXElement) { Attribute = new VariationAttribute("(BVT)XElement: Replace with multiple nodes") { Params = new object[] { 2, "<A xmlns='ns1' xmlns:p='nsp'><e1/>text1<p:e2>innertext<innerelem/></p:e2>text2<!--coment-->text3<?PI clicl?></A>" }, Priority = 0 } }); + AddChild(new TestVariation(OnXElement) { Attribute = new VariationAttribute("XElement: Replace with multiple nodes") { Params = new object[] { 4, "<A xmlns='ns1' xmlns:p='nsp'><e1/>text1<p:e2>innertext<innerelem/></p:e2>text2<!--comment-->text3<?PI clicl?></A>" }, Priority = 1 } }); + AddChild(new TestVariation(OnXElement) { Attribute = new VariationAttribute("(BVT)XElement: Replace with multiple nodes") { Params = new object[] { 2, "<A xmlns='ns1' xmlns:p='nsp'><e1/>text1<p:e2>innertext<innerelem/></p:e2>text2<!--comment-->text3<?PI clicl?></A>" }, Priority = 0 } }); AddChild(new TestVariation(OnXElement) { Attribute = new VariationAttribute("XElement: Replace with single nodes - text node only") { Params = new object[] { 1, "<A>I_am_the_text</A>" }, Priority = 1 } }); - AddChild(new TestVariation(OnXElement) { Attribute = new VariationAttribute("(BVT)XElement (in document II.): Replace with multiple nodes") { Params = new object[] { 2, "<A xmlns='ns1' xmlns:p='nsp'><e1/>text1<p:e2>innertext<innerelem/></p:e2>text2<!--coment-->text3<?PI clicl?></A>", true }, Priority = 0 } }); + AddChild(new TestVariation(OnXElement) { Attribute = new VariationAttribute("(BVT)XElement (in document II.): Replace with multiple nodes") { Params = new object[] { 2, "<A xmlns='ns1' xmlns:p='nsp'><e1/>text1<p:e2>innertext<innerelem/></p:e2>text2<!--comment-->text3<?PI clicl?></A>", true }, Priority = 0 } }); AddChild(new TestVariation(OnXElement) { Attribute = new VariationAttribute("XElement: Replace with multiple nodes - text node only") { Params = new object[] { 4, "<A>I_am_the_text</A>" }, Priority = 1 } }); AddChild(new TestVariation(OnXElement) { Attribute = new VariationAttribute("XElement: Replace with single nodes - one child") { Params = new object[] { 1, "<A><x/></A>" }, Priority = 2 } }); - AddChild(new TestVariation(OnXElement) { Attribute = new VariationAttribute("XElement (in document II.): Replace with multiple nodes") { Params = new object[] { 4, "<A xmlns='ns1' xmlns:p='nsp'><e1/>text1<p:e2>innertext<innerelem/></p:e2>text2<!--coment-->text3<?PI clicl?></A>", true }, Priority = 1 } }); - AddChild(new TestVariation(OnXElement) { Attribute = new VariationAttribute("(BVT)XElement (in document): Replace with multiple nodes") { Params = new object[] { 2, "<A xmlns='ns1' xmlns:p='nsp'><e1/>text1<p:e2>innertext<innerelem/></p:e2>text2<!--coment-->text3<?PI clicl?></A>", false }, Priority = 0 } }); + AddChild(new TestVariation(OnXElement) { Attribute = new VariationAttribute("XElement (in document II.): Replace with multiple nodes") { Params = new object[] { 4, "<A xmlns='ns1' xmlns:p='nsp'><e1/>text1<p:e2>innertext<innerelem/></p:e2>text2<!--comment-->text3<?PI clicl?></A>", true }, Priority = 1 } }); + AddChild(new TestVariation(OnXElement) { Attribute = new VariationAttribute("(BVT)XElement (in document): Replace with multiple nodes") { Params = new object[] { 2, "<A xmlns='ns1' xmlns:p='nsp'><e1/>text1<p:e2>innertext<innerelem/></p:e2>text2<!--comment-->text3<?PI clicl?></A>", false }, Priority = 0 } }); AddChild(new TestVariation(OnXElement) { Attribute = new VariationAttribute("XElement: Replace with multiple nodes - one child") { Params = new object[] { 4, "<A><?Pi data?></A>" }, Priority = 2 } }); - AddChild(new TestVariation(OnXElement) { Attribute = new VariationAttribute("XElement (in document): Replace with multiple nodes") { Params = new object[] { 4, "<A xmlns='ns1' xmlns:p='nsp'><e1/>text1<p:e2>innertext<innerelem/></p:e2>text2<!--coment-->text3<?PI clicl?></A>", false }, Priority = 1 } }); + AddChild(new TestVariation(OnXElement) { Attribute = new VariationAttribute("XElement (in document): Replace with multiple nodes") { Params = new object[] { 4, "<A xmlns='ns1' xmlns:p='nsp'><e1/>text1<p:e2>innertext<innerelem/></p:e2>text2<!--comment-->text3<?PI clicl?></A>", false }, Priority = 1 } }); } } } diff --git a/src/System.Private.Xml.Linq/tests/TreeManipulation/XNodeSequenceRemove.cs b/src/System.Private.Xml.Linq/tests/TreeManipulation/XNodeSequenceRemove.cs index c907b82249..1efb29bd4f 100644 --- a/src/System.Private.Xml.Linq/tests/TreeManipulation/XNodeSequenceRemove.cs +++ b/src/System.Private.Xml.Linq/tests/TreeManipulation/XNodeSequenceRemove.cs @@ -476,7 +476,7 @@ namespace XLinqTests { int count = 0; _runWithEvents = (bool)Params[0]; - XDocument doc = XDocument.Parse(@"<A xmlns='a'><B/>text1<p:B xmlns:p='nsp'/>text2<!--commnent--><C><innerElement/></C></A>", LoadOptions.PreserveWhitespace); + XDocument doc = XDocument.Parse(@"<A xmlns='a'><B/>text1<p:B xmlns:p='nsp'/>text2<!--comment--><C><innerElement/></C></A>", LoadOptions.PreserveWhitespace); IEnumerable<XElement> toRemove = doc.Root.Elements(); if (_runWithEvents) { @@ -771,7 +771,7 @@ namespace XLinqTests } // Compare the rest of the elements - TestLog.Compare(expectedNodesForParent[parent].EqualAll(parent.Nodes(), XNode.EqualityComparer), "The rest of ther nodes"); + TestLog.Compare(expectedNodesForParent[parent].EqualAll(parent.Nodes(), XNode.EqualityComparer), "The rest of the nodes"); } } } diff --git a/src/System.Private.Xml.Linq/tests/XDocument.Common/HelperExtensionMethods.cs b/src/System.Private.Xml.Linq/tests/XDocument.Common/HelperExtensionMethods.cs index f055d72ef9..3da740ef14 100644 --- a/src/System.Private.Xml.Linq/tests/XDocument.Common/HelperExtensionMethods.cs +++ b/src/System.Private.Xml.Linq/tests/XDocument.Common/HelperExtensionMethods.cs @@ -182,7 +182,7 @@ namespace CoreXml.Test.XLinq } else { - TestLog.WriteLine("No mach in actual values"); + TestLog.WriteLine("No match in actual values"); return false; } } diff --git a/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/testattribute.cs b/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/testattribute.cs index 30b111a155..34c71e48f8 100644 --- a/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/testattribute.cs +++ b/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/testattribute.cs @@ -34,23 +34,23 @@ namespace Microsoft.Test.ModuleCore protected string pfilter; protected string pversion; - //Allows Inhertiance (ie: object to determine if ever been set) - protected int? ppriority; //Allows Inhertiance - protected string ppurpose; //Allows Inhertiance - protected bool? pimplemented; //Allows Inhertiance - protected string[] powners; //Allows Inhertiance - protected string[] pareas; //Allows Inhertiance - protected bool? pskipped; //Allows Inhertiance - protected bool? perror; //Allows Inhertiance - protected bool? pmanual; //Allows Inhertiance - protected SecurityFlags? psecurity; //Allows Inhertiance - protected string pfiltercriteria;//Allows Inhertiance - protected string[] planguages; //Allows Inhertiance - protected string pxml; //Allows Inhertiance - protected int? ptimeout; //Allows Inhertiance - protected int? pthreads; //Allows Inhertiance - protected int? prepeat; //Allows Inhertiance - protected bool? pstress; //Allows Inhertiance + //Allows Inheritance (ie: object to determine if ever been set) + protected int? ppriority; //Allows Inheritance + protected string ppurpose; //Allows Inheritance + protected bool? pimplemented; //Allows Inheritance + protected string[] powners; //Allows Inheritance + protected string[] pareas; //Allows Inheritance + protected bool? pskipped; //Allows Inheritance + protected bool? perror; //Allows Inheritance + protected bool? pmanual; //Allows Inheritance + protected SecurityFlags? psecurity; //Allows Inheritance + protected string pfiltercriteria;//Allows Inheritance + protected string[] planguages; //Allows Inheritance + protected string pxml; //Allows Inheritance + protected int? ptimeout; //Allows Inheritance + protected int? pthreads; //Allows Inheritance + protected int? prepeat; //Allows Inheritance + protected bool? pstress; //Allows Inheritance //Constructors public TestAttribute() diff --git a/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/testitem.cs b/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/testitem.cs index 2e781bd5d0..c3eb5242a0 100644 --- a/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/testitem.cs +++ b/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/testitem.cs @@ -47,7 +47,7 @@ namespace Microsoft.Test.ModuleCore protected abstract TestAttribute CreateAttribute(); - //Note: These are just a mere convience to access the attribute values + //Note: These are just a mere convenience to access the attribute values //for this particular object. Also note that for non-attribute based //scenarios (dynamic), the attribute class will be created just to hold //the values diff --git a/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/testmodule.cs b/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/testmodule.cs index f3657c95d4..5f73618bee 100644 --- a/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/testmodule.cs +++ b/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/testmodule.cs @@ -59,7 +59,7 @@ namespace Microsoft.Test.ModuleCore } catch (Exception e) { - //Don't completley block construction, otherwise it won't be able to be loaded from COM + //Don't completely block construction, otherwise it won't be able to be loaded from COM TestLog.HandleException(e); } } diff --git a/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/testproperties.cs b/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/testproperties.cs index 7f3c450be6..a87b864ae5 100644 --- a/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/testproperties.cs +++ b/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/testproperties.cs @@ -108,7 +108,7 @@ namespace Microsoft.Test.ModuleCore { //Reset the info. //Since this is a static class, (to make it simplier to access from anywhere in your code) - //we need to reset this info everytime a test is run - so if you don't select an alias + //we need to reset this info every time a test is run - so if you don't select an alias //the next time it doesn't use the previous alias setting - ie: ProviderInfo doesn't //get called when no alias is selected... s_pproperties = null; diff --git a/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/util.cs b/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/util.cs index 05b1611831..43dfde95ff 100644 --- a/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/util.cs +++ b/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/util.cs @@ -55,7 +55,7 @@ namespace Microsoft.Test.ModuleCore return; } - //Otheriwse add the value + //Otherwise add the value Add(key, value); } diff --git a/src/System.Private.Xml.Linq/tests/XPath/XDocument/NavigatorComparer.cs b/src/System.Private.Xml.Linq/tests/XPath/XDocument/NavigatorComparer.cs index b7d6127306..a0c67b6359 100644 --- a/src/System.Private.Xml.Linq/tests/XPath/XDocument/NavigatorComparer.cs +++ b/src/System.Private.Xml.Linq/tests/XPath/XDocument/NavigatorComparer.cs @@ -59,7 +59,7 @@ namespace System.Xml.XPath.XDocument.Tests.XDocument private static void CompareNodeTypes(XPathNodeType a, XPathNodeType b) { - // XPath.XDocument interprets whitespaces as XPathNodeType.Text + // XPath.XDocument interprets whitespace as XPathNodeType.Text // while other XPath navigators do it properly Assert.Equal(IsWhitespaceOrText(a), IsWhitespaceOrText(b)); Assert.Equal(IsNamespaceOrAttribute(a), IsNamespaceOrAttribute(b)); diff --git a/src/System.Private.Xml.Linq/tests/events/EventsName.cs b/src/System.Private.Xml.Linq/tests/events/EventsName.cs index e3f7052b02..c5f76965aa 100644 --- a/src/System.Private.Xml.Linq/tests/events/EventsName.cs +++ b/src/System.Private.Xml.Linq/tests/events/EventsName.cs @@ -81,7 +81,7 @@ namespace CoreXml.Test.XLinq.FunctionalTests.EventsTests //Add null first, this should add nothing xDoc.Changing += null; xDoc.Changed += null; - //Add the actuall delegate + //Add the actual delegate xDoc.Changing += new EventHandler<XObjectChangeEventArgs>(d1); xDoc.Changed += new EventHandler<XObjectChangeEventArgs>(d2); //Now set it to null diff --git a/src/System.Private.Xml.Linq/tests/misc/Annotation.cs b/src/System.Private.Xml.Linq/tests/misc/Annotation.cs index f2d7a3d1de..db7f249c16 100644 --- a/src/System.Private.Xml.Linq/tests/misc/Annotation.cs +++ b/src/System.Private.Xml.Linq/tests/misc/Annotation.cs @@ -434,7 +434,7 @@ namespace System.Xml.Linq.Tests private static void ValidateAnnotations<T>(XObject xo, T[] values) where T : class { // - // use inefficent n^2 algorithm, which is OK for our testing purposes + // use inefficient n^2 algorithm, which is OK for our testing purposes // assumes that all items are unique // diff --git a/src/System.Private.Xml.Linq/tests/misc/PrefixNamespaceFixes.cs b/src/System.Private.Xml.Linq/tests/misc/PrefixNamespaceFixes.cs index e8a3d96b92..40d2de9ae0 100644 --- a/src/System.Private.Xml.Linq/tests/misc/PrefixNamespaceFixes.cs +++ b/src/System.Private.Xml.Linq/tests/misc/PrefixNamespaceFixes.cs @@ -193,7 +193,7 @@ namespace CoreXml.Test.XLinq //[Variation(Priority = 1, Desc = "XmlWriter interference")] public void var_7() { - // Element "D" should use the defalut namespace defined in ancestor element "A" but it does not + // Element "D" should use the default namespace defined in ancestor element "A" but it does not // since the auto generated default name space in parent element "C". So a new default namespace is added for // "D". XElement e = new XElement("A", new XAttribute(XNamespace.Xmlns + "a", "a"), @@ -211,7 +211,7 @@ namespace CoreXml.Test.XLinq { return; } - throw new TestFailedException("Expected comparsion mismatch and an exception."); + throw new TestFailedException("Expected comparison mismatch and an exception."); } } } diff --git a/src/System.Private.Xml.Linq/tests/misc/XLinqErrata4.cs b/src/System.Private.Xml.Linq/tests/misc/XLinqErrata4.cs index 54909088ca..2f732f55a2 100644 --- a/src/System.Private.Xml.Linq/tests/misc/XLinqErrata4.cs +++ b/src/System.Private.Xml.Linq/tests/misc/XLinqErrata4.cs @@ -13,7 +13,7 @@ namespace System.Xml.Linq.Tests { public class XmlErrata4 { - // Invalid charcters in names + // Invalid characters in names [InlineData("InValid", "NameSurrogateLowChar", "XName")] // XName with InValid Name Surrogate Low Characters [InlineData("InValid", "NameSurrogateLowChar", "XAttribute")] // XAttribute with InValid Name Surrogate Low Characters [InlineData("InValid", "NameSurrogateLowChar", "XElement")] // XElement with InValid Name Surrogate Low Characters @@ -260,7 +260,7 @@ namespace System.Xml.Linq.Tests } /// <summary> - /// returns a name using the character provided in the appropriate postion + /// returns a name using the character provided in the appropriate position /// </summary> /// <param name="charType">type from CharType class</param> /// <param name="c">character to be used in the name</param> diff --git a/src/System.Private.Xml.Linq/tests/xNodeBuilder/CommonTests.cs b/src/System.Private.Xml.Linq/tests/xNodeBuilder/CommonTests.cs index 67a3901b6a..2d42475610 100644 --- a/src/System.Private.Xml.Linq/tests/xNodeBuilder/CommonTests.cs +++ b/src/System.Private.Xml.Linq/tests/xNodeBuilder/CommonTests.cs @@ -2354,7 +2354,7 @@ namespace CoreXml.Test.XLinq if (!CompareReader(doc, "<x:Root x:attr=\"b\" xmlns:x=\"foo\" />")) throw new TestException(TestResult.Failed, ""); } - //[Variation(Id = 13, Desc = "Try to re-define NS prefix on attribute which is aleady defined on an element", Priority = 2)] + //[Variation(Id = 13, Desc = "Try to re-define NS prefix on attribute which is already defined on an element", Priority = 2)] public void elemNamespace_13() { XDocument doc = new XDocument(); @@ -4789,7 +4789,7 @@ namespace CoreXml.Test.XLinq if (!CompareReader(doc, "<Root a1=\"x
y\" />")) throw new TestException(TestResult.Failed, ""); } - //[Variation(Id = 13, Desc = "Surrogate charaters in text nodes, range limits", Priority = 1)] + //[Variation(Id = 13, Desc = "Surrogate characters in text nodes, range limits", Priority = 1)] public void writeString_13() { char[] invalidXML = { '\uD800', '\uDC00', '\uD800', '\uDFFF', '\uDBFF', '\uDC00', '\uDBFF', '\uDFFF' }; @@ -4898,7 +4898,7 @@ namespace CoreXml.Test.XLinq if (!CompareBaseline(doc, "whitespace3.txt")) throw new TestException(TestResult.Failed, ""); } - // Factory writer behavior is incosistent with XmlTextWriter, but consistent with other Write(string) methods + // Factory writer behavior is inconsistent with XmlTextWriter, but consistent with other Write(string) methods //[Variation(Id = 4, Desc = "WriteWhitespace with null ", Param = "null", Priority = 1)] //[Variation(Id = 5, Desc = "WriteWhitespace with String.Empty ", Param = "String.Empty", Priority = 1)] public void whitespace_4() @@ -5100,7 +5100,7 @@ namespace CoreXml.Test.XLinq if (!CompareReader(doc, "<Root attr=\"2true3.14\" />")) throw new TestException(TestResult.Failed, ""); } - //[Variation(Id = 13, Desc = "Write multiple atomic values inside element, seperate by WriteWhitespace(' ')", Priority = 1)] + //[Variation(Id = 13, Desc = "Write multiple atomic values inside element, separate by WriteWhitespace(' ')", Priority = 1)] public void writeValue_13() { XDocument doc = new XDocument(); @@ -5119,7 +5119,7 @@ namespace CoreXml.Test.XLinq if (!CompareReader(doc, "<Root>2 true 3.14 </Root>")) throw new TestException(TestResult.Failed, ""); } - //[Variation(Id = 14, Desc = "Write multiple atomic values inside element, seperate by WriteString(' ')", Priority = 1)] + //[Variation(Id = 14, Desc = "Write multiple atomic values inside element, separate by WriteString(' ')", Priority = 1)] public void writeValue_14() { XDocument doc = new XDocument(); @@ -5138,7 +5138,7 @@ namespace CoreXml.Test.XLinq if (!CompareReader(doc, "<Root>2 true 3.14 </Root>")) throw new TestException(TestResult.Failed, ""); } - //[Variation(Id = 15, Desc = "Write multiple atomic values inside attribute, seperate by WriteWhitespace(' ')", Priority = 1)] + //[Variation(Id = 15, Desc = "Write multiple atomic values inside attribute, separate by WriteWhitespace(' ')", Priority = 1)] public void writeValue_15() { XDocument doc = new XDocument(); @@ -5158,7 +5158,7 @@ namespace CoreXml.Test.XLinq if (!CompareReader(doc, "<Root attr=\"2 true 3.14 \" />")) throw new TestException(TestResult.Failed, ""); } - //[Variation(Id = 16, Desc = "Write multiple atomic values inside attribute, seperate by WriteString(' ')", Priority = 1)] + //[Variation(Id = 16, Desc = "Write multiple atomic values inside attribute, separate by WriteString(' ')", Priority = 1)] public void writeValue_16() { XDocument doc = new XDocument(); @@ -5488,7 +5488,7 @@ namespace CoreXml.Test.XLinq throw new TestException(TestResult.Failed, ""); } - //[Variation(Id = 9, Desc = "Veify XmlSpace value when received through WriteString", Priority = 1)] + //[Variation(Id = 9, Desc = "Verify XmlSpace value when received through WriteString", Priority = 1)] public void xmlSpace_9() { XDocument doc = new XDocument(); @@ -5531,7 +5531,7 @@ namespace CoreXml.Test.XLinq if (w.XmlLang != null) { w.Dispose(); - TestLog.WriteLine("Default value if no xml:lang attributes are currentlly on the stack should be null"); + TestLog.WriteLine("Default value if no xml:lang attributes are currently on the stack should be null"); TestLog.WriteLine("Actual value: {0}", w.XmlLang.ToString()); throw new TestException(TestResult.Failed, ""); } @@ -5590,7 +5590,7 @@ namespace CoreXml.Test.XLinq throw new TestException(TestResult.Failed, ""); } - //[Variation(Id = 5, Desc = "Veify XmlLang value when received through WriteAttributes", Priority = 1)] + //[Variation(Id = 5, Desc = "Verify XmlLang value when received through WriteAttributes", Priority = 1)] public void XmlLang_5() { XmlReader tr = CreateReaderIgnoreWS(Path.Combine(FilePathUtil.GetTestDataPath(), Path.Combine("XmlWriter2", "XmlReader.xml"))); @@ -5614,7 +5614,7 @@ namespace CoreXml.Test.XLinq w.Dispose(); } - //[Variation(Id = 6, Desc = "Veify XmlLang value when received through WriteString")] + //[Variation(Id = 6, Desc = "Verify XmlLang value when received through WriteString")] public void XmlLang_6() { XDocument doc = new XDocument(); diff --git a/src/System.Private.Xml.Linq/tests/xNodeBuilder/EndOfLineHandlingTests.cs b/src/System.Private.Xml.Linq/tests/xNodeBuilder/EndOfLineHandlingTests.cs index 922243a864..ccab40e315 100644 --- a/src/System.Private.Xml.Linq/tests/xNodeBuilder/EndOfLineHandlingTests.cs +++ b/src/System.Private.Xml.Linq/tests/xNodeBuilder/EndOfLineHandlingTests.cs @@ -63,11 +63,11 @@ namespace CoreXml.Test.XLinq public void EOF_Handling_01() { XmlWriterSettings wSettings = new XmlWriterSettings(); - TestLog.Compare(wSettings.NewLineHandling, NewLineHandling.Replace, "Incorect default value for XmlWriterSettings.NewLineHandling"); + TestLog.Compare(wSettings.NewLineHandling, NewLineHandling.Replace, "Incorrect default value for XmlWriterSettings.NewLineHandling"); XDocument d = new XDocument(); XmlWriter w = CreateWriter(d); w.Dispose(); - TestLog.Compare(w.Settings.NewLineHandling, NewLineHandling.Replace, "Incorect default value for XmlWriter.Settings.NewLineHandling"); + TestLog.Compare(w.Settings.NewLineHandling, NewLineHandling.Replace, "Incorrect default value for XmlWriter.Settings.NewLineHandling"); } //[Variation(Desc = "XmlWriter creation with NewLineHandling.Entitize", Param = NewLineHandling.Entitize, Id = 2, Priority = 0)] @@ -223,8 +223,8 @@ namespace CoreXml.Test.XLinq { XDocument d = new XDocument(); XmlWriter w = CreateWriter(d); - TestLog.Compare(w.Settings.NewLineChars, Environment.NewLine, "Incorect default value for XmlWriter.Settings.NewLineChars"); - TestLog.Compare(w.Settings.IndentChars, " ", "Incorect default value for XmlWriter.Settings.IndentChars"); + TestLog.Compare(w.Settings.NewLineChars, Environment.NewLine, "Incorrect default value for XmlWriter.Settings.NewLineChars"); + TestLog.Compare(w.Settings.IndentChars, " ", "Incorrect default value for XmlWriter.Settings.IndentChars"); w.WriteStartElement("root"); w.WriteStartElement("foo"); @@ -283,7 +283,7 @@ namespace CoreXml.Test.XLinq } //[Variation(Desc = "NewLine handling between attributes when NewLineOnAttributes=true; Entitize, '\\r\\n'", Params = new object[] { NewLineHandling.Entitize, "\r\n" }, Id = 56, Priority = 1)] - //[Variation(Desc = "NewLine handling betwwen attributes when NewLineOnAttributes=true; Replace, '\\r\\n'", Params = new object[] { NewLineHandling.Replace, "\r\n" }, Id = 57, Priority = 1)] + //[Variation(Desc = "NewLine handling between attributes when NewLineOnAttributes=true; Replace, '\\r\\n'", Params = new object[] { NewLineHandling.Replace, "\r\n" }, Id = 57, Priority = 1)] //[Variation(Desc = "NewLine handling between attributes when NewLineOnAttributes=true; None, '\\r\\n'", Params = new object[] { NewLineHandling.None, "\r\n" }, Id = 58, Priority = 1)] //[Variation(Desc = "NewLine handling between attributes when NewLineOnAttributes=true; Entitize, '\\r'", Params = new object[] { NewLineHandling.Entitize, "\r" }, Id = 59, Priority = 2)] //[Variation(Desc = "NewLine handling between attributes when NewLineOnAttributes=true; Replace, '\\r'", Params = new object[] { NewLineHandling.Replace, "\r" }, Id = 60, Priority = 2)] diff --git a/src/System.Private.Xml.Linq/tests/xNodeBuilder/FunctionalTests.cs b/src/System.Private.Xml.Linq/tests/xNodeBuilder/FunctionalTests.cs index d1a91fd569..0be91ab569 100644 --- a/src/System.Private.Xml.Linq/tests/xNodeBuilder/FunctionalTests.cs +++ b/src/System.Private.Xml.Linq/tests/xNodeBuilder/FunctionalTests.cs @@ -281,7 +281,7 @@ namespace CoreXml.Test.XLinq this.AddChild(new TestVariation(elemNamespace_10) { Attribute = new VariationAttribute("Create nested element without prefix but with namespace of parent element with a defined prefix") { Id = 10, Priority = 2 } }); this.AddChild(new TestVariation(elemNamespace_11) { Attribute = new VariationAttribute("Create different prefix for element and attribute that have same namespace") { Id = 11, Priority = 2 } }); this.AddChild(new TestVariation(elemNamespace_12) { Attribute = new VariationAttribute("Create same prefix for element and attribute that have same namespace") { Id = 12, Priority = 2 } }); - this.AddChild(new TestVariation(elemNamespace_13) { Attribute = new VariationAttribute("Try to re-define NS prefix on attribute which is aleady defined on an element") { Id = 13, Priority = 2 } }); + this.AddChild(new TestVariation(elemNamespace_13) { Attribute = new VariationAttribute("Try to re-define NS prefix on attribute which is already defined on an element") { Id = 13, Priority = 2 } }); this.AddChild(new TestVariation(elemNamespace_14) { Attribute = new VariationAttribute("Namespace string contains surrogates, reuse at different levels") { Id = 14, Priority = 1 } }); this.AddChild(new TestVariation(elemNamespace_15) { Attribute = new VariationAttribute("Namespace containing entities, use at multiple levels") { Id = 15, Priority = 1 } }); this.AddChild(new TestVariation(elemNamespace_16) { Attribute = new VariationAttribute("Verify it resets default namespace when redefined earlier in the stack") { Id = 16, Priority = 1 } }); @@ -538,7 +538,7 @@ namespace CoreXml.Test.XLinq this.AddChild(new TestVariation(writeString_9) { Attribute = new VariationAttribute("WriteString for value greater than x1F") { Id = 9, Priority = 1 } }); this.AddChild(new TestVariation(writeString_11) { Attribute = new VariationAttribute("WriteString with CR, LF, CR LF inside attribute value") { Id = 11, Priority = 1 } }); this.AddChild(new TestVariation(writeString_12) { Attribute = new VariationAttribute("Call WriteString for LF inside attribute") { Id = 12, Priority = 1 } }); - this.AddChild(new TestVariation(writeString_13) { Attribute = new VariationAttribute("Surrogate charaters in text nodes, range limits") { Id = 13, Priority = 1 } }); + this.AddChild(new TestVariation(writeString_13) { Attribute = new VariationAttribute("Surrogate characters in text nodes, range limits") { Id = 13, Priority = 1 } }); this.AddChild(new TestVariation(writeString_14) { Attribute = new VariationAttribute("High surrogate on last position") { Id = 14, Priority = 1 } }); this.AddChild(new TestVariation(writeString_15) { Attribute = new VariationAttribute("Low surrogate on first position") { Id = 15, Priority = 1 } }); this.AddChild(new TestVariation(writeString_16) { Attribute = new VariationAttribute("Swap low-high surrogates") { Id = 16, Priority = 1 } }); @@ -577,9 +577,9 @@ namespace CoreXml.Test.XLinq this.AddChild(new TestVariation(writeValue_9) { Attribute = new VariationAttribute("WriteValue(DateTimeOffset)") { Id = 9, Priority = 1 } }); this.AddChild(new TestVariation(writeValue_11) { Attribute = new VariationAttribute("Write multiple atomic values inside element") { Id = 11, Priority = 1 } }); this.AddChild(new TestVariation(writeValue_12) { Attribute = new VariationAttribute("Write multiple atomic values inside attribute") { Id = 12, Priority = 1 } }); - this.AddChild(new TestVariation(writeValue_13) { Attribute = new VariationAttribute("Write multiple atomic values inside element, seperate by WriteWhitespace(' ')") { Id = 13, Priority = 1 } }); - this.AddChild(new TestVariation(writeValue_14) { Attribute = new VariationAttribute("Write multiple atomic values inside element, seperate by WriteString(' ')") { Id = 14, Priority = 1 } }); - this.AddChild(new TestVariation(writeValue_15) { Attribute = new VariationAttribute("Write multiple atomic values inside attribute, seperate by WriteWhitespace(' ')") { Id = 15, Priority = 1 } }); + this.AddChild(new TestVariation(writeValue_13) { Attribute = new VariationAttribute("Write multiple atomic values inside element, separate by WriteWhitespace(' ')") { Id = 13, Priority = 1 } }); + this.AddChild(new TestVariation(writeValue_14) { Attribute = new VariationAttribute("Write multiple atomic values inside element, separate by WriteString(' ')") { Id = 14, Priority = 1 } }); + this.AddChild(new TestVariation(writeValue_15) { Attribute = new VariationAttribute("Write multiple atomic values inside attribute, separate by WriteWhitespace(' ')") { Id = 15, Priority = 1 } }); this.AddChild(new TestVariation(writeValue_16) { Attribute = new VariationAttribute("Write multiple atomic values inside attribute, seperate by WriteString(' ')") { Id = 16, Priority = 1 } }); this.AddChild(new TestVariation(writeValue_17) { Attribute = new VariationAttribute("WriteValue(long)") { Id = 17, Priority = 1 } }); } @@ -616,7 +616,7 @@ namespace CoreXml.Test.XLinq this.AddChild(new TestVariation(xmlSpace_6) { Attribute = new VariationAttribute("Verify XmlSpace - outside defined scope") { Id = 6, Priority = 1 } }); this.AddChild(new TestVariation(xmlSpace_7) { Attribute = new VariationAttribute("Verify XmlSpace with invalid space value") { Id = 7, Priority = 0 } }); this.AddChild(new TestVariation(xmlSpace_8) { Attribute = new VariationAttribute("Duplicate xml:space attr should error") { Id = 8, Priority = 1 } }); - this.AddChild(new TestVariation(xmlSpace_9) { Attribute = new VariationAttribute("Veify XmlSpace value when received through WriteString") { Id = 9, Priority = 1 } }); + this.AddChild(new TestVariation(xmlSpace_9) { Attribute = new VariationAttribute("Verify XmlSpace value when received through WriteString") { Id = 9, Priority = 1 } }); } } public partial class TCXmlLangWriter : BridgeHelpers @@ -629,8 +629,8 @@ namespace CoreXml.Test.XLinq this.AddChild(new TestVariation(XmlLang_2) { Attribute = new VariationAttribute("Verify that default value of XmlLang is NULL") { Id = 2, Priority = 1 } }); this.AddChild(new TestVariation(XmlLang_3) { Attribute = new VariationAttribute("Verify XmlLang scope inside nested elements (both PROLOG and EPILOG)") { Id = 3, Priority = 1 } }); this.AddChild(new TestVariation(XmlLang_4) { Attribute = new VariationAttribute("Duplicate xml:lang attr should error") { Id = 4, Priority = 1 } }); - this.AddChild(new TestVariation(XmlLang_5) { Attribute = new VariationAttribute("Veify XmlLang value when received through WriteAttributes") { Id = 5, Priority = 1 } }); - this.AddChild(new TestVariation(XmlLang_6) { Attribute = new VariationAttribute("Veify XmlLang value when received through WriteString") { Id = 6 } }); + this.AddChild(new TestVariation(XmlLang_5) { Attribute = new VariationAttribute("Verify XmlLang value when received through WriteAttributes") { Id = 5, Priority = 1 } }); + this.AddChild(new TestVariation(XmlLang_6) { Attribute = new VariationAttribute("Verify XmlLang value when received through WriteString") { Id = 6 } }); this.AddChild(new TestVariation(XmlLang_7) { Attribute = new VariationAttribute("Should not check XmlLang value") { Id = 7, Priority = 2 } }); this.AddChild(new TestVariation(XmlLang_8) { Attribute = new VariationAttribute("More XmlLang with valid sequence") { Id = 8, Priority = 1 } }); } @@ -818,7 +818,7 @@ namespace CoreXml.Test.XLinq this.AddChild(new TestVariation(EOF_Handling_16) { Attribute = new VariationAttribute("NewLine handling between attributes when NewLineOnAttributes=true; Replace, '\\r'") { Params = new object[] { NewLineHandling.Replace, "\r" }, Id = 60, Priority = 2 } }); this.AddChild(new TestVariation(EOF_Handling_16) { Attribute = new VariationAttribute("NewLine handling between attributes when NewLineOnAttributes=true; Entitize, '\\r'") { Params = new object[] { NewLineHandling.Entitize, "\r" }, Id = 59, Priority = 2 } }); this.AddChild(new TestVariation(EOF_Handling_16) { Attribute = new VariationAttribute("NewLine handling between attributes when NewLineOnAttributes=true; Entitize, '\\r\\n'") { Params = new object[] { NewLineHandling.Entitize, "\r\n" }, Id = 56, Priority = 1 } }); - this.AddChild(new TestVariation(EOF_Handling_16) { Attribute = new VariationAttribute("NewLine handling betwwen attributes when NewLineOnAttributes=true; Replace, '\\r\\n'") { Params = new object[] { NewLineHandling.Replace, "\r\n" }, Id = 57, Priority = 1 } }); + this.AddChild(new TestVariation(EOF_Handling_16) { Attribute = new VariationAttribute("NewLine handling between attributes when NewLineOnAttributes=true; Replace, '\\r\\n'") { Params = new object[] { NewLineHandling.Replace, "\r\n" }, Id = 57, Priority = 1 } }); } } public partial class XObjectBuilderTest : BridgeHelpers diff --git a/src/System.Private.Xml.Linq/tests/xNodeBuilder/OmitDuplicateNamespaceDecl.cs b/src/System.Private.Xml.Linq/tests/xNodeBuilder/OmitDuplicateNamespaceDecl.cs index 3a2740403e..a4de882f7c 100644 --- a/src/System.Private.Xml.Linq/tests/xNodeBuilder/OmitDuplicateNamespaceDecl.cs +++ b/src/System.Private.Xml.Linq/tests/xNodeBuilder/OmitDuplicateNamespaceDecl.cs @@ -61,7 +61,7 @@ namespace CoreXml.Test.XLinq ) select a).ToList().Remove(); - // Write XElement using XmlWriter without omiting + // Write XElement using XmlWriter without omitting string removedByManual = SaveXElementUsingXmlWriter(elem, NamespaceHandling.Default); ReaderDiff.Compare(removedByWriter, removedByManual); diff --git a/src/System.Private.Xml.Linq/tests/xNodeBuilder/OmitDuplicatesAnnotation.cs b/src/System.Private.Xml.Linq/tests/xNodeBuilder/OmitDuplicatesAnnotation.cs index cb5578d73f..9a9dc5dfc7 100644 --- a/src/System.Private.Xml.Linq/tests/xNodeBuilder/OmitDuplicatesAnnotation.cs +++ b/src/System.Private.Xml.Linq/tests/xNodeBuilder/OmitDuplicatesAnnotation.cs @@ -59,7 +59,7 @@ namespace CoreXml.Test.XLinq // create normal reader for comparison using (XmlReader r1 = XmlReader.Create(FilePathUtil.getStream(fileName), new XmlReaderSettings() { IgnoreWhitespace = true, DtdProcessing = DtdProcessing.Ignore })) { - // create readr from Xlinq + // create reader from Xlinq XContainer c = GetContainer(fileName, t); using (XmlReader r2 = c.CreateReader()) { diff --git a/src/System.Private.Xml.Linq/tests/xNodeBuilder/SaveOptions_OmitDuplicateNamespace.cs b/src/System.Private.Xml.Linq/tests/xNodeBuilder/SaveOptions_OmitDuplicateNamespace.cs index 2b334d3783..6b8a1a0b6d 100644 --- a/src/System.Private.Xml.Linq/tests/xNodeBuilder/SaveOptions_OmitDuplicateNamespace.cs +++ b/src/System.Private.Xml.Linq/tests/xNodeBuilder/SaveOptions_OmitDuplicateNamespace.cs @@ -133,7 +133,7 @@ namespace CoreXml.Test.XLinq ) select a).ToList().Remove(); - // Write XElement using XmlWriter without omiting + // Write XElement using XmlWriter without omitting string removedByManual = SaveXElement(elemObj, SaveOptions.DisableFormatting); ReaderDiff.Compare(removedByWriter, removedByManual); diff --git a/src/System.Private.Xml.Linq/tests/xNodeBuilder/XmlReaderDiff.cs b/src/System.Private.Xml.Linq/tests/xNodeBuilder/XmlReaderDiff.cs index bdaf01daae..c8bb293e5c 100644 --- a/src/System.Private.Xml.Linq/tests/xNodeBuilder/XmlReaderDiff.cs +++ b/src/System.Private.Xml.Linq/tests/xNodeBuilder/XmlReaderDiff.cs @@ -139,7 +139,7 @@ namespace CoreXml.Test.XLinq } // Verify string / string,string indexers consistency - // note: using int approach to be able to verifyt MoveToFirst/NextAttribute consistency + // note: using int approach to be able to verify MoveToFirst/NextAttribute consistency for (int i = 0; i < filteredAttrs.Length; i++) { var n = filteredAttrs[i]; @@ -197,7 +197,7 @@ namespace CoreXml.Test.XLinq } // compare non-xmlns attributes - // compae xmlns attributes (those in r2 must be in r1) + // compare xmlns attributes (those in r2 must be in r1) // verify r2 namespace stack Compare(origAttrs, filteredAttrs, nsStack, filteredReader.Depth); } @@ -215,7 +215,7 @@ namespace CoreXml.Test.XLinq TestLog.Compare(filteredReader.MoveToNextAttribute(), shouldNAWork, "Move to next attribute :: " + message); TestLog.Compare(SAEqComparer.Instance.Equals(shouldNAWork ? filteredAttrs[attrPosition + 1] : orig, filteredReader.GetSAData()), "MoveToNextAttribute moved to bad position :: " + message); // MoveToFirstAttribute works OK - TestLog.Compare(filteredReader.MoveToFirstAttribute(), "Move to first attribute should allways work :: " + message); + TestLog.Compare(filteredReader.MoveToFirstAttribute(), "Move to first attribute should always work :: " + message); TestLog.Compare(SAEqComparer.Instance.Equals(filteredAttrs[0], filteredReader.GetSAData()), "MoveToNextAttribute moved to bad position :: " + message); } @@ -283,7 +283,7 @@ namespace CoreXml.Test.XLinq found = r1E.Current.SequenceEqual(r2E.Current, StringComparer.Ordinal); if (!found) { - // Verify the one thown out is a) ns decl: b) the nsTable detect it as duplicate + // Verify the one thrown out is a) ns decl: b) the nsTable detect it as duplicate TestLog.Compare(r1E.Current[2] == XNamespace.Xmlns.NamespaceName || r1E.Current[1] == "xmlns", String.Format("Reader removed the non NS declaration attribute: {0},{1},{2},{3}", r1E.Current[0], r1E.Current[1], r1E.Current[2], r1E.Current[3])); TestLog.Compare(nsTable.IsDuplicate(depth, r1E.Current[1], r1E.Current[3]), "The namespace decl was not duplicate"); } diff --git a/src/System.Private.Xml.Linq/tests/xNodeReader/CXMLReaderAttrTest.cs b/src/System.Private.Xml.Linq/tests/xNodeReader/CXMLReaderAttrTest.cs index 92a6531c86..8150eca5f0 100644 --- a/src/System.Private.Xml.Linq/tests/xNodeReader/CXMLReaderAttrTest.cs +++ b/src/System.Private.Xml.Linq/tests/xNodeReader/CXMLReaderAttrTest.cs @@ -967,7 +967,7 @@ namespace CoreXml.Test.XLinq } } - //[TestCase(Name = "MoveToFirstAtribute", Desc = "MoveToFirstAttribute")] + //[TestCase(Name = "MoveToFirstAttribute", Desc = "MoveToFirstAttribute")] public partial class TCMoveToFirstAttribute : BridgeHelpers { //[Variation("MoveToFirstAttribute() When AttributeCount=0, <EMPTY1/> ", Priority = 0)] diff --git a/src/System.Private.Xml.Linq/tests/xNodeReader/CXmlReaderReadEtc.cs b/src/System.Private.Xml.Linq/tests/xNodeReader/CXmlReaderReadEtc.cs index 814c3f49dc..1e940c6707 100644 --- a/src/System.Private.Xml.Linq/tests/xNodeReader/CXmlReaderReadEtc.cs +++ b/src/System.Private.Xml.Linq/tests/xNodeReader/CXmlReaderReadEtc.cs @@ -161,7 +161,7 @@ namespace CoreXml.Test.XLinq BoolToLTMResult(bPassed); } - //[Variation("ReadInnerXml with with entity references, EntityHandling = ExpandEntities")] + //[Variation("ReadInnerXml with entity references, EntityHandling = ExpandEntities")] public void TestReadInnerXml8() { bool bPassed = false; @@ -293,7 +293,7 @@ namespace CoreXml.Test.XLinq TestLog.Compare(VerifyNode(DataReader, XmlNodeType.Text, String.Empty, "yyy"), true, "VN"); } - //[Variation("ReadInnerXml with with entity references, EntityHandling = ExpandCharEntites")] + //[Variation("ReadInnerXml with entity references, EntityHandling = ExpandCharEntites")] public void TestTextReadInnerXml2() { bool bPassed = false; diff --git a/src/System.Private.Xml.Linq/tests/xNodeReader/FunctionalTests.cs b/src/System.Private.Xml.Linq/tests/xNodeReader/FunctionalTests.cs index 19b28c4c1e..4882a4483f 100644 --- a/src/System.Private.Xml.Linq/tests/xNodeReader/FunctionalTests.cs +++ b/src/System.Private.Xml.Linq/tests/xNodeReader/FunctionalTests.cs @@ -54,7 +54,7 @@ namespace CoreXml.Test.XLinq this.AddChild(new TCGetAttributeName() { Attribute = new TestCaseAttribute() { Name = "GetAttributeName", Desc = "GetAttributeName" } }); this.AddChild(new TCThisOrdinal() { Attribute = new TestCaseAttribute() { Name = "ThisOrdinal", Desc = "ThisOrdinal" } }); this.AddChild(new TCMoveToAttributeOrdinal() { Attribute = new TestCaseAttribute() { Name = "MoveToAttributeOrdinal", Desc = "MoveToAttributeOrdinal" } }); - this.AddChild(new TCMoveToFirstAttribute() { Attribute = new TestCaseAttribute() { Name = "MoveToFirstAtribute", Desc = "MoveToFirstAttribute" } }); + this.AddChild(new TCMoveToFirstAttribute() { Attribute = new TestCaseAttribute() { Name = "MoveToFirstAttribute", Desc = "MoveToFirstAttribute" } }); this.AddChild(new TCMoveToNextAttribute() { Attribute = new TestCaseAttribute() { Name = "MoveToNextAttribute", Desc = "MoveToNextAttribute" } }); this.AddChild(new TCAttributeTest() { Attribute = new TestCaseAttribute() { Name = "AttributeTest", Desc = "AttributeTest" } }); this.AddChild(new TCXmlns() { Attribute = new TestCaseAttribute() { Name = "Xlmns", Desc = "Xlmns" } }); @@ -469,7 +469,7 @@ namespace CoreXml.Test.XLinq this.AddChild(new TestVariation(TestReadInnerXml3) { Attribute = new VariationAttribute("ReadInnerXml on non Empty Tag with text content") { Priority = 0 } }); this.AddChild(new TestVariation(TestReadInnerXml6) { Attribute = new VariationAttribute("ReadInnerXml with multiple Level of elements") }); this.AddChild(new TestVariation(TestReadInnerXml7) { Attribute = new VariationAttribute("ReadInnerXml with multiple Level of elements, text and attributes") { Priority = 0 } }); - this.AddChild(new TestVariation(TestReadInnerXml8) { Attribute = new VariationAttribute("ReadInnerXml with with entity references, EntityHandling = ExpandEntities") }); + this.AddChild(new TestVariation(TestReadInnerXml8) { Attribute = new VariationAttribute("ReadInnerXml with entity references, EntityHandling = ExpandEntities") }); this.AddChild(new TestVariation(TestReadInnerXml9) { Attribute = new VariationAttribute("ReadInnerXml on attribute node") { Priority = 0 } }); this.AddChild(new TestVariation(TestReadInnerXml10) { Attribute = new VariationAttribute("ReadInnerXml on attribute node with entity reference in value") { Priority = 0 } }); this.AddChild(new TestVariation(TestReadInnerXml11) { Attribute = new VariationAttribute("ReadInnerXml on Text") { Priority = 0 } }); @@ -480,7 +480,7 @@ namespace CoreXml.Test.XLinq this.AddChild(new TestVariation(TestReadInnerXml17) { Attribute = new VariationAttribute("ReadInnerXml on XmlDeclaration") }); this.AddChild(new TestVariation(TestReadInnerXml18) { Attribute = new VariationAttribute("Current node after ReadInnerXml on element") { Priority = 0 } }); this.AddChild(new TestVariation(TestReadInnerXml19) { Attribute = new VariationAttribute("Current node after ReadInnerXml on element") }); - this.AddChild(new TestVariation(TestTextReadInnerXml2) { Attribute = new VariationAttribute("ReadInnerXml with with entity references, EntityHandling = ExpandCharEntites") }); + this.AddChild(new TestVariation(TestTextReadInnerXml2) { Attribute = new VariationAttribute("ReadInnerXml with entity references, EntityHandling = ExpandCharEntites") }); this.AddChild(new TestVariation(TestTextReadInnerXml4) { Attribute = new VariationAttribute("ReadInnerXml on EntityReference") }); this.AddChild(new TestVariation(TestTextReadInnerXml5) { Attribute = new VariationAttribute("ReadInnerXml on EndEntity") }); this.AddChild(new TestVariation(TestTextReadInnerXml18) { Attribute = new VariationAttribute("One large element") }); @@ -704,7 +704,7 @@ namespace CoreXml.Test.XLinq this.AddChild(new TestVariation(TestReadBase64_18) { Attribute = new VariationAttribute("No op node types") }); this.AddChild(new TestVariation(TestTextReadBase64_23) { Attribute = new VariationAttribute("ReadBase64 with incomplete sequence") }); this.AddChild(new TestVariation(TestTextReadBase64_24) { Attribute = new VariationAttribute("ReadBase64 when end tag doesn't exist") }); - this.AddChild(new TestVariation(TestTextReadBase64_26) { Attribute = new VariationAttribute("ReadBase64 with whitespaces in the mIddle") }); + this.AddChild(new TestVariation(TestTextReadBase64_26) { Attribute = new VariationAttribute("ReadBase64 with whitespace in the mIddle") }); this.AddChild(new TestVariation(TestTextReadBase64_27) { Attribute = new VariationAttribute("ReadBase64 with = in the mIddle") }); this.AddChild(new TestVariation(RunBase64DoesnNotRunIntoOverflow) { Attribute = new VariationAttribute("ReadBase64 runs into an Overflow") { Params = new object[] { "10000000" } } }); this.AddChild(new TestVariation(RunBase64DoesnNotRunIntoOverflow) { Attribute = new VariationAttribute("ReadBase64 runs into an Overflow") { Params = new object[] { "1000000" } } }); @@ -735,7 +735,7 @@ namespace CoreXml.Test.XLinq this.AddChild(new TestVariation(TestReadBase64_17) { Attribute = new VariationAttribute("Current node on multiple calls") }); this.AddChild(new TestVariation(TestTextReadBase64_23) { Attribute = new VariationAttribute("ReadBase64 with incomplete sequence") }); this.AddChild(new TestVariation(TestTextReadBase64_24) { Attribute = new VariationAttribute("ReadBase64 when end tag doesn't exist") }); - this.AddChild(new TestVariation(TestTextReadBase64_26) { Attribute = new VariationAttribute("ReadBase64 with whitespaces in the mIddle") }); + this.AddChild(new TestVariation(TestTextReadBase64_26) { Attribute = new VariationAttribute("ReadBase64 with whitespace in the mIddle") }); this.AddChild(new TestVariation(TestTextReadBase64_27) { Attribute = new VariationAttribute("ReadBase64 with = in the mIddle") }); this.AddChild(new TestVariation(ReadBase64DoesNotRunIntoOverflow2) { Attribute = new VariationAttribute("105376: ReadBase64 runs into an Overflow") { Params = new object[] { "10000000" } } }); this.AddChild(new TestVariation(ReadBase64DoesNotRunIntoOverflow2) { Attribute = new VariationAttribute("105376: ReadBase64 runs into an Overflow") { Params = new object[] { "1000000" } } }); @@ -766,10 +766,10 @@ namespace CoreXml.Test.XLinq this.AddChild(new TestVariation(TestReadBinHex_15) { Attribute = new VariationAttribute("ReadBinHex after failed ReadBinHex") }); this.AddChild(new TestVariation(TestReadBinHex_16) { Attribute = new VariationAttribute("Read after partial ReadBinHex") }); this.AddChild(new TestVariation(TestReadBinHex_17) { Attribute = new VariationAttribute("Current node on multiple calls") }); - this.AddChild(new TestVariation(TestTextReadBinHex_21) { Attribute = new VariationAttribute("ReadBinHex with whitespaces") }); + this.AddChild(new TestVariation(TestTextReadBinHex_21) { Attribute = new VariationAttribute("ReadBinHex with whitespace") }); this.AddChild(new TestVariation(TestTextReadBinHex_22) { Attribute = new VariationAttribute("ReadBinHex with odd number of chars") }); this.AddChild(new TestVariation(TestTextReadBinHex_23) { Attribute = new VariationAttribute("ReadBinHex when end tag doesn't exist") }); - this.AddChild(new TestVariation(TestTextReadBinHex_24) { Attribute = new VariationAttribute("WS:WireCompat:hex binary fails to send/return data after 1787 bytes going whIdbey to everett") }); + this.AddChild(new TestVariation(TestTextReadBinHex_24) { Attribute = new VariationAttribute("WS:WireCompat:hex binary fails to send/return data after 1787 bytes going Whidbey to Everett") }); this.AddChild(new TestVariation(DebugAssertInReadContentAsBinHex) { Attribute = new VariationAttribute("DebugAssert in ReadContentAsBinHex") }); } } @@ -795,10 +795,10 @@ namespace CoreXml.Test.XLinq this.AddChild(new TestVariation(TestReadBinHex_14) { Attribute = new VariationAttribute("ReadBinHex with buffer == null") }); this.AddChild(new TestVariation(TestReadBinHex_15) { Attribute = new VariationAttribute("ReadBinHex after failed ReadBinHex") }); this.AddChild(new TestVariation(TestReadBinHex_16) { Attribute = new VariationAttribute("Read after partial ReadBinHex") }); - this.AddChild(new TestVariation(TestTextReadBinHex_21) { Attribute = new VariationAttribute("ReadBinHex with whitespaces") }); + this.AddChild(new TestVariation(TestTextReadBinHex_21) { Attribute = new VariationAttribute("ReadBinHex with whitespace") }); this.AddChild(new TestVariation(TestTextReadBinHex_22) { Attribute = new VariationAttribute("ReadBinHex with odd number of chars") }); this.AddChild(new TestVariation(TestTextReadBinHex_23) { Attribute = new VariationAttribute("ReadBinHex when end tag doesn't exist") }); - this.AddChild(new TestVariation(TestTextReadBinHex_24) { Attribute = new VariationAttribute("WS:WireCompat:hex binary fails to send/return data after 1787 bytes going whIdbey to everett") }); + this.AddChild(new TestVariation(TestTextReadBinHex_24) { Attribute = new VariationAttribute("WS:WireCompat:hex binary fails to send/return data after 1787 bytes going Whidbey to Everett") }); this.AddChild(new TestVariation(TestTextReadBinHex_25) { Attribute = new VariationAttribute("SubtreeReader inserted attributes don't work with ReadContentAsBinHex") }); } } @@ -978,12 +978,12 @@ namespace CoreXml.Test.XLinq this.AddChild(new TestVariation(TestReadChar16) { Attribute = new VariationAttribute("Read after partial ReadValue") }); this.AddChild(new TestVariation(TestReadChar19) { Attribute = new VariationAttribute("Test error after successful ReadValue") }); this.AddChild(new TestVariation(TestReadChar21) { Attribute = new VariationAttribute("Call on invalid element content after 4k boundary") { Priority = 1 } }); - this.AddChild(new TestVariation(TestTextReadValue25) { Attribute = new VariationAttribute("ReadValue with whitespaces") }); + this.AddChild(new TestVariation(TestTextReadValue25) { Attribute = new VariationAttribute("ReadValue with whitespace") }); this.AddChild(new TestVariation(TestTextReadValue26) { Attribute = new VariationAttribute("ReadValue when end tag doesn't exist") }); this.AddChild(new TestVariation(TestCharEntities0) { Attribute = new VariationAttribute("Testing with character entities") }); this.AddChild(new TestVariation(TestCharEntities1) { Attribute = new VariationAttribute("Testing with character entities when value more than 4k") }); this.AddChild(new TestVariation(TestCharEntities2) { Attribute = new VariationAttribute("Testing with character entities with another pattern") }); - this.AddChild(new TestVariation(TestReadValueOnBig) { Attribute = new VariationAttribute("Testing a usecase pattern with large file") }); + this.AddChild(new TestVariation(TestReadValueOnBig) { Attribute = new VariationAttribute("Testing a use case pattern with large file") }); this.AddChild(new TestVariation(TestReadValueOnComments0) { Attribute = new VariationAttribute("ReadValue on Comments with IgnoreComments") }); this.AddChild(new TestVariation(TestReadValueOnPIs0) { Attribute = new VariationAttribute("ReadValue on PI with IgnorePI") }); this.AddChild(new TestVariation(bug340158) { Attribute = new VariationAttribute("Skip after ReadAttributeValue/ReadValueChunk") }); diff --git a/src/System.Private.Xml.Linq/tests/xNodeReader/ReadBase64.cs b/src/System.Private.Xml.Linq/tests/xNodeReader/ReadBase64.cs index 8d65254525..929953ec34 100644 --- a/src/System.Private.Xml.Linq/tests/xNodeReader/ReadBase64.cs +++ b/src/System.Private.Xml.Linq/tests/xNodeReader/ReadBase64.cs @@ -416,7 +416,7 @@ namespace CoreXml.Test.XLinq } } - //[Variation("ReadBase64 with whitespaces in the mIddle")] + //[Variation("ReadBase64 with whitespace in the mIddle")] public void TestTextReadBase64_26() { byte[] buffer = new byte[1]; @@ -879,7 +879,7 @@ namespace CoreXml.Test.XLinq } } - //[Variation("ReadBase64 with whitespaces in the mIddle")] + //[Variation("ReadBase64 with whitespace in the mIddle")] public void TestTextReadBase64_26() { byte[] buffer = new byte[1]; diff --git a/src/System.Private.Xml.Linq/tests/xNodeReader/ReadBinHex.cs b/src/System.Private.Xml.Linq/tests/xNodeReader/ReadBinHex.cs index a1f22f1d6c..0228d8b419 100644 --- a/src/System.Private.Xml.Linq/tests/xNodeReader/ReadBinHex.cs +++ b/src/System.Private.Xml.Linq/tests/xNodeReader/ReadBinHex.cs @@ -373,7 +373,7 @@ namespace CoreXml.Test.XLinq TestLog.Compare(VerifyNode(DataReader, XmlNodeType.EndElement, "ElemNum", String.Empty), "1vn"); } - //[Variation("ReadBinHex with whitespaces")] + //[Variation("ReadBinHex with whitespace")] public void TestTextReadBinHex_21() { byte[] buffer = new byte[1]; @@ -430,7 +430,7 @@ namespace CoreXml.Test.XLinq } } - //[Variation("WS:WireCompat:hex binary fails to send/return data after 1787 bytes going whIdbey to everett")] + //[Variation("WS:WireCompat:hex binary fails to send/return data after 1787 bytes going Whidbey to Everett")] public void TestTextReadBinHex_24() { string filename = Path.Combine("TestData", "XmlReader", "Common", "Bug99148.xml"); @@ -797,7 +797,7 @@ namespace CoreXml.Test.XLinq TestLog.Compare(DataReader.NodeType, XmlNodeType.Text, "Not on text node"); } - //[Variation("ReadBinHex with whitespaces")] + //[Variation("ReadBinHex with whitespace")] public void TestTextReadBinHex_21() { byte[] buffer = new byte[1]; @@ -850,7 +850,7 @@ namespace CoreXml.Test.XLinq } } - //[Variation("WS:WireCompat:hex binary fails to send/return data after 1787 bytes going whIdbey to everett")] + //[Variation("WS:WireCompat:hex binary fails to send/return data after 1787 bytes going Whidbey to Everett")] public void TestTextReadBinHex_24() { string filename = Path.Combine("TestData", "XmlReader", "Common", "Bug99148.xml"); diff --git a/src/System.Private.Xml.Linq/tests/xNodeReader/ReadToDescendant.cs b/src/System.Private.Xml.Linq/tests/xNodeReader/ReadToDescendant.cs index 8cbddef018..de6cb2c64d 100644 --- a/src/System.Private.Xml.Linq/tests/xNodeReader/ReadToDescendant.cs +++ b/src/System.Private.Xml.Linq/tests/xNodeReader/ReadToDescendant.cs @@ -276,7 +276,7 @@ namespace CoreXml.Test.XLinq TestLog.Compare(DataReader.ReadToDescendant("child1"), true, "Cant find child1"); TestLog.Compare(DataReader.ReadToDescendant("child2"), true, "Cant find child2"); TestLog.Compare(DataReader.ReadToDescendant("child3"), true, "Cant find child3"); - TestLog.Compare(DataReader.ReadToDescendant("child4"), false, "shouldnt find child4"); + TestLog.Compare(DataReader.ReadToDescendant("child4"), false, "Shouldn't find child4"); TestLog.Compare(DataReader.NodeType, XmlNodeType.Element, "Not on EndElement"); DataReader.Read(); TestLog.Compare(DataReader.NodeType, XmlNodeType.Text, "Not on Element"); @@ -295,7 +295,7 @@ namespace CoreXml.Test.XLinq TestLog.Compare(DataReader.ReadToDescendant("child1", "elem"), true, "Cant find child1"); TestLog.Compare(DataReader.ReadToDescendant("child2", "child2"), true, "Cant find child2"); TestLog.Compare(DataReader.ReadToDescendant("child3", "child2"), true, "Cant find child3"); - TestLog.Compare(DataReader.ReadToDescendant("child4", "child2"), false, "shouldnt find child4"); + TestLog.Compare(DataReader.ReadToDescendant("child4", "child2"), false, "Shouldn't find child4"); TestLog.Compare(DataReader.NodeType, XmlNodeType.Element, "Not on EndElement"); DataReader.Read(); TestLog.Compare(DataReader.NodeType, XmlNodeType.Text, "Not on Element"); @@ -314,7 +314,7 @@ namespace CoreXml.Test.XLinq TestLog.Compare(DataReader.ReadToDescendant("e:child1"), true, "Cant find child1"); TestLog.Compare(DataReader.ReadToDescendant("e:child2"), true, "Cant find child2"); TestLog.Compare(DataReader.ReadToDescendant("e:child3"), true, "Cant find child3"); - TestLog.Compare(DataReader.ReadToDescendant("e:child4"), false, "shouldnt find child4"); + TestLog.Compare(DataReader.ReadToDescendant("e:child4"), false, "Shouldn't find child4"); TestLog.Compare(DataReader.NodeType, XmlNodeType.Element, "Not on EndElement"); DataReader.Read(); TestLog.Compare(DataReader.NodeType, XmlNodeType.Text, "Not on Element"); diff --git a/src/System.Private.Xml.Linq/tests/xNodeReader/ReadToFollowing.cs b/src/System.Private.Xml.Linq/tests/xNodeReader/ReadToFollowing.cs index a741fcb82c..733880d421 100644 --- a/src/System.Private.Xml.Linq/tests/xNodeReader/ReadToFollowing.cs +++ b/src/System.Private.Xml.Linq/tests/xNodeReader/ReadToFollowing.cs @@ -216,7 +216,7 @@ namespace CoreXml.Test.XLinq TestLog.Compare(DataReader.ReadToFollowing("child1"), true, "Cant find child1"); TestLog.Compare(DataReader.ReadToFollowing("child2"), true, "Cant find child2"); TestLog.Compare(DataReader.ReadToFollowing("child3"), true, "Cant find child3"); - TestLog.Compare(DataReader.ReadToFollowing("child4"), true, "shouldnt find child4"); + TestLog.Compare(DataReader.ReadToFollowing("child4"), true, "Shouldn't find child4"); TestLog.Compare(DataReader.NodeType, XmlNodeType.Element, "Not on Element"); while (DataReader.Read()) ; diff --git a/src/System.Private.Xml.Linq/tests/xNodeReader/ReadToNextSibling.cs b/src/System.Private.Xml.Linq/tests/xNodeReader/ReadToNextSibling.cs index 15bb901d75..4c7089aac7 100644 --- a/src/System.Private.Xml.Linq/tests/xNodeReader/ReadToNextSibling.cs +++ b/src/System.Private.Xml.Linq/tests/xNodeReader/ReadToNextSibling.cs @@ -173,9 +173,9 @@ namespace CoreXml.Test.XLinq XmlReader DataReader = GetReader(new StringReader(mnw.GetNodes())); PositionOnElement(DataReader, "ELEMENT_1"); - TestLog.Compare(DataReader.ReadToDescendant("a"), true, "Couldnt go to Descendant"); + TestLog.Compare(DataReader.ReadToDescendant("a"), true, "Couldn't go to Descendant"); int depth = DataReader.Depth; - TestLog.Compare(DataReader.ReadToNextSibling("b"), true, "Couldnt go to NextSibling"); + TestLog.Compare(DataReader.ReadToNextSibling("b"), true, "Couldn't go to NextSibling"); TestLog.Compare(DataReader.Depth, depth, "Depth is not correct"); TestLog.Compare(DataReader.NodeType, XmlNodeType.Element, "Nodetype is not correct"); diff --git a/src/System.Private.Xml.Linq/tests/xNodeReader/ReadValue.cs b/src/System.Private.Xml.Linq/tests/xNodeReader/ReadValue.cs index 5d92d9348c..599b5ee787 100644 --- a/src/System.Private.Xml.Linq/tests/xNodeReader/ReadValue.cs +++ b/src/System.Private.Xml.Linq/tests/xNodeReader/ReadValue.cs @@ -75,7 +75,7 @@ namespace CoreXml.Test.XLinq } } - TestLog.Compare(DataReader.ReadValueChunk(buffer, 0, 5), 5, "Didnt read 5 chars"); + TestLog.Compare(DataReader.ReadValueChunk(buffer, 0, 5), 5, "Didn't read 5 chars"); TestLog.Compare("value", new string(buffer), "Strings don't match"); } @@ -108,7 +108,7 @@ namespace CoreXml.Test.XLinq return; } - throw new TestFailedException("ReadValue didnt throw expected exception"); + throw new TestFailedException("ReadValue didn't throw expected exception"); } //[Variation("ReadValue on Attribute", Priority = 0)] @@ -131,7 +131,7 @@ namespace CoreXml.Test.XLinq return; } } - TestLog.Compare(DataReader.ReadValueChunk(buffer, 0, 5), 5, "Didnt read 5 chars"); + TestLog.Compare(DataReader.ReadValueChunk(buffer, 0, 5), 5, "Didn't read 5 chars"); TestLog.Compare("value", new string(buffer), "Strings don't match"); TestLog.Compare(DataReader.ReadValueChunk(buffer, 0, 5), 0, "Did read 5 chars"); } @@ -157,14 +157,14 @@ namespace CoreXml.Test.XLinq return; } } - TestLog.Compare(DataReader.ReadAttributeValue(), true, "Didnt read attribute value"); - TestLog.Compare(DataReader.Value, "value", "Didnt read correct attribute value"); - TestLog.Compare(DataReader.ReadValueChunk(buffer, 0, 5), 5, "Didnt read 5 chars"); + TestLog.Compare(DataReader.ReadAttributeValue(), true, "Didn't read attribute value"); + TestLog.Compare(DataReader.Value, "value", "Didn't read correct attribute value"); + TestLog.Compare(DataReader.ReadValueChunk(buffer, 0, 5), 5, "Didn't read 5 chars"); TestLog.Compare("value", new string(buffer), "Strings don't match"); TestLog.Compare(DataReader.ReadValueChunk(buffer, 0, 5), 0, "Did read 5 chars"); DataReader.MoveToElement(); DataReader.Read(); - TestLog.Compare(DataReader.ReadValueChunk(buffer, 0, 5), 5, "Didnt read 5 chars on text node"); + TestLog.Compare(DataReader.ReadValueChunk(buffer, 0, 5), 5, "Didn't read 5 chars on text node"); TestLog.Compare("value", new string(buffer), "Strings don't match"); TestLog.Compare(DataReader.ReadValueChunk(buffer, 0, 5), 0, "Did read 5 chars on text node"); } @@ -199,7 +199,7 @@ namespace CoreXml.Test.XLinq return; } - throw new TestFailedException("ReadValue didnt throw expected exception"); + throw new TestFailedException("ReadValue didn't throw expected exception"); } //[Variation("ReadValue on negative count", Priority = 0)] @@ -231,7 +231,7 @@ namespace CoreXml.Test.XLinq return; } - throw new TestFailedException("ReadValue didnt throw expected exception"); + throw new TestFailedException("ReadValue didn't throw expected exception"); } //[Variation("ReadValue on negative offset", Priority = 0)] @@ -262,7 +262,7 @@ namespace CoreXml.Test.XLinq return; } - throw new TestFailedException("ReadValue didnt throw expected exception"); + throw new TestFailedException("ReadValue didn't throw expected exception"); } //[Variation("ReadValue with buffer = element content / 2", Priority = 0)] @@ -287,10 +287,10 @@ namespace CoreXml.Test.XLinq } } - TestLog.Compare(DataReader.ReadValueChunk(buffer, 0, 5), 5, "Didnt read first 5"); + TestLog.Compare(DataReader.ReadValueChunk(buffer, 0, 5), 5, "Didn't read first 5"); TestLog.Compare("01234", new string(buffer), "First strings don't match"); - TestLog.Compare(DataReader.ReadValueChunk(buffer, 0, 5), 5, "Didnt read second 5 chars"); + TestLog.Compare(DataReader.ReadValueChunk(buffer, 0, 5), 5, "Didn't read second 5 chars"); TestLog.Compare("56789", new string(buffer), "Second strings don't match"); } @@ -315,7 +315,7 @@ namespace CoreXml.Test.XLinq } } - TestLog.Compare(DataReader.ReadValueChunk(buffer, 0, 10), 10, "Didnt read 10"); + TestLog.Compare(DataReader.ReadValueChunk(buffer, 0, 10), 10, "Didn't read 10"); TestLog.Compare("0123456789", new string(buffer), "Strings don't match"); } @@ -622,7 +622,7 @@ namespace CoreXml.Test.XLinq return; } - TestLog.WriteLine("Couldnt read after ArgumentException"); + TestLog.WriteLine("Couldn't read after ArgumentException"); throw new TestException(TestResult.Failed, ""); } @@ -723,7 +723,7 @@ namespace CoreXml.Test.XLinq throw new TestException(TestResult.Failed, ""); } - //[Variation("ReadValue with whitespaces")] + //[Variation("ReadValue with whitespace")] public void TestTextReadValue25() { string strExpected = "somevalue"; @@ -784,7 +784,7 @@ namespace CoreXml.Test.XLinq return; } } - TestLog.Compare(DataReader.ReadValueChunk(buffer, 0, 5), 5, "Didnt read 5 chars"); + TestLog.Compare(DataReader.ReadValueChunk(buffer, 0, 5), 5, "Didn't read 5 chars"); TestLog.Compare("value", new string(buffer), "Strings don't match"); DataReader.Read(); throw new TestException(TestResult.Failed, ""); @@ -879,7 +879,7 @@ namespace CoreXml.Test.XLinq TestLog.Compare(DataReader.NodeType, XmlNodeType.None, "Not on End"); } - //[Variation("Testing a usecase pattern with large file")] + //[Variation("Testing a use case pattern with large file")] public void TestReadValueOnBig() { XmlReader DataReader = GetReader(); @@ -943,7 +943,7 @@ namespace CoreXml.Test.XLinq DataReader.Read(); try { - TestLog.Compare(DataReader.ReadValueChunk(buffer, 0, 3), 3, "Didnt read 3 chars"); + TestLog.Compare(DataReader.ReadValueChunk(buffer, 0, 3), 3, "Didn't read 3 chars"); throw new TestException(TestResult.Failed, ""); } catch (NotSupportedException) { } @@ -952,7 +952,7 @@ namespace CoreXml.Test.XLinq DataReader.Read(); try { - TestLog.Compare(DataReader.ReadValueChunk(buffer, 0, 2), 2, "Didnt read 2 chars"); + TestLog.Compare(DataReader.ReadValueChunk(buffer, 0, 2), 2, "Didn't read 2 chars"); throw new TestException(TestResult.Failed, ""); } catch (NotSupportedException) { } @@ -971,7 +971,7 @@ namespace CoreXml.Test.XLinq DataReader.Read(); try { - TestLog.Compare(DataReader.ReadValueChunk(buffer, 0, 3), 3, "Didnt read 3 chars"); + TestLog.Compare(DataReader.ReadValueChunk(buffer, 0, 3), 3, "Didn't read 3 chars"); throw new TestException(TestResult.Failed, ""); } catch (NotSupportedException) { } @@ -980,7 +980,7 @@ namespace CoreXml.Test.XLinq DataReader.Read(); try { - TestLog.Compare(DataReader.ReadValueChunk(buffer, 0, 2), 2, "Didnt read 2 chars"); + TestLog.Compare(DataReader.ReadValueChunk(buffer, 0, 2), 2, "Didn't read 2 chars"); throw new TestException(TestResult.Failed, ""); } catch (NotSupportedException) { } |