🐛Fix static method on hashes not being declared as such.

This commit is contained in:
2018-02-03 19:11:41 +00:00
parent c06fc84348
commit 4194566a20
36 changed files with 194 additions and 271 deletions

View File

@@ -53,12 +53,10 @@ namespace DiscImageChef.Tests.Filters
[Test]
public void CheckCorrectFile()
{
Md5Context ctx = new Md5Context();
string result = ctx.File(location, out _);
string result = Md5Context.File(location, out _);
Assert.AreEqual(EXPECTED_FILE, result);
ctx = new Md5Context();
result = ctx.File(sidecar, out _);
result = Md5Context.File(sidecar, out _);
Assert.AreEqual(EXPECTED_SIDECAR, result);
}
@@ -94,8 +92,7 @@ namespace DiscImageChef.Tests.Filters
str.Close();
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
string result = ctx.Data(data, out _);
string result = Md5Context.Data(data, out _);
Assert.AreEqual(EXPECTED_CONTENTS, result);
}
@@ -110,8 +107,7 @@ namespace DiscImageChef.Tests.Filters
str.Close();
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
string result = ctx.Data(data, out _);
string result = Md5Context.Data(data, out _);
Assert.AreEqual(EXPECTED_RESOURCE, result);
}
}

View File

@@ -52,12 +52,10 @@ namespace DiscImageChef.Tests.Filters
[Test]
public void CheckCorrectFile()
{
Md5Context ctx = new Md5Context();
string result = ctx.File(location, out _);
string result = Md5Context.File(location, out _);
Assert.AreEqual(EXPECTED_FILE, result);
ctx = new Md5Context();
result = ctx.File(sidecar, out _);
result = Md5Context.File(sidecar, out _);
Assert.AreEqual(EXPECTED_SIDECAR, result);
}
@@ -93,8 +91,7 @@ namespace DiscImageChef.Tests.Filters
str.Close();
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
string result = ctx.Data(data, out _);
string result = Md5Context.Data(data, out _);
Assert.AreEqual(EXPECTED_CONTENTS, result);
}
@@ -109,8 +106,7 @@ namespace DiscImageChef.Tests.Filters
str.Close();
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
string result = ctx.Data(data, out _);
string result = Md5Context.Data(data, out _);
Assert.AreEqual(EXPECTED_RESOURCE, result);
}
}

View File

@@ -53,12 +53,10 @@ namespace DiscImageChef.Tests.Filters
[Test]
public void CheckCorrectFile()
{
Md5Context ctx = new Md5Context();
string result = ctx.File(location, out _);
string result = Md5Context.File(location, out _);
Assert.AreEqual(EXPECTED_FILE, result);
ctx = new Md5Context();
result = ctx.File(sidecar, out _);
result = Md5Context.File(sidecar, out _);
Assert.AreEqual(EXPECTED_SIDECAR, result);
}
@@ -94,8 +92,7 @@ namespace DiscImageChef.Tests.Filters
str.Close();
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
string result = ctx.Data(data, out _);
string result = Md5Context.Data(data, out _);
Assert.AreEqual(EXPECTED_CONTENTS, result);
}
@@ -110,8 +107,7 @@ namespace DiscImageChef.Tests.Filters
str.Close();
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
string result = ctx.Data(data, out _);
string result = Md5Context.Data(data, out _);
Assert.AreEqual(EXPECTED_RESOURCE, result);
}
}

View File

@@ -53,11 +53,11 @@ namespace DiscImageChef.Tests.Filters
public void CheckCorrectFile()
{
Md5Context ctx = new Md5Context();
string result = ctx.File(location, out _);
string result = Md5Context.File(location, out _);
Assert.AreEqual(EXPECTED_FILE, result);
ctx = new Md5Context();
result = ctx.File(sidecar, out _);
result = Md5Context.File(sidecar, out _);
Assert.AreEqual(EXPECTED_SIDECAR, result);
}
@@ -94,7 +94,7 @@ namespace DiscImageChef.Tests.Filters
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
string result = ctx.Data(data, out _);
string result = Md5Context.Data(data, out _);
Assert.AreEqual(EXPECTED_CONTENTS, result);
}
@@ -110,7 +110,7 @@ namespace DiscImageChef.Tests.Filters
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
string result = ctx.Data(data, out _);
string result = Md5Context.Data(data, out _);
Assert.AreEqual(EXPECTED_RESOURCE, result);
}
}

View File

