Rename XML to lowercase Xml in classes and names for consistency
This commit is contained in:
1 parent
33618b4c97
commit
dd6b0416b6
20 files changed
+57
-57
No files matched your search
@@ -92,7 +92,7 @@ namespace VocaluxeLib.Menu
|
|||||||
#endregion Constructors
|
#endregion Constructors
|
||||||
|
|
||||||
#region public
|
#region public
|
||||||
public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader)
|
public bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader)
|
||||||
{
|
{
|
||||||
string item = xmlPath + "/" + elementName;
|
string item = xmlPath + "/" + elementName;
|
||||||
_ThemeLoaded = true;
|
_ThemeLoaded = true;
|
||||||
|
|||||||
@@ -158,7 +158,7 @@ namespace VocaluxeLib.Menu
|
|||||||
_SelReflectionSpace = button._SelReflectionSpace;
|
_SelReflectionSpace = button._SelReflectionSpace;
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader)
|
public bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader)
|
||||||
{
|
{
|
||||||
string item = xmlPath + "/" + elementName;
|
string item = xmlPath + "/" + elementName;
|
||||||
_ThemeLoaded = true;
|
_ThemeLoaded = true;
|
||||||
|
|||||||
@@ -101,7 +101,7 @@ namespace VocaluxeLib.Menu
|
|||||||
LoadSkin();
|
LoadSkin();
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader)
|
public bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader)
|
||||||
{
|
{
|
||||||
string item = xmlPath + "/" + elementName;
|
string item = xmlPath + "/" + elementName;
|
||||||
_ThemeLoaded = true;
|
_ThemeLoaded = true;
|
||||||
|
|||||||
@@ -109,7 +109,7 @@ namespace VocaluxeLib.Menu
|
|||||||
LoadSkin();
|
LoadSkin();
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader)
|
public bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader)
|
||||||
{
|
{
|
||||||
string item = xmlPath + "/" + elementName;
|
string item = xmlPath + "/" + elementName;
|
||||||
_ThemeLoaded = true;
|
_ThemeLoaded = true;
|
||||||
|
|||||||
@@ -126,7 +126,7 @@ namespace VocaluxeLib.Menu
|
|||||||
|
|
||||||
private delegate void AddElementHandler<in T>(T element, String key);
|
private delegate void AddElementHandler<in T>(T element, String key);
|
||||||
|
|
||||||
private void _LoadThemeElement<T>(IEnumerable<string> elements, AddElementHandler<T> addElementHandler, CXMLReader xmlReader) where T : IThemeable
|
private void _LoadThemeElement<T>(IEnumerable<string> elements, AddElementHandler<T> addElementHandler, CXmlReader xmlReader) where T : IThemeable
|
||||||
{
|
{
|
||||||
if (elements != null)
|
if (elements != null)
|
||||||
{
|
{
|
||||||
@@ -243,7 +243,7 @@ namespace VocaluxeLib.Menu
|
|||||||
{
|
{
|
||||||
string file = Path.Combine(xmlPath, ThemeName + ".xml");
|
string file = Path.Combine(xmlPath, ThemeName + ".xml");
|
||||||
|
|
||||||
CXMLReader xmlReader = CXMLReader.OpenFile(file);
|
CXmlReader xmlReader = CXmlReader.OpenFile(file);
|
||||||
if (xmlReader == null)
|
if (xmlReader == null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -582,7 +582,7 @@ namespace VocaluxeLib.Menu
|
|||||||
}
|
}
|
||||||
|
|
||||||
#region Theme Handling
|
#region Theme Handling
|
||||||
private bool _CheckVersion(int reqVersion, CXMLReader xmlReader)
|
private bool _CheckVersion(int reqVersion, CXmlReader xmlReader)
|
||||||
{
|
{
|
||||||
int actualVersion = 0;
|
int actualVersion = 0;
|
||||||
xmlReader.TryGetIntValue("//root/" + ThemeName + "/ScreenVersion", ref actualVersion);
|
xmlReader.TryGetIntValue("//root/" + ThemeName + "/ScreenVersion", ref actualVersion);
|
||||||
@@ -600,7 +600,7 @@ namespace VocaluxeLib.Menu
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void _LoadThemeBasics(CXMLReader xmlReader)
|
private void _LoadThemeBasics(CXmlReader xmlReader)
|
||||||
{
|
{
|
||||||
// Backgrounds
|
// Backgrounds
|
||||||
var background = new CBackground(PartyModeID);
|
var background = new CBackground(PartyModeID);
|
||||||
|
|||||||
@@ -148,7 +148,7 @@ namespace VocaluxeLib.Menu
|
|||||||
UpdateList(0);
|
UpdateList(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader)
|
public bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader)
|
||||||
{
|
{
|
||||||
string item = xmlPath + "/" + elementName;
|
string item = xmlPath + "/" + elementName;
|
||||||
_ThemeLoaded = true;
|
_ThemeLoaded = true;
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ namespace VocaluxeLib.Menu
|
|||||||
LoadSkin();
|
LoadSkin();
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader)
|
public bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader)
|
||||||
{
|
{
|
||||||
string item = xmlPath + "/" + elementName;
|
string item = xmlPath + "/" + elementName;
|
||||||
_ThemeLoaded = true;
|
_ThemeLoaded = true;
|
||||||
|
|||||||
@@ -274,7 +274,7 @@ namespace VocaluxeLib.Menu
|
|||||||
LoadSkin();
|
LoadSkin();
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader)
|
public bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader)
|
||||||
{
|
{
|
||||||
string item = xmlPath + "/" + elementName;
|
string item = xmlPath + "/" + elementName;
|
||||||
_ThemeLoaded = true;
|
_ThemeLoaded = true;
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ namespace VocaluxeLib.Menu
|
|||||||
_Theme = theme;
|
_Theme = theme;
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader)
|
public bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader)
|
||||||
{
|
{
|
||||||
string item = xmlPath + "/" + elementName;
|
string item = xmlPath + "/" + elementName;
|
||||||
_ThemeLoaded = true;
|
_ThemeLoaded = true;
|
||||||
|
|||||||
@@ -270,7 +270,7 @@ namespace VocaluxeLib.Menu
|
|||||||
LoadSkin();
|
LoadSkin();
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader)
|
public bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader)
|
||||||
{
|
{
|
||||||
string item = xmlPath + "/" + elementName;
|
string item = xmlPath + "/" + elementName;
|
||||||
_ThemeLoaded = true;
|
_ThemeLoaded = true;
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ namespace VocaluxeLib.Menu
|
|||||||
LoadSkin();
|
LoadSkin();
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader)
|
public bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader)
|
||||||
{
|
{
|
||||||
string item = xmlPath + "/" + elementName;
|
string item = xmlPath + "/" + elementName;
|
||||||
_ThemeLoaded = true;
|
_ThemeLoaded = true;
|
||||||
|
|||||||
@@ -298,12 +298,12 @@ namespace VocaluxeLib.Menu
|
|||||||
LoadSkin();
|
LoadSkin();
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader)
|
public bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader)
|
||||||
{
|
{
|
||||||
return LoadTheme(xmlPath, elementName, xmlReader, false);
|
return LoadTheme(xmlPath, elementName, xmlReader, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader, bool buttonText)
|
public bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader, bool buttonText)
|
||||||
{
|
{
|
||||||
string item = xmlPath + "/" + elementName;
|
string item = xmlPath + "/" + elementName;
|
||||||
_ThemeLoaded = true;
|
_ThemeLoaded = true;
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ namespace VocaluxeLib.Menu
|
|||||||
{
|
{
|
||||||
string GetThemeName();
|
string GetThemeName();
|
||||||
|
|
||||||
bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader);
|
bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader);
|
||||||
|
|
||||||
void UnloadSkin();
|
void UnloadSkin();
|
||||||
void LoadSkin();
|
void LoadSkin();
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ namespace VocaluxeLib.Menu.SingNotes
|
|||||||
get { return _ThemeLoaded; }
|
get { return _ThemeLoaded; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader)
|
public bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader)
|
||||||
{
|
{
|
||||||
string item = xmlPath + "/" + elementName;
|
string item = xmlPath + "/" + elementName;
|
||||||
_ThemeLoaded = true;
|
_ThemeLoaded = true;
|
||||||
|
|||||||
@@ -174,7 +174,7 @@ namespace VocaluxeLib.Menu.SongMenu
|
|||||||
return _Theme;
|
return _Theme;
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader)
|
public virtual bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader)
|
||||||
{
|
{
|
||||||
string item = xmlPath + "/" + elementName;
|
string item = xmlPath + "/" + elementName;
|
||||||
_ThemeLoaded = true;
|
_ThemeLoaded = true;
|
||||||
|
|||||||
@@ -120,7 +120,7 @@ namespace VocaluxeLib.Menu.SongMenu
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public override bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader)
|
public override bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader)
|
||||||
{
|
{
|
||||||
string item = xmlPath + "/" + elementName;
|
string item = xmlPath + "/" + elementName;
|
||||||
|
|
||||||
|
|||||||
@@ -111,7 +111,7 @@
|
|||||||
<Compile Include="XmlStructs.cs" />
|
<Compile Include="XmlStructs.cs" />
|
||||||
<Compile Include="Xml\CTypeExtensions.cs" />
|
<Compile Include="Xml\CTypeExtensions.cs" />
|
||||||
<Compile Include="Xml\CXmlDeserializer.cs" />
|
<Compile Include="Xml\CXmlDeserializer.cs" />
|
||||||
<Compile Include="Xml\CXMLReader.cs" />
|
<Compile Include="Xml\CXmlReader.cs" />
|
||||||
<Compile Include="Xml\CXmlReaderBase.cs" />
|
<Compile Include="Xml\CXmlReaderBase.cs" />
|
||||||
<Compile Include="Xml\CXmlSerializer.cs" />
|
<Compile Include="Xml\CXmlSerializer.cs" />
|
||||||
<Compile Include="Enums.cs" />
|
<Compile Include="Enums.cs" />
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ using System.Xml.XPath;
|
|||||||
|
|
||||||
namespace VocaluxeLib.Xml
|
namespace VocaluxeLib.Xml
|
||||||
{
|
{
|
||||||
public class CXMLReader : CXmlReaderBase
|
public class CXmlReader : CXmlReaderBase
|
||||||
{
|
{
|
||||||
private readonly XPathNavigator _Navigator;
|
private readonly XPathNavigator _Navigator;
|
||||||
private readonly String _FilePath;
|
private readonly String _FilePath;
|
||||||
@@ -32,7 +32,7 @@ namespace VocaluxeLib.Xml
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Private method. Use OpenFile factory method to get an instance
|
//Private method. Use OpenFile factory method to get an instance
|
||||||
private CXMLReader(string uri)
|
private CXmlReader(string uri)
|
||||||
{
|
{
|
||||||
_FilePath = uri;
|
_FilePath = uri;
|
||||||
var xmlDoc = new XPathDocument(uri);
|
var xmlDoc = new XPathDocument(uri);
|
||||||
@@ -44,11 +44,11 @@ namespace VocaluxeLib.Xml
|
|||||||
get { return _Navigator; }
|
get { return _Navigator; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public static CXMLReader OpenFile(string fileName)
|
public static CXmlReader OpenFile(string fileName)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
return new CXMLReader(fileName);
|
return new CXmlReader(fileName);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ namespace VocaluxeLib.Xml
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Uniform settings for writing XML files. ALWAYS use this!
|
/// Uniform settings for writing XML files. ALWAYS use this!
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private readonly XmlWriterSettings _XMLSettings = new XmlWriterSettings
|
private readonly XmlWriterSettings _XmlSettings = new XmlWriterSettings
|
||||||
{
|
{
|
||||||
Indent = true,
|
Indent = true,
|
||||||
Encoding = Encoding.UTF8,
|
Encoding = Encoding.UTF8,
|
||||||
@@ -217,7 +217,7 @@ namespace VocaluxeLib.Xml
|
|||||||
/// <param name="rootNodeName">Name of the root node (overwrites default value specified by XmlRoot/XmlTypeAttributes which defaults to "root")</param>
|
/// <param name="rootNodeName">Name of the root node (overwrites default value specified by XmlRoot/XmlTypeAttributes which defaults to "root")</param>
|
||||||
public void Serialize(string filePath, object o, string rootNodeName = null)
|
public void Serialize(string filePath, object o, string rootNodeName = null)
|
||||||
{
|
{
|
||||||
using (XmlWriter writer = XmlWriter.Create(filePath, _XMLSettings))
|
using (XmlWriter writer = XmlWriter.Create(filePath, _XmlSettings))
|
||||||
_Serialize(writer, o, rootNodeName);
|
_Serialize(writer, o, rootNodeName);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -230,7 +230,7 @@ namespace VocaluxeLib.Xml
|
|||||||
public string Serialize(object o, string rootNodeName = null)
|
public string Serialize(object o, string rootNodeName = null)
|
||||||
{
|
{
|
||||||
MemoryStream result = new MemoryStream();
|
MemoryStream result = new MemoryStream();
|
||||||
using (XmlWriter writer = XmlWriter.Create(result, _XMLSettings))
|
using (XmlWriter writer = XmlWriter.Create(result, _XmlSettings))
|
||||||
_Serialize(writer, o, rootNodeName);
|
_Serialize(writer, o, rootNodeName);
|
||||||
result.Position = 0;
|
result.Position = 0;
|
||||||
return new StreamReader(result).ReadToEnd();
|
return new StreamReader(result).ReadToEnd();
|
||||||
|
|||||||
@@ -211,7 +211,7 @@ namespace VocaluxeTests
|
|||||||
_AssertSerDeserMatch<SBasic>(s);
|
_AssertSerDeserMatch<SBasic>(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
private readonly string[] _XMLList = new string[]
|
private readonly string[] _XmlList = new string[]
|
||||||
{
|
{
|
||||||
_Head + @"<root>
|
_Head + @"<root>
|
||||||
<Ints>
|
<Ints>
|
||||||
@@ -237,21 +237,21 @@ namespace VocaluxeTests
|
|||||||
{
|
{
|
||||||
var xml = new CXmlDeserializer();
|
var xml = new CXmlDeserializer();
|
||||||
var ser = new CXmlSerializer();
|
var ser = new CXmlSerializer();
|
||||||
SList foo = xml.DeserializeString<SList>(_XMLList[0]);
|
SList foo = xml.DeserializeString<SList>(_XmlList[0]);
|
||||||
Assert.AreEqual(foo.Ints.Count, 2, "Deserialization failed");
|
Assert.AreEqual(foo.Ints.Count, 2, "Deserialization failed");
|
||||||
Assert.AreEqual(foo.Ints[0].I, 1, "Deserialization failed");
|
Assert.AreEqual(foo.Ints[0].I, 1, "Deserialization failed");
|
||||||
Assert.AreEqual(foo.Ints[1].I, 1, "Deserialization failed");
|
Assert.AreEqual(foo.Ints[1].I, 1, "Deserialization failed");
|
||||||
string res = ser.Serialize(foo);
|
string res = ser.Serialize(foo);
|
||||||
Assert.AreEqual(_XMLList[0], res, "Serialization failed");
|
Assert.AreEqual(_XmlList[0], res, "Serialization failed");
|
||||||
foo = xml.DeserializeString<SList>(_XMLList[1]);
|
foo = xml.DeserializeString<SList>(_XmlList[1]);
|
||||||
Assert.AreEqual(foo.Ints.Count, 0, "Deserialization2 failed");
|
Assert.AreEqual(foo.Ints.Count, 0, "Deserialization2 failed");
|
||||||
res = ser.Serialize(foo);
|
res = ser.Serialize(foo);
|
||||||
Assert.AreEqual(_XMLList[2], res, "Serialization2 failed");
|
Assert.AreEqual(_XmlList[2], res, "Serialization2 failed");
|
||||||
foo = xml.DeserializeString<SList>(_XMLList[2]);
|
foo = xml.DeserializeString<SList>(_XmlList[2]);
|
||||||
Assert.AreEqual(foo.Ints.Count, 0, "Deserialization2 failed");
|
Assert.AreEqual(foo.Ints.Count, 0, "Deserialization2 failed");
|
||||||
_AssertSerDeserMatch<SList>(_XMLList[2]);
|
_AssertSerDeserMatch<SList>(_XmlList[2]);
|
||||||
res = ser.Serialize(foo);
|
res = ser.Serialize(foo);
|
||||||
Assert.AreEqual(_XMLList[2], res, "Serialization2 failed");
|
Assert.AreEqual(_XmlList[2], res, "Serialization2 failed");
|
||||||
_AssertFail<SList, CXmlException>(_Empty);
|
_AssertFail<SList, CXmlException>(_Empty);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -260,31 +260,31 @@ namespace VocaluxeTests
|
|||||||
{
|
{
|
||||||
var xml = new CXmlDeserializer();
|
var xml = new CXmlDeserializer();
|
||||||
var ser = new CXmlSerializer();
|
var ser = new CXmlSerializer();
|
||||||
SArray foo = xml.DeserializeString<SArray>(_XMLList[0]);
|
SArray foo = xml.DeserializeString<SArray>(_XmlList[0]);
|
||||||
Assert.AreEqual(foo.Ints.Length, 2, "Deserialization failed");
|
Assert.AreEqual(foo.Ints.Length, 2, "Deserialization failed");
|
||||||
Assert.AreEqual(foo.Ints[0].I, 1, "Deserialization failed");
|
Assert.AreEqual(foo.Ints[0].I, 1, "Deserialization failed");
|
||||||
Assert.AreEqual(foo.Ints[1].I, 1, "Deserialization failed");
|
Assert.AreEqual(foo.Ints[1].I, 1, "Deserialization failed");
|
||||||
string res = ser.Serialize(foo);
|
string res = ser.Serialize(foo);
|
||||||
Assert.AreEqual(_XMLList[0], res, "Serialization failed");
|
Assert.AreEqual(_XmlList[0], res, "Serialization failed");
|
||||||
foo = xml.DeserializeString<SArray>(_XMLList[1]);
|
foo = xml.DeserializeString<SArray>(_XmlList[1]);
|
||||||
Assert.AreEqual(foo.Ints.Length, 0, "Deserialization2 failed");
|
Assert.AreEqual(foo.Ints.Length, 0, "Deserialization2 failed");
|
||||||
res = ser.Serialize(foo);
|
res = ser.Serialize(foo);
|
||||||
Assert.AreEqual(_XMLList[2], res, "Serialization2 failed");
|
Assert.AreEqual(_XmlList[2], res, "Serialization2 failed");
|
||||||
foo = xml.DeserializeString<SArray>(_XMLList[2]);
|
foo = xml.DeserializeString<SArray>(_XmlList[2]);
|
||||||
Assert.AreEqual(foo.Ints.Length, 0, "Deserialization2 failed");
|
Assert.AreEqual(foo.Ints.Length, 0, "Deserialization2 failed");
|
||||||
res = ser.Serialize(foo);
|
res = ser.Serialize(foo);
|
||||||
Assert.AreEqual(_XMLList[2], res, "Serialization2 failed");
|
Assert.AreEqual(_XmlList[2], res, "Serialization2 failed");
|
||||||
_AssertFail<SArray, CXmlException>(_Empty);
|
_AssertFail<SArray, CXmlException>(_Empty);
|
||||||
}
|
}
|
||||||
|
|
||||||
private const string _XMLListEmb = _Head + @"<root>
|
private const string _XmlListEmb = _Head + @"<root>
|
||||||
<I>2</I>
|
<I>2</I>
|
||||||
<Entry>
|
<Entry>
|
||||||
<I>1</I>
|
<I>1</I>
|
||||||
</Entry>
|
</Entry>
|
||||||
<J>3</J>
|
<J>3</J>
|
||||||
</root>";
|
</root>";
|
||||||
private const string _XMLListEmb2 = _Head + @"<root>
|
private const string _XmlListEmb2 = _Head + @"<root>
|
||||||
<I>2</I>
|
<I>2</I>
|
||||||
<Entry>
|
<Entry>
|
||||||
<I>1</I>
|
<I>1</I>
|
||||||
@@ -294,7 +294,7 @@ namespace VocaluxeTests
|
|||||||
</Entry>
|
</Entry>
|
||||||
<J>3</J>
|
<J>3</J>
|
||||||
</root>";
|
</root>";
|
||||||
private const string _XMLListEmb3 = _Head + @"<root>
|
private const string _XmlListEmb3 = _Head + @"<root>
|
||||||
<I>2</I>
|
<I>2</I>
|
||||||
<J>3</J>
|
<J>3</J>
|
||||||
</root>";
|
</root>";
|
||||||
@@ -304,20 +304,20 @@ namespace VocaluxeTests
|
|||||||
{
|
{
|
||||||
var xml = new CXmlDeserializer();
|
var xml = new CXmlDeserializer();
|
||||||
var ser = new CXmlSerializer();
|
var ser = new CXmlSerializer();
|
||||||
SListEmb foo = xml.DeserializeString<SListEmb>(_XMLListEmb);
|
SListEmb foo = xml.DeserializeString<SListEmb>(_XmlListEmb);
|
||||||
Assert.AreEqual(foo.Ints.Count, 1, "Deserialization failed");
|
Assert.AreEqual(foo.Ints.Count, 1, "Deserialization failed");
|
||||||
Assert.AreEqual(foo.Ints[0].I, 1, "Deserialization failed");
|
Assert.AreEqual(foo.Ints[0].I, 1, "Deserialization failed");
|
||||||
string res = ser.Serialize(foo);
|
string res = ser.Serialize(foo);
|
||||||
Assert.AreEqual(_XMLListEmb, res, "Serialization failed");
|
Assert.AreEqual(_XmlListEmb, res, "Serialization failed");
|
||||||
foo = xml.DeserializeString<SListEmb>(_XMLListEmb2);
|
foo = xml.DeserializeString<SListEmb>(_XmlListEmb2);
|
||||||
Assert.AreEqual(foo.Ints.Count, 2, "Deserialization failed");
|
Assert.AreEqual(foo.Ints.Count, 2, "Deserialization failed");
|
||||||
Assert.AreEqual(foo.Ints[1].I, 2, "Deserialization failed");
|
Assert.AreEqual(foo.Ints[1].I, 2, "Deserialization failed");
|
||||||
res = ser.Serialize(foo);
|
res = ser.Serialize(foo);
|
||||||
Assert.AreEqual(_XMLListEmb2, res, "Serialization failed");
|
Assert.AreEqual(_XmlListEmb2, res, "Serialization failed");
|
||||||
foo = xml.DeserializeString<SListEmb>(_XMLListEmb3);
|
foo = xml.DeserializeString<SListEmb>(_XmlListEmb3);
|
||||||
Assert.AreEqual(foo.Ints.Count, 0, "Deserialization failed");
|
Assert.AreEqual(foo.Ints.Count, 0, "Deserialization failed");
|
||||||
res = ser.Serialize(foo);
|
res = ser.Serialize(foo);
|
||||||
Assert.AreEqual(_XMLListEmb3, res, "Serialization failed");
|
Assert.AreEqual(_XmlListEmb3, res, "Serialization failed");
|
||||||
_AssertFail<SListEmb, CXmlException>(_Empty);
|
_AssertFail<SListEmb, CXmlException>(_Empty);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -326,20 +326,20 @@ namespace VocaluxeTests
|
|||||||
{
|
{
|
||||||
var xml = new CXmlDeserializer();
|
var xml = new CXmlDeserializer();
|
||||||
var ser = new CXmlSerializer();
|
var ser = new CXmlSerializer();
|
||||||
SArrayEmb foo = xml.DeserializeString<SArrayEmb>(_XMLListEmb);
|
SArrayEmb foo = xml.DeserializeString<SArrayEmb>(_XmlListEmb);
|
||||||
Assert.AreEqual(foo.Ints.Length, 1, "Deserialization failed");
|
Assert.AreEqual(foo.Ints.Length, 1, "Deserialization failed");
|
||||||
Assert.AreEqual(foo.Ints[0].I, 1, "Deserialization failed");
|
Assert.AreEqual(foo.Ints[0].I, 1, "Deserialization failed");
|
||||||
string res = ser.Serialize(foo);
|
string res = ser.Serialize(foo);
|
||||||
Assert.AreEqual(_XMLListEmb, res, "Serialization failed");
|
Assert.AreEqual(_XmlListEmb, res, "Serialization failed");
|
||||||
foo = xml.DeserializeString<SArrayEmb>(_XMLListEmb2);
|
foo = xml.DeserializeString<SArrayEmb>(_XmlListEmb2);
|
||||||
Assert.AreEqual(foo.Ints.Length, 2, "Deserialization failed");
|
Assert.AreEqual(foo.Ints.Length, 2, "Deserialization failed");
|
||||||
Assert.AreEqual(foo.Ints[1].I, 2, "Deserialization failed");
|
Assert.AreEqual(foo.Ints[1].I, 2, "Deserialization failed");
|
||||||
res = ser.Serialize(foo);
|
res = ser.Serialize(foo);
|
||||||
Assert.AreEqual(_XMLListEmb2, res, "Serialization failed");
|
Assert.AreEqual(_XmlListEmb2, res, "Serialization failed");
|
||||||
foo = xml.DeserializeString<SArrayEmb>(_XMLListEmb3);
|
foo = xml.DeserializeString<SArrayEmb>(_XmlListEmb3);
|
||||||
Assert.AreEqual(foo.Ints.Length, 0, "Deserialization failed");
|
Assert.AreEqual(foo.Ints.Length, 0, "Deserialization failed");
|
||||||
res = ser.Serialize(foo);
|
res = ser.Serialize(foo);
|
||||||
Assert.AreEqual(_XMLListEmb3, res, "Serialization failed");
|
Assert.AreEqual(_XmlListEmb3, res, "Serialization failed");
|
||||||
_AssertFail<SArrayEmb, CXmlException>(_Empty);
|
_AssertFail<SArrayEmb, CXmlException>(_Empty);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user