[System.Core] Remove duplicated test classes (#5829)

These tests classes are already included in the corlib test assembly.
Having them duplicated in System.Core causes issues in XA because
both test assemblies are in the same process.

To solve this we introduce abstract *TestBase classes that we can
share between the test assemblies and only mark the concrete test
class implementations with [TestFixture]

8 files changed, 12 insertions, 12 deletions

diff --git a/mcs/class/System.Core/System.Core_test.dll.sources b/mcs/class/System.Core/System.Core_test.dll.sources
index 01ae2e35ae3..2ecd0f11230 100644
--- a/mcs/class/System.Core/System.Core_test.dll.sources
+++ b/mcs/class/System.Core/System.Core_test.dll.sources
@@ -61,11 +61,11 @@ System.Linq.Expressions/ExpressionTest_TypeIs.cs
 System.Linq.Expressions/ExpressionTest_UnaryPlus.cs
 System.Linq.Expressions/ExpressionTest_Utils.cs
 System.Threading/ReaderWriterLockSlimTest.cs
-../../corlib/Test/System.Security.Cryptography/HashAlgorithmTest.cs
-../../corlib/Test/System.Security.Cryptography/SHA1Test.cs
-../../corlib/Test/System.Security.Cryptography/SHA256Test.cs
-../../corlib/Test/System.Security.Cryptography/SHA384Test.cs
-../../corlib/Test/System.Security.Cryptography/SHA512Test.cs
+../../corlib/Test/System.Security.Cryptography/HashAlgorithmTestBase.cs
+../../corlib/Test/System.Security.Cryptography/SHA1TestBase.cs
+../../corlib/Test/System.Security.Cryptography/SHA256TestBase.cs
+../../corlib/Test/System.Security.Cryptography/SHA384TestBase.cs
+../../corlib/Test/System.Security.Cryptography/SHA512TestBase.cs
 System.Security.Cryptography/AesCryptoServiceProviderTest.cs
 System.Security.Cryptography/AesManagedTest.cs
 System.Security.Cryptography/CngAlgorithmTest.cs
diff --git a/mcs/class/System.Core/Test/System.Security.Cryptography/SHA1CngTest.cs b/mcs/class/System.Core/Test/System.Security.Cryptography/SHA1CngTest.cs
index 5164c4d9b3b..e132f5e5093 100644
--- a/mcs/class/System.Core/Test/System.Security.Cryptography/SHA1CngTest.cs
+++ b/mcs/class/System.Core/Test/System.Security.Cryptography/SHA1CngTest.cs
@@ -25,7 +25,7 @@ namespace MonoTests.System.Security.Cryptography {
 	// same results (hence should run a common set of unit tests).
 
 	[TestFixture]
-	public class SHA1CngTest : SHA1Test {
+	public class SHA1CngTest : SHA1TestBase {
 
 		[SetUp]
 		public override void SetUp ()
diff --git a/mcs/class/System.Core/Test/System.Security.Cryptography/SHA256CngTest.cs b/mcs/class/System.Core/Test/System.Security.Cryptography/SHA256CngTest.cs
index 2801868212b..927ef29e52c 100644
--- a/mcs/class/System.Core/Test/System.Security.Cryptography/SHA256CngTest.cs
+++ b/mcs/class/System.Core/Test/System.Security.Cryptography/SHA256CngTest.cs
@@ -25,7 +25,7 @@ namespace MonoTests.System.Security.Cryptography {
 	// same results (hence should run a common set of unit tests).
 
 	[TestFixture]
-	public class SHA256CngTest : SHA256Test {
+	public class SHA256CngTest : SHA256TestBase {
 
 		[SetUp]
 		public override void SetUp ()
diff --git a/mcs/class/System.Core/Test/System.Security.Cryptography/SHA256CryptoServiceProviderTest.cs b/mcs/class/System.Core/Test/System.Security.Cryptography/SHA256CryptoServiceProviderTest.cs
index 7edba2f9d23..b79ecf1a72e 100644
--- a/mcs/class/System.Core/Test/System.Security.Cryptography/SHA256CryptoServiceProviderTest.cs
+++ b/mcs/class/System.Core/Test/System.Security.Cryptography/SHA256CryptoServiceProviderTest.cs
@@ -25,7 +25,7 @@ namespace MonoTests.System.Security.Cryptography {
 	// same results (hence should run a common set of unit tests).
 
 	[TestFixture]
-	public class SHA256CryptoServiceProviderTest : SHA256Test {
+	public class SHA256CryptoServiceProviderTest : SHA256TestBase {
 
 		[SetUp]
 		public override void SetUp ()
diff --git a/mcs/class/System.Core/Test/System.Security.Cryptography/SHA384CngTest.cs b/mcs/class/System.Core/Test/System.Security.Cryptography/SHA384CngTest.cs
index a7992ee86eb..e9f212412e4 100644
--- a/mcs/class/System.Core/Test/System.Security.Cryptography/SHA384CngTest.cs
+++ b/mcs/class/System.Core/Test/System.Security.Cryptography/SHA384CngTest.cs
@@ -25,7 +25,7 @@ namespace MonoTests.System.Security.Cryptography {
 	// same results (hence should run a common set of unit tests).
 
 	[TestFixture]
-	public class SHA384CngTest : SHA384Test {
+	public class SHA384CngTest : SHA384TestBase {
 
 		[SetUp]
 		public override void SetUp ()
diff --git a/mcs/class/System.Core/Test/System.Security.Cryptography/SHA384CryptoServiceProviderTest.cs b/mcs/class/System.Core/Test/System.Security.Cryptography/SHA384CryptoServiceProviderTest.cs
index 900951ac573..6b1079b8521 100644
--- a/mcs/class/System.Core/Test/System.Security.Cryptography/SHA384CryptoServiceProviderTest.cs
+++ b/mcs/class/System.Core/Test/System.Security.Cryptography/SHA384CryptoServiceProviderTest.cs
@@ -25,7 +25,7 @@ namespace MonoTests.System.Security.Cryptography {
 	// same results (hence should run a common set of unit tests).
 
 	[TestFixture]
-	public class SHA384CryptoServiceProviderTest : SHA384Test {
+	public class SHA384CryptoServiceProviderTest : SHA384TestBase {
 
 		[SetUp]
 		public override void SetUp ()
diff --git a/mcs/class/System.Core/Test/System.Security.Cryptography/SHA512CngTest.cs b/mcs/class/System.Core/Test/System.Security.Cryptography/SHA512CngTest.cs
index 3cec13ca2cb..c5999b8048b 100644
--- a/mcs/class/System.Core/Test/System.Security.Cryptography/SHA512CngTest.cs
+++ b/mcs/class/System.Core/Test/System.Security.Cryptography/SHA512CngTest.cs
@@ -25,7 +25,7 @@ namespace MonoTests.System.Security.Cryptography {
 	// same results (hence should run a common set of unit tests).
 
 	[TestFixture]
-	public class SHA512CngTest : SHA512Test {
+	public class SHA512CngTest : SHA512TestBase {
 
 		[SetUp]
 		public override void SetUp ()
diff --git a/mcs/class/System.Core/Test/System.Security.Cryptography/SHA512CryptoServiceProviderTest.cs b/mcs/class/System.Core/Test/System.Security.Cryptography/SHA512CryptoServiceProviderTest.cs
index 512717c0bf3..83c90f5056a 100644
--- a/mcs/class/System.Core/Test/System.Security.Cryptography/SHA512CryptoServiceProviderTest.cs
+++ b/mcs/class/System.Core/Test/System.Security.Cryptography/SHA512CryptoServiceProviderTest.cs
@@ -25,7 +25,7 @@ namespace MonoTests.System.Security.Cryptography {
 	// same results (hence should run a common set of unit tests).
 
 	[TestFixture]
-	public class SHA512CryptoServiceProviderTest : SHA512Test {
+	public class SHA512CryptoServiceProviderTest : SHA512TestBase {
 
 		[SetUp]
 		public override void SetUp ()