@@ -52,12 +52,10 @@ namespace DiscImageChef.Tests.Filters
[Test]
public void CheckCorrectFile()
{
Md5Context ctx = new Md5Context();
string result = ctx.File(location, out _);
string result = Md5Context.File(location, out _);
Assert.AreEqual(EXPECTED_FILE, result);
ctx = new Md5Context();
result = ctx.File(sidecar, out _);
result = Md5Context.File(sidecar, out _);
Assert.AreEqual(EXPECTED_SIDECAR, result);
}
@@ -93,8 +91,7 @@ namespace DiscImageChef.Tests.Filters
str.Close();
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
string result = ctx.Data(data, out _);
string result = Md5Context.Data(data, out _);
Assert.AreEqual(EXPECTED_CONTENTS, result);
}
@@ -109,8 +106,7 @@ namespace DiscImageChef.Tests.Filters
str.Close();
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
string result = ctx.Data(data, out _);
string result = Md5Context.Data(data, out _);
Assert.AreEqual(EXPECTED_RESOURCE, result);
}
}

View File

@@ -52,12 +52,10 @@ namespace DiscImageChef.Tests.Filters
[Test]
public void CheckCorrectFile()
{
Md5Context ctx = new Md5Context();
string result = ctx.File(location, out _);
string result = Md5Context.File(location, out _);
Assert.AreEqual(EXPECTED_FILE, result);
ctx = new Md5Context();
result = ctx.File(sidecar, out _);
result = Md5Context.File(sidecar, out _);
Assert.AreEqual(EXPECTED_SIDECAR, result);
}
@@ -93,8 +91,7 @@ namespace DiscImageChef.Tests.Filters
str.Close();
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
string result = ctx.Data(data, out _);
string result = Md5Context.Data(data, out _);
Assert.AreEqual(EXPECTED_CONTENTS, result);
}
@@ -109,8 +106,7 @@ namespace DiscImageChef.Tests.Filters
str.Close();
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
string result = ctx.Data(data, out _);
string result = Md5Context.Data(data, out _);
Assert.AreEqual(EXPECTED_RESOURCE, result);
}
}

View File

@@ -52,12 +52,10 @@ namespace DiscImageChef.Tests.Filters
[Test]
public void CheckCorrectFile()
{
Md5Context ctx = new Md5Context();
string result = ctx.File(location, out _);
string result = Md5Context.File(location, out _);
Assert.AreEqual(EXPECTED_FILE, result);
ctx = new Md5Context();
result = ctx.File(sidecar, out _);
result = Md5Context.File(sidecar, out _);
Assert.AreEqual(EXPECTED_SIDECAR, result);
}
@@ -93,8 +91,7 @@ namespace DiscImageChef.Tests.Filters
str.Close();
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
string result = ctx.Data(data, out _);
string result = Md5Context.Data(data, out _);
Assert.AreEqual(EXPECTED_CONTENTS, result);
}
@@ -109,8 +106,7 @@ namespace DiscImageChef.Tests.Filters
str.Close();
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
string result = ctx.Data(data, out _);
string result = Md5Context.Data(data, out _);
Assert.AreEqual(EXPECTED_RESOURCE, result);
}
}

View File

@@ -49,8 +49,7 @@ namespace DiscImageChef.Tests.Filters
[Test]
public void CheckCorrectFile()
{
Md5Context ctx = new Md5Context();
string result = ctx.File(location, out _);
string result = Md5Context.File(location, out _);
Assert.AreEqual(EXPECTED_FILE, result);
}
@@ -86,8 +85,7 @@ namespace DiscImageChef.Tests.Filters
str.Close();
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
string result = ctx.Data(data, out _);
string result = Md5Context.Data(data, out _);
Assert.AreEqual(EXPECTED_CONTENTS, result);
}
@@ -102,8 +100,7 @@ namespace DiscImageChef.Tests.Filters
str.Close();
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
string result = ctx.Data(data, out _);
string result = Md5Context.Data(data, out _);
Assert.AreEqual(EXPECTED_RESOURCE, result);
}
}

View File

@@ -50,8 +50,7 @@ namespace DiscImageChef.Tests.Filters
[Test]
public void CheckCorrectFile()
{
Md5Context ctx = new Md5Context();
byte[] result = ctx.File(location);
byte[] result = Md5Context.File(location);
Assert.AreEqual(ExpectedFile, result);
}
@@ -87,8 +86,7 @@ namespace DiscImageChef.Tests.Filters
str.Close();
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
ctx.Data(data, out byte[] result);
Md5Context.Data(data, out byte[] result);
Assert.AreEqual(ExpectedContents, result);
}
}

View File

@@ -50,8 +50,7 @@ namespace DiscImageChef.Tests.Filters
[Test]
public void CheckCorrectFile()
{
Md5Context ctx = new Md5Context();
byte[] result = ctx.File(location);
byte[] result = Md5Context.File(location);
Assert.AreEqual(ExpectedFile, result);
}
@@ -87,8 +86,7 @@ namespace DiscImageChef.Tests.Filters
str.Close();
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
ctx.Data(data, out byte[] result);
Md5Context.Data(data, out byte[] result);
Assert.AreEqual(ExpectedContents, result);
}
}

View File

