mirror of
https://github.com/PredatH0r/ChanSort.git
synced 2026-03-02 02:00:43 +01:00
- complete rework of TLL and SCM loaders, removing all "unsafe" code
- fixed various issues with SCM files
This commit is contained in:
@@ -9,8 +9,8 @@
|
||||
<ProjectGuid>{68CFCB2F-B52A-43A1-AA5C-5D64A1D655D2}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>Test.Plugin.TllFile</RootNamespace>
|
||||
<AssemblyName>Test.Plugin.TllFile</AssemblyName>
|
||||
<RootNamespace>Test.Loader.TllFile</RootNamespace>
|
||||
<AssemblyName>Test.Loader.TllFile</AssemblyName>
|
||||
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||
@@ -76,10 +76,9 @@
|
||||
<Name>ChanSort.Api</Name>
|
||||
<Private>True</Private>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\ChanSort.Plugin.TllFile\ChanSort.Plugin.TllFile.csproj">
|
||||
<ProjectReference Include="..\ChanSort.Plugin.TllFile\ChanSort.Loader.TllFile.csproj">
|
||||
<Project>{E972D8A1-2F5F-421C-AC91-CFF45E5191BE}</Project>
|
||||
<Name>ChanSort.Plugin.TllFile</Name>
|
||||
<Private>True</Private>
|
||||
<Name>ChanSort.Loader.TllFile</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
@@ -5,10 +5,10 @@ using System.IO;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using System.Text;
|
||||
using ChanSort.Plugin.TllFile;
|
||||
using ChanSort.Loader.TllFile;
|
||||
using Microsoft.VisualStudio.TestTools.UnitTesting;
|
||||
|
||||
namespace Test.Plugin.TllFile
|
||||
namespace Test.Loader.TllFile
|
||||
{
|
||||
[TestClass]
|
||||
public class UnitTest1
|
||||
@@ -52,10 +52,10 @@ namespace Test.Plugin.TllFile
|
||||
new ExpectedData(@"FranzSteinert\xxCS460S-ZA00001.TLL", 0, 0, 1261, 0, 200), // ?/68
|
||||
new ExpectedData(@"Klausi1\xxLK950S-ZA00001.TLL", 37, 390, 2695, 150, 491), // 184/68
|
||||
new ExpectedData(@"MP3Chris2712\xxLV570S-ZB00001.TLL", 0, 12, 2895, 0, 669), // 184/68
|
||||
new ExpectedData(@"decklen\xxLW570S-ZD00001.TLL", 0, 30, 1587, 0, 339), // 184/68
|
||||
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, 0, 191), // 188/68
|
||||
new ExpectedData(@"_Pred\xxLM620S-ZE00021.TLL", 0, 11, 1302, 0, 191), // 192/72
|
||||
new ExpectedData(@"_Pred\xxLM620S-ZE00021.TLL", 0, 11, 1303, 0, 191), // 192/72
|
||||
};
|
||||
|
||||
foreach (var entry in expected)
|
||||
@@ -70,7 +70,8 @@ namespace Test.Plugin.TllFile
|
||||
|
||||
#region TestLoadingAllTllFilesInTestFilesDirectory()
|
||||
[TestMethod]
|
||||
[DeploymentItem("ChanSort.Plugin.TllFile\\ChanSort.Plugin.TllFile.ini")]
|
||||
[DeploymentItem("ChanSort.Loader.TllFile\\ChanSort.Loader.TllFile.ini")]
|
||||
[DeploymentItem("ChanSort.Loader.TllFile2\\ChanSort.Loader.TllFile2.ini")]
|
||||
public void TestLoadingAllTllFilesInTestFilesDirectory()
|
||||
{
|
||||
TllFileSerializerPlugin plugin = new TllFileSerializerPlugin();
|
||||
@@ -78,10 +79,10 @@ namespace Test.Plugin.TllFile
|
||||
StringBuilder errors = new StringBuilder();
|
||||
var list = this.FindAllTllFiles();
|
||||
var models = new Dictionary<string,string>();
|
||||
var firmwareSize = new Dictionary<uint, string>();
|
||||
var firmwareSize = new Dictionary<int, string>();
|
||||
foreach(var file in list)
|
||||
{
|
||||
if (file.Contains("GlobalClone"))
|
||||
if (file.Contains("GlobalClone") || file.Contains("CountrySettings"))
|
||||
continue;
|
||||
Debug.Print("Testing " + file);
|
||||
try
|
||||
@@ -103,14 +104,14 @@ namespace Test.Plugin.TllFile
|
||||
models[key] = relPath;
|
||||
|
||||
var model = this.GetModel(file);
|
||||
if (firmwareSize.ContainsKey(serializer.FirmwareDataLength))
|
||||
if (firmwareSize.ContainsKey(serializer.FirmwareBlockSize))
|
||||
{
|
||||
string x = firmwareSize[serializer.FirmwareDataLength];
|
||||
string x = firmwareSize[serializer.FirmwareBlockSize];
|
||||
if (!x.Contains(model))
|
||||
firmwareSize[serializer.FirmwareDataLength] = x + ", " + model;
|
||||
firmwareSize[serializer.FirmwareBlockSize] = x + ", " + model;
|
||||
}
|
||||
else
|
||||
firmwareSize[serializer.FirmwareDataLength] = model;
|
||||
firmwareSize[serializer.FirmwareBlockSize] = model;
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user