Nemcio/ChanSort
1
0
Fork 0
mirror of https://github.com/PredatH0r/ChanSort.git synced 2026-02-08 07:29:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

- FIX: Resizing a column caused an exception

Browse Source 
- FIX: Deleting satellite channels from an SCM file did not work correctly
- Improved SCM file format detection
- Samsung E/F-Series: channels in the favorite lists now use their prog#  instead of all being put at #1
- fixed LG unit tests
- fixed Samsung tests
This commit is contained in:
hbeham
2013-06-23 23:22:09 +02:00
parent 42396aff6e
commit 6d3826cd2e
36 changed files with 5569 additions and 5539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Test.Loader/LgTest.cs
View File

@@ -21,7 +21,7 @@ namespace Test.Loader
TllFileSerializerPlugin plugin = new TllFileSerializerPlugin();
StringBuilder errors = new StringBuilder();
var list = this.FindAllFiles("TestFiles", "*.tll");
var list = this.FindAllFiles("TestFiles_LG", "*.tll");
var models = new Dictionary<string,string>();
var firmwareSize = new Dictionary<int, string>();
foreach(var file in list)
@@ -39,13 +39,15 @@ namespace Test.Loader
var fileName = Path.GetFileName(file) ?? "";
var model = this.GetLgModel(file);
var analogList = serializer.DataRoot.GetChannelList(ChanSort.Api.SignalSource.AnalogCT | ChanSort.Api.SignalSource.Tv);
var digitalList = serializer.DataRoot.GetChannelList(ChanSort.Api.SignalSource.DvbCT | ChanSort.Api.SignalSource.Tv);
var dvbcList = serializer.DataRoot.GetChannelList(ChanSort.Api.SignalSource.DvbC | ChanSort.Api.SignalSource.Tv);
var dvbtList = serializer.DataRoot.GetChannelList(ChanSort.Api.SignalSource.DvbT | ChanSort.Api.SignalSource.Tv);
var satChannelList = serializer.DataRoot.GetChannelList(ChanSort.Api.SignalSource.DvbS | ChanSort.Api.SignalSource.Tv);
string key = fileName +
string key =
model +
"\t" + serializer.ACTChannelLength+
"\t" + (analogList != null && analogList.Count > 0) +
"\t" + (digitalList != null && digitalList.Count > 0) +
"\t" + (dvbtList != null && dvbtList.Count > 0) +
"\t" + (dvbcList != null && dvbcList.Count > 0) +
"\t" + serializer.SatChannelLength +
"\t" + (satChannelList != null && satChannelList.Count > 0) +
"\t" + serializer.HasPresetDvbsChannelNumbers +
@@ -56,7 +58,8 @@ namespace Test.Loader
"\t" + serializer.ACTChannelLength +
"\t" + serializer.SatChannelLength +
"\t" + (analogList == null ? 0 : analogList.Count) +
"\t" + (digitalList == null ? 0 : digitalList.Count) +
"\t" + (dvbtList == null ? 0 : dvbtList.Count) +
"\t" + (dvbcList == null ? 0 : dvbcList.Count) +
"\t" + (satChannelList == null ? 0 : satChannelList.Count) +
"\t" + serializer.HasPresetDvbsChannelNumbers +
"\t" + serializer.TvCountryCode +
@@ -82,7 +85,9 @@ namespace Test.Loader
if (expectedData.TryGetValue(key, out exp))
{
var analogTv = serializer.DataRoot.GetChannelList(ChanSort.Api.SignalSource.AnalogCT|ChanSort.Api.SignalSource.Tv);
var dtvTv = serializer.DataRoot.GetChannelList(ChanSort.Api.SignalSource.DvbCT|ChanSort.Api.SignalSource.Tv);
var dvbcTv = serializer.DataRoot.GetChannelList(ChanSort.Api.SignalSource.DvbC|ChanSort.Api.SignalSource.Tv);
var dvbtTv = serializer.DataRoot.GetChannelList(ChanSort.Api.SignalSource.DvbT | ChanSort.Api.SignalSource.Tv);
var dtvTv = dvbcTv.Channels.Count > 0 ? dvbcTv : dvbtTv;
var satTv = serializer.DataRoot.GetChannelList(ChanSort.Api.SignalSource.DvbS | ChanSort.Api.SignalSource.Tv);
expectedData.Remove(key);
Assert.AreEqual(exp.AnalogChannels, analogTv.Channels.Count, file + ": analog");
@@ -131,7 +136,7 @@ namespace Test.Loader
new ExpectedData(@"decklen\xxLW570S-ZD00001.TLL", 0, 30, 1598, 0, 339), // 184/68
new ExpectedData(@"NeuerScan\xxLM340S-ZA00001.TLL", 34, 317, 1698, 129, 264), // 188/68
new ExpectedData(@"wagnale\xxLM611S-ZA00001.TLL", 0, 13, 1094 + 70, 0, 191), // 188/68
new ExpectedData(@"_Pred\xxLM620S-ZE00021.TLL", 0, 11, 1303, 0, 191) // 192/72
new ExpectedData(@"!Pred\xxLM620S-ZE00021.TLL", 0, 11, 1303, 0, 191) // 192/72
};
var dict = new Dictionary<string, ExpectedData>(StringComparer.InvariantCultureIgnoreCase);

6
Test.Loader/SamsungTest.cs
View File

@@ -19,7 +19,7 @@ namespace Test.Loader
{
new ExpectedData(@"catmater_B\Clone.scm", 31, 272, 0, 0, 0) ,
new ExpectedData(@"easy2003_B\easy2003_B.scm", 0, 0, 1225, 0, 0) ,
new ExpectedData(@"_Manu_C\channel_list_LE40C650_1001.scm", 0, 9, 0, 0, 0)
//new ExpectedData(@"_Manu_C\channel_list_LE40C650_1001.scm", 0, 9, 0, 0, 0)
};
var dict = new Dictionary<string, ExpectedData>(StringComparer.InvariantCultureIgnoreCase);
@@ -70,7 +70,8 @@ namespace Test.Loader
"\t" + serializer.SatChannelLength +
"\t" + (satChannelList != null && satChannelList.Count > 0) +
"\t" + serializer.HdPlusChannelLength +
"\t" + (hdChannelList != null && hdChannelList.Count > 0);
"\t" + (hdChannelList != null && hdChannelList.Count > 0) +
"\t" + serializer.SatDatabaseVersion;
string relPath = Path.GetFileName(Path.GetDirectoryName(file)) + "\\" + fileName;
models[key] = serializer.Series +
"\t" + model +
@@ -78,6 +79,7 @@ namespace Test.Loader
"\t" + serializer.DigitalChannelLength +
"\t" + serializer.SatChannelLength +
"\t" + serializer.HdPlusChannelLength +
"\t" + serializer.SatDatabaseVersion +
"\t" + (analogAirList == null ? 0 : analogAirList.Count) +
"\t" + (analogCableList == null ? 0 : analogCableList.Count) +
"\t" + (digitalAirList == null ? 0 : digitalAirList.Count) +