@@ -50,8 +50,7 @@ namespace DiscImageChef.Tests.Filters
[Test]
public void CheckCorrectFile()
{
Md5Context ctx = new Md5Context();
byte[] result = ctx.File(location);
byte[] result = Md5Context.File(location);
Assert.AreEqual(ExpectedFile, result);
}
@@ -87,8 +86,7 @@ namespace DiscImageChef.Tests.Filters
str.Close();
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
ctx.Data(data, out byte[] result);
Md5Context.Data(data, out byte[] result);
Assert.AreEqual(ExpectedContents, result);
}
}

View File

@@ -49,8 +49,7 @@ namespace DiscImageChef.Tests.Filters
[Test]
public void CheckCorrectFile()
{
Md5Context ctx = new Md5Context();
string result = ctx.File(location, out _);
string result = Md5Context.File(location, out _);
Assert.AreEqual(EXPECTED_FILE, result);
}
@@ -86,8 +85,7 @@ namespace DiscImageChef.Tests.Filters
str.Close();
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
string result = ctx.Data(data, out _);
string result = Md5Context.Data(data, out _);
Assert.AreEqual(EXPECTED_CONTENTS, result);
}
@@ -102,8 +100,7 @@ namespace DiscImageChef.Tests.Filters
str.Close();
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
string result = ctx.Data(data, out _);
string result = Md5Context.Data(data, out _);
Assert.AreEqual(EXPECTED_RESOURCE, result);
}
}

View File

@@ -49,8 +49,7 @@ namespace DiscImageChef.Tests.Filters
[Test]
public void CheckCorrectFile()
{
Md5Context ctx = new Md5Context();
string result = ctx.File(location, out _);
string result = Md5Context.File(location, out _);
Assert.AreEqual(EXPECTED_FILE, result);
}
@@ -86,8 +85,7 @@ namespace DiscImageChef.Tests.Filters
str.Close();
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
string result = ctx.Data(data, out _);
string result = Md5Context.Data(data, out _);
Assert.AreEqual(EXPECTED_CONTENTS, result);
}
@@ -102,8 +100,7 @@ namespace DiscImageChef.Tests.Filters
str.Close();
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
string result = ctx.Data(data, out _);
string result = Md5Context.Data(data, out _);
Assert.AreEqual(EXPECTED_RESOURCE, result);
}
}

View File

@@ -49,8 +49,7 @@ namespace DiscImageChef.Tests.Filters
[Test]
public void CheckCorrectFile()
{
Md5Context ctx = new Md5Context();
string result = ctx.File(location, out _);
string result = Md5Context.File(location, out _);
Assert.AreEqual(EXPECTED_FILE, result);
}
@@ -86,8 +85,7 @@ namespace DiscImageChef.Tests.Filters
str.Close();
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
string result = ctx.Data(data, out _);
string result = Md5Context.Data(data, out _);
Assert.AreEqual(EXPECTED_CONTENTS, result);
}
@@ -102,8 +100,7 @@ namespace DiscImageChef.Tests.Filters
str.Close();
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
string result = ctx.Data(data, out _);
string result = Md5Context.Data(data, out _);
Assert.AreEqual(EXPECTED_RESOURCE, result);
}
}

View File

@@ -49,9 +49,8 @@ namespace DiscImageChef.Tests.Filters
[Test]
public void CheckCorrectFile()
{
Md5Context ctx = new Md5Context();
string result = ctx.File(Path.Combine(Consts.TestFilesRoot, "filters", "pcexchange", "FINDER.DAT"),
out _);
string result = Md5Context.File(Path.Combine(Consts.TestFilesRoot, "filters", "pcexchange", "FINDER.DAT"),
out _);
Assert.AreEqual(EXPECTED_FILE, result);
}
@@ -87,8 +86,7 @@ namespace DiscImageChef.Tests.Filters
str.Close();
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
string result = ctx.Data(data, out _);
string result = Md5Context.Data(data, out _);
Assert.AreEqual(EXPECTED_CONTENTS, result);
}
@@ -103,8 +101,7 @@ namespace DiscImageChef.Tests.Filters
str.Close();
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
string result = ctx.Data(data, out _);
string result = Md5Context.Data(data, out _);
Assert.AreEqual(EXPECTED_RESOURCE, result);
}
}

View File

@@ -50,8 +50,7 @@ namespace DiscImageChef.Tests.Filters
[Test]
public void CheckCorrectFile()
{
Md5Context ctx = new Md5Context();
byte[] result = ctx.File(location);
byte[] result = Md5Context.File(location);
Assert.AreEqual(ExpectedFile, result);
}
@@ -87,8 +86,7 @@ namespace DiscImageChef.Tests.Filters
str.Close();
str.Dispose();
filter.Close();
Md5Context ctx = new Md5Context();
ctx.Data(data, out byte[] result);
Md5Context.Data(data, out byte[] result);
Assert.AreEqual(ExpectedContents, result);
}
}