NUnit tweaks

6 files changed, 18 insertions, 20 deletions

diff --git a/crypto/test/src/crypto/test/NaccacheSternTest.cs b/crypto/test/src/crypto/test/NaccacheSternTest.cs
index 9168adced..732f0a02a 100644
--- a/crypto/test/src/crypto/test/NaccacheSternTest.cs
+++ b/crypto/test/src/crypto/test/NaccacheSternTest.cs
@@ -3,10 +3,8 @@ using System.Collections;
 
 using NUnit.Framework;
 
-using Org.BouncyCastle.Crypto;
 using Org.BouncyCastle.Crypto.Engines;
 using Org.BouncyCastle.Crypto.Generators;
-using Org.BouncyCastle.Crypto.Modes;
 using Org.BouncyCastle.Crypto.Parameters;
 using Org.BouncyCastle.Math;
 using Org.BouncyCastle.Security;
@@ -28,11 +26,11 @@ namespace Org.BouncyCastle.Crypto.Tests
 	 *  <li> 1024 bit test analog to 768 bit test </li>
 	 *  </ul>
 	 */
-	[TestFixture, Explicit]
+	[TestFixture]
 	public class NaccacheSternTest
 		: SimpleTest
 	{
-		static bool debug = false;
+		private const bool debug = false;
 
 		static readonly NaccacheSternEngine cryptEng = new NaccacheSternEngine();
 		static readonly NaccacheSternEngine decryptEng = new NaccacheSternEngine();
diff --git a/crypto/test/src/math/ec/rfc7748/test/X25519Test.cs b/crypto/test/src/math/ec/rfc7748/test/X25519Test.cs
index 562e0e423..336c70abf 100644
--- a/crypto/test/src/math/ec/rfc7748/test/X25519Test.cs
+++ b/crypto/test/src/math/ec/rfc7748/test/X25519Test.cs
@@ -87,11 +87,11 @@ namespace Org.BouncyCastle.Math.EC.Rfc7748.Tests
             CheckIterated(1000);
         }
 
-        //[Test, Explicit]
-        //public void TestX25519IteratedFull()
-        //{
-        //    CheckIterated(1000000);
-        //}
+        [Test, Ignore]
+        public void TestX25519IteratedFull()
+        {
+            CheckIterated(1000000);
+        }
 
         [Test]
         public void TestX25519Vector1()
diff --git a/crypto/test/src/math/ec/rfc7748/test/X448Test.cs b/crypto/test/src/math/ec/rfc7748/test/X448Test.cs
index 5c1ceb72e..c5493f4ac 100644
--- a/crypto/test/src/math/ec/rfc7748/test/X448Test.cs
+++ b/crypto/test/src/math/ec/rfc7748/test/X448Test.cs
@@ -273,11 +273,11 @@ namespace Org.BouncyCastle.Math.EC.Rfc7748.Tests
             CheckIterated(1000);
         }
 
-        //[Test, Explicit]
-        //public void TestX448IteratedFull()
-        //{
-        //    CheckIterated(1000000);
-        //}
+        [Test, Ignore]
+        public void TestX448IteratedFull()
+        {
+            CheckIterated(1000000);
+        }
 
         [Test]
         public void TestX448Vector1()
diff --git a/crypto/test/src/math/ec/test/ECAlgorithmsTest.cs b/crypto/test/src/math/ec/test/ECAlgorithmsTest.cs
index 2a05c82ce..8956998ec 100644
--- a/crypto/test/src/math/ec/test/ECAlgorithmsTest.cs
+++ b/crypto/test/src/math/ec/test/ECAlgorithmsTest.cs
@@ -24,7 +24,7 @@ namespace Org.BouncyCastle.Math.EC.Tests
             DoTestSumOfMultiplies(x9);
         }
 
-        [Test, Explicit]
+        [Test, Ignore]
         public void TestSumOfMultipliesComplete()
         {
             foreach (X9ECParameters x9 in GetTestCurves())
@@ -41,7 +41,7 @@ namespace Org.BouncyCastle.Math.EC.Tests
             DoTestSumOfTwoMultiplies(x9);
         }
 
-        [Test, Explicit]
+        [Test, Ignore]
         public void TestSumOfTwoMultipliesComplete()
         {
             foreach (X9ECParameters x9 in GetTestCurves())
diff --git a/crypto/test/src/math/ec/test/ECPointPerformanceTest.cs b/crypto/test/src/math/ec/test/ECPointPerformanceTest.cs
index 1cf8c81f6..2ee16a8d8 100644
--- a/crypto/test/src/math/ec/test/ECPointPerformanceTest.cs
+++ b/crypto/test/src/math/ec/test/ECPointPerformanceTest.cs
@@ -21,7 +21,7 @@ namespace Org.BouncyCastle.Math.EC.Tests
     * Compares the performance of the the window NAF point multiplication against
     * conventional point multiplication.
     */
-    [TestFixture, Explicit]
+    [TestFixture]
     public class ECPointPerformanceTest
     {
         internal const int MILLIS_PER_ROUND = 200;
diff --git a/crypto/test/src/math/ec/test/TnafTest.cs b/crypto/test/src/math/ec/test/TnafTest.cs
index f5a58e858..98aff0025 100644
--- a/crypto/test/src/math/ec/test/TnafTest.cs
+++ b/crypto/test/src/math/ec/test/TnafTest.cs
@@ -10,7 +10,7 @@
 //
 //namespace Org.BouncyCastle.Math.EC.Tests
 //{
-//	[TestFixture, Explicit]
+//	[TestFixture]
 //	public class TnafTest
 //	{
 //		private Random m_rand = new Random();
@@ -79,7 +79,7 @@
 //			Console.WriteLine();
 //		}
 //
-//		[Test]
+//		[Test, Ignore]
 //		public void TestMultiplyTnaf() 
 //		{
 //			Console.WriteLine("\n\n\n*****  Start test multiplications on F2m (Koblitz) *****");
@@ -127,7 +127,7 @@
 //			Console.WriteLine();
 //		}
 //
-//		[Test]
+//		[Test, Ignore]
 //		public void TestMultiplyWnaf() 
 //		{
 //			Console.WriteLine("\n\n\n*****  Start test multiplications on F2m *****");