Use extra class for xml exception

Add handler class for xml errors
Fix testcases
This commit is contained in:
Flamefire committed 2014-11-17 19:27:43 +01:00
1 parent a2aafd4614
commit 33618b4c97
12 files changed
+334 -71

No files matched your search

@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="language">Deutsch</string>
<string name="TR_PROGRAM_NAME">Vocaluxe</string>
<string name="TR_GENERAL_AND">und</string>
<string name="TR_BUTTON_EXIT">Exit</string>
<string name="TR_BUTTON_SAVE">Speichern</string>
<string name="TR_BUTTON_BACK">Zurück</string>
<string name="TR_BUTTON_START">Start</string>
<string name="TR_DEBUG_AUDIO_STREAMS">Audio-Streams</string>
<string name="TR_DEBUG_VIDEO_STREAMS">Video-Streams</string>
<string name="TR_DEBUG_TEXTURES">Textures</string>
<string name="TR_DEBUG_TONE_ABS">ToneAbs</string>
<string name="TR_DEBUG_MAX_VOLUME">Max. Volume</string>
<string name="TR_DEBUG_SONGS">Geladene Songs</string>
<string name="TR_DEBUG_MOUSE">Maus</string>
<string name="TR_DEBUG_MEMORY">Speicherverbrauch</string>
<string name="TR_GAMEMODE_NORMAL">Normal</string>
<string name="TR_GAMEMODE_DUET">Duett</string>
<string name="TR_GAMEMODE_MEDLEY">Medley</string>
<string name="TR_GAMEMODE_SHORTSONG">Kurz-Version</string>
<string name="TR_RATING_VOCAL_HERO">Vocal Hero</string>
<string name="TR_RATING_SUPERSTAR">Superstar</string>
<string name="TR_RATING_LEAD_SINGER">Hit-Künstler</string>
<string name="TR_RATING_RISING_STAR">Sternchen</string>
<string name="TR_RATING_HOPEFUL">Fortgeschritten</string>
<string name="TR_RATING_WANNABE">Möchtegern</string>
<string name="TR_RATING_AMATEUR">Amateur</string>
<string name="TR_RATING_TONE_DEAF">Nichtskönner</string>
<string name="TR_USERROLE_GUEST">Gast</string>
<string name="TR_USERROLE_NORMAL">Normaler Benutzer</string>
<string name="TR_USERROLE_ADMIN">Administrator</string>
<string name="TR_USERROLE_KEYBOARDUSER">Tastatur</string>
</resources>
+8 -9
View File
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Xml;
using System.Xml.Serialization;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Vocaluxe.Base;
@@ -167,7 +166,7 @@ namespace VocaluxeTests
foreach (string s1 in s)
{
string sTmp = s1;
_AssertFail<SBasic, XmlException>(sTmp);
_AssertFail<SBasic, CXmlException>(sTmp);
}
}
@@ -196,7 +195,7 @@ namespace VocaluxeTests
foreach (string s1 in s)
{
string sTmp = s1;
_AssertFail<SBasic, XmlException>(sTmp);
_AssertFail<SBasic, CXmlException>(sTmp);
}
}
@@ -253,7 +252,7 @@ namespace VocaluxeTests
_AssertSerDeserMatch<SList>(_XMLList[2]);
res = ser.Serialize(foo);
Assert.AreEqual(_XMLList[2], res, "Serialization2 failed");
_AssertFail<SList, XmlException>(_Empty);
_AssertFail<SList, CXmlException>(_Empty);
}
[TestMethod]
@@ -275,7 +274,7 @@ namespace VocaluxeTests
Assert.AreEqual(foo.Ints.Length, 0, "Deserialization2 failed");
res = ser.Serialize(foo);
Assert.AreEqual(_XMLList[2], res, "Serialization2 failed");
_AssertFail<SArray, XmlException>(_Empty);
_AssertFail<SArray, CXmlException>(_Empty);
}
private const string _XMLListEmb = _Head + @"<root>
@@ -319,7 +318,7 @@ namespace VocaluxeTests
Assert.AreEqual(foo.Ints.Count, 0, "Deserialization failed");
res = ser.Serialize(foo);
Assert.AreEqual(_XMLListEmb3, res, "Serialization failed");
_AssertFail<SListEmb, XmlException>(_Empty);
_AssertFail<SListEmb, CXmlException>(_Empty);
}
[TestMethod]
@@ -341,7 +340,7 @@ namespace VocaluxeTests
Assert.AreEqual(foo.Ints.Length, 0, "Deserialization failed");
res = ser.Serialize(foo);
Assert.AreEqual(_XMLListEmb3, res, "Serialization failed");
_AssertFail<SArrayEmb, XmlException>(_Empty);
_AssertFail<SArrayEmb, CXmlException>(_Empty);
}
[TestMethod]
@@ -377,7 +376,7 @@ namespace VocaluxeTests
public void TestIgnore()
{
_AssertSerDeserMatch<SIgnore>(_XmlIgnore);
_AssertFail<SIgnore, XmlException>(_XmlIgnore2);
_AssertFail<SIgnore, CXmlException>(_XmlIgnore2);
}
[TestMethod]
@@ -438,7 +437,7 @@ namespace VocaluxeTests
}
Assert.IsInstanceOfType(foo, type, "Wrong type with " + type.Name);
var ser = new CXmlSerializer(type == typeof(CConfig.SConfig));
string newXml = ser.Serialize(type == typeof(Dictionary<string, string>) ? "resources" : foo);
string newXml = ser.Serialize(foo, type == typeof(Dictionary<string, string>) ? "resources" : null);
// Typename will be uppercase but input is lowercase
newXml = newXml.Replace("<String", "<string").Replace("</String", "</string");
string oldXml = File.ReadAllText(xmlPath);