diff options
author | Oren Novotny <oren@novotny.org> | 2019-08-22 09:14:45 -0400 |
---|---|---|
committer | Oren Novotny <oren@novotny.org> | 2019-08-22 09:14:45 -0400 |
commit | 59cbaee0856cc7bb5467fe369e369c39f7977425 (patch) | |
tree | f5532c539fb2dbe2f8ff8af1a893db6ac3331463 /crypto | |
parent | Fix parsing of test messages due to using arg exception with parameter name (diff) | |
download | BouncyCastle.NET-ed25519-59cbaee0856cc7bb5467fe369e369c39f7977425.tar.xz |
Remove unneeded ifdef's
Diffstat (limited to 'crypto')
31 files changed, 21 insertions, 61 deletions
diff --git a/crypto/test/src/asn1/test/AdditionalInformationSyntaxUnitTest.cs b/crypto/test/src/asn1/test/AdditionalInformationSyntaxUnitTest.cs index d36385a1a..b7246193b 100644 --- a/crypto/test/src/asn1/test/AdditionalInformationSyntaxUnitTest.cs +++ b/crypto/test/src/asn1/test/AdditionalInformationSyntaxUnitTest.cs @@ -59,13 +59,12 @@ namespace Org.BouncyCastle.Asn1.Tests { checkMandatoryField("information", information, syntax.Information); } -#if !LIB + public static void Main( string[] args) { RunTest(new AdditionalInformationSyntaxUnitTest()); } -#endif [Test] public void TestFunction() diff --git a/crypto/test/src/asn1/test/AdmissionSyntaxUnitTest.cs b/crypto/test/src/asn1/test/AdmissionSyntaxUnitTest.cs index c0ed38167..8d0a1f821 100644 --- a/crypto/test/src/asn1/test/AdmissionSyntaxUnitTest.cs +++ b/crypto/test/src/asn1/test/AdmissionSyntaxUnitTest.cs @@ -82,13 +82,11 @@ namespace Org.BouncyCastle.Asn1.Tests } } -#if !LIB public static void Main( string[] args) { RunTest(new AdmissionSyntaxUnitTest()); } -#endif [Test] public void TestFunction() diff --git a/crypto/test/src/asn1/test/AdmissionsUnitTest.cs b/crypto/test/src/asn1/test/AdmissionsUnitTest.cs index 353dfd9d9..42d465861 100644 --- a/crypto/test/src/asn1/test/AdmissionsUnitTest.cs +++ b/crypto/test/src/asn1/test/AdmissionsUnitTest.cs @@ -72,13 +72,12 @@ namespace Org.BouncyCastle.Asn1.Tests checkMandatoryField("admissionAuthority", name, admissions.AdmissionAuthority); checkMandatoryField("namingAuthority", auth, admissions.NamingAuthority); } -#if !LIB + public static void Main( string[] args) { RunTest(new AdmissionsUnitTest()); } -#endif [Test] public void TestFunction() diff --git a/crypto/test/src/asn1/test/AttributeTableUnitTest.cs b/crypto/test/src/asn1/test/AttributeTableUnitTest.cs index 4e04ab978..5dcf349cc 100644 --- a/crypto/test/src/asn1/test/AttributeTableUnitTest.cs +++ b/crypto/test/src/asn1/test/AttributeTableUnitTest.cs @@ -134,13 +134,11 @@ namespace Org.BouncyCastle.Asn1.Tests } } -#if !LIB public static void Main( string[] args) { RunTest(new AttributeTableUnitTest()); } -#endif [Test] public void TestFunction() diff --git a/crypto/test/src/asn1/test/BitStringTest.cs b/crypto/test/src/asn1/test/BitStringTest.cs index 5765e8a33..35b7811bc 100644 --- a/crypto/test/src/asn1/test/BitStringTest.cs +++ b/crypto/test/src/asn1/test/BitStringTest.cs @@ -159,13 +159,11 @@ namespace Org.BouncyCastle.Asn1.Tests get { return "BitString"; } } -#if !LIB public static void Main( string[] args) { RunTest(new BitStringTest()); } -#endif [Test] public void TestFunction() diff --git a/crypto/test/src/asn1/test/CMSTest.cs b/crypto/test/src/asn1/test/CMSTest.cs index f474198d8..1afb363af 100644 --- a/crypto/test/src/asn1/test/CMSTest.cs +++ b/crypto/test/src/asn1/test/CMSTest.cs @@ -286,7 +286,6 @@ namespace Org.BouncyCastle.Asn1.Tests get { return "CMS"; } } -#if !LIB public static void Main( string[] args) { @@ -295,7 +294,6 @@ namespace Org.BouncyCastle.Asn1.Tests Console.WriteLine(result); } -#endif [Test] public void TestFunction() diff --git a/crypto/test/src/asn1/test/CertHashUnitTest.cs b/crypto/test/src/asn1/test/CertHashUnitTest.cs index b0e7198d0..1e271a9c0 100644 --- a/crypto/test/src/asn1/test/CertHashUnitTest.cs +++ b/crypto/test/src/asn1/test/CertHashUnitTest.cs @@ -76,13 +76,11 @@ namespace Org.BouncyCastle.Asn1.Tests checkMandatoryField("certificateHash", digest, certHash.CertificateHash); } -#if !LIB public static void Main( string[] args) { RunTest(new CertHashUnitTest()); } -#endif [Test] public void TestFunction() diff --git a/crypto/test/src/asn1/test/CertificateTest.cs b/crypto/test/src/asn1/test/CertificateTest.cs index e40b00620..7fcb1fffa 100644 --- a/crypto/test/src/asn1/test/CertificateTest.cs +++ b/crypto/test/src/asn1/test/CertificateTest.cs @@ -378,13 +378,11 @@ namespace Org.BouncyCastle.Asn1.Tests CheckAttributeCertificate(8, cert8); } -#if !LIB public static void Main( string[] args) { RunTest(new CertificateTest()); } -#endif [Test] public void TestFunction() diff --git a/crypto/test/src/asn1/test/CommitmentTypeIndicationUnitTest.cs b/crypto/test/src/asn1/test/CommitmentTypeIndicationUnitTest.cs index 2438b9568..20c2d18e3 100644 --- a/crypto/test/src/asn1/test/CommitmentTypeIndicationUnitTest.cs +++ b/crypto/test/src/asn1/test/CommitmentTypeIndicationUnitTest.cs @@ -90,13 +90,11 @@ namespace Org.BouncyCastle.Asn1.Tests } } -#if !LIB public static void Main( string[] args) { RunTest(new CommitmentTypeIndicationUnitTest()); } -#endif [Test] public void TestFunction() diff --git a/crypto/test/src/asn1/test/CommitmentTypeQualifierUnitTest.cs b/crypto/test/src/asn1/test/CommitmentTypeQualifierUnitTest.cs index b8a9615c0..192ac52f6 100644 --- a/crypto/test/src/asn1/test/CommitmentTypeQualifierUnitTest.cs +++ b/crypto/test/src/asn1/test/CommitmentTypeQualifierUnitTest.cs @@ -90,13 +90,11 @@ namespace Org.BouncyCastle.Asn1.Tests } } -#if !LIB public static void Main( string[] args) { RunTest(new CommitmentTypeQualifierUnitTest()); } -#endif [Test] public void TestFunction() diff --git a/crypto/test/src/asn1/test/ContentHintsUnitTest.cs b/crypto/test/src/asn1/test/ContentHintsUnitTest.cs index 3136e5d84..d7453c27e 100644 --- a/crypto/test/src/asn1/test/ContentHintsUnitTest.cs +++ b/crypto/test/src/asn1/test/ContentHintsUnitTest.cs @@ -76,13 +76,11 @@ namespace Org.BouncyCastle.Asn1.Tests checkOptionalField("description", description, hints.ContentDescription); } -#if !LIB public static void Main( string[] args) { RunTest(new ContentHintsUnitTest()); } -#endif [Test] public void TestFunction() diff --git a/crypto/test/src/asn1/test/CscaMasterListTest.cs b/crypto/test/src/asn1/test/CscaMasterListTest.cs index 71156cff0..814e98b2a 100644 --- a/crypto/test/src/asn1/test/CscaMasterListTest.cs +++ b/crypto/test/src/asn1/test/CscaMasterListTest.cs @@ -40,13 +40,11 @@ namespace Org.BouncyCastle.Asn1.Tests return Streams.ReadAll(SimpleTest.GetTestDataAsStream("asn1." + name)); } -#if !LIB public static void Main( string[] args) { RunTest(new CscaMasterListTest()); } -#endif [Test] public void TestFunction() diff --git a/crypto/test/src/asn1/test/DERApplicationSpecificTest.cs b/crypto/test/src/asn1/test/DERApplicationSpecificTest.cs index 70c2996be..e505acd9d 100644 --- a/crypto/test/src/asn1/test/DERApplicationSpecificTest.cs +++ b/crypto/test/src/asn1/test/DERApplicationSpecificTest.cs @@ -128,13 +128,11 @@ namespace Org.BouncyCastle.Asn1.Tests } } -#if !LIB public static void Main( string[] args) { RunTest(new DerApplicationSpecificTest()); } -#endif [Test] public void TestFunction() diff --git a/crypto/test/src/asn1/test/DERUTF8StringTest.cs b/crypto/test/src/asn1/test/DERUTF8StringTest.cs index 024fff7a4..be4dace79 100644 --- a/crypto/test/src/asn1/test/DERUTF8StringTest.cs +++ b/crypto/test/src/asn1/test/DERUTF8StringTest.cs @@ -93,7 +93,6 @@ namespace Org.BouncyCastle.Asn1.Tests } } -#if !LIB public static void Main( string[] args) { @@ -102,7 +101,6 @@ namespace Org.BouncyCastle.Asn1.Tests Console.WriteLine(result); } -#endif [Test] public void TestFunction() diff --git a/crypto/test/src/asn1/test/DataGroupHashUnitTest.cs b/crypto/test/src/asn1/test/DataGroupHashUnitTest.cs index b0b5c6bfc..dcebf4670 100644 --- a/crypto/test/src/asn1/test/DataGroupHashUnitTest.cs +++ b/crypto/test/src/asn1/test/DataGroupHashUnitTest.cs @@ -89,13 +89,11 @@ namespace Org.BouncyCastle.Asn1.Tests } } -#if !LIB public static void Main( string[] args) { RunTest(new DataGroupHashUnitTest()); } -#endif [Test] public void TestFunction() diff --git a/crypto/test/src/asn1/test/DeclarationOfMajorityUnitTest.cs b/crypto/test/src/asn1/test/DeclarationOfMajorityUnitTest.cs index ace572c02..f9eef4f47 100644 --- a/crypto/test/src/asn1/test/DeclarationOfMajorityUnitTest.cs +++ b/crypto/test/src/asn1/test/DeclarationOfMajorityUnitTest.cs @@ -76,13 +76,11 @@ namespace Org.BouncyCastle.Asn1.Tests } } -#if !LIB public static void Main( string[] args) { RunTest(new DeclarationOfMajorityUnitTest()); } -#endif [Test] public void TestFunction() diff --git a/crypto/test/src/asn1/test/EncryptedPrivateKeyInfoTest.cs b/crypto/test/src/asn1/test/EncryptedPrivateKeyInfoTest.cs index a64457c7b..a84df59cc 100644 --- a/crypto/test/src/asn1/test/EncryptedPrivateKeyInfoTest.cs +++ b/crypto/test/src/asn1/test/EncryptedPrivateKeyInfoTest.cs @@ -132,7 +132,6 @@ namespace Org.BouncyCastle.Asn1.Tests return new SimpleTestResult(true, Name + ": Okay"); } -#if !LIB public static void Main( string[] args) { @@ -141,7 +140,6 @@ namespace Org.BouncyCastle.Asn1.Tests Console.WriteLine(result); } -#endif [Test] public void TestFunction() diff --git a/crypto/test/src/asn1/test/EqualsAndHashCodeTest.cs b/crypto/test/src/asn1/test/EqualsAndHashCodeTest.cs index bedf86739..91329fbd5 100644 --- a/crypto/test/src/asn1/test/EqualsAndHashCodeTest.cs +++ b/crypto/test/src/asn1/test/EqualsAndHashCodeTest.cs @@ -79,13 +79,13 @@ namespace Org.BouncyCastle.Asn1.Tests { get { return "EqualsAndHashCode"; } } -#if !LIB + public static void Main( string[] args) { RunTest(new EqualsAndHashCodeTest()); } -#endif + [Test] public void TestFunction() { diff --git a/crypto/test/src/asn1/test/EssCertIDv2UnitTest.cs b/crypto/test/src/asn1/test/EssCertIDv2UnitTest.cs index 66363b59a..8f53c9b3d 100644 --- a/crypto/test/src/asn1/test/EssCertIDv2UnitTest.cs +++ b/crypto/test/src/asn1/test/EssCertIDv2UnitTest.cs @@ -28,13 +28,12 @@ namespace Org.BouncyCastle.Asn1.Tests EssCertIDv2.GetInstance(asn1Object); } -#if !LIB + public static void Main( string[] args) { RunTest(new EssCertIDv2UnitTest()); } -#endif [Test] public void TestFunction() diff --git a/crypto/test/src/asn1/test/GeneralNameTest.cs b/crypto/test/src/asn1/test/GeneralNameTest.cs index 2ef2ad0d7..e9c3b5861 100644 --- a/crypto/test/src/asn1/test/GeneralNameTest.cs +++ b/crypto/test/src/asn1/test/GeneralNameTest.cs @@ -98,13 +98,12 @@ namespace Org.BouncyCastle.Asn1.Tests Fail("ipv6h failed"); } } -#if !LIB + public static void Main( string[] args) { RunTest(new GeneralNameTest()); } -#endif [Test] public void TestFunction() diff --git a/crypto/test/src/asn1/test/GeneralizedTimeTest.cs b/crypto/test/src/asn1/test/GeneralizedTimeTest.cs index 2d8fff11e..c079a175e 100644 --- a/crypto/test/src/asn1/test/GeneralizedTimeTest.cs +++ b/crypto/test/src/asn1/test/GeneralizedTimeTest.cs @@ -213,13 +213,12 @@ namespace Org.BouncyCastle.Asn1.Tests return time.ToString(); } -#if !LIB + public static void Main( string[] args) { RunTest(new GeneralizedTimeTest()); } -#endif [Test] public void TestFunction() diff --git a/crypto/test/src/asn1/test/GenerationTest.cs b/crypto/test/src/asn1/test/GenerationTest.cs index 77e7fee52..862e66d22 100644 --- a/crypto/test/src/asn1/test/GenerationTest.cs +++ b/crypto/test/src/asn1/test/GenerationTest.cs @@ -307,13 +307,12 @@ namespace Org.BouncyCastle.Asn1.Tests { get { return "Generation"; } } -#if !LIB + public static void Main( string[] args) { RunTest(new GenerationTest()); } -#endif [Test] public void TestFunction() diff --git a/crypto/test/src/asn1/test/InputStreamTest.cs b/crypto/test/src/asn1/test/InputStreamTest.cs index 57bfd2b59..1d92759e0 100644 --- a/crypto/test/src/asn1/test/InputStreamTest.cs +++ b/crypto/test/src/asn1/test/InputStreamTest.cs @@ -67,13 +67,12 @@ namespace Org.BouncyCastle.Asn1.Tests } } } -#if !LIB + public static void Main( string[] args) { RunTest(new InputStreamTest()); } -#endif [Test] public void TestFunction() diff --git a/crypto/test/src/asn1/test/Iso4217CurrencyCodeUnitTest.cs b/crypto/test/src/asn1/test/Iso4217CurrencyCodeUnitTest.cs index 2ebfbb2e8..bb6076a93 100644 --- a/crypto/test/src/asn1/test/Iso4217CurrencyCodeUnitTest.cs +++ b/crypto/test/src/asn1/test/Iso4217CurrencyCodeUnitTest.cs @@ -139,13 +139,11 @@ namespace Org.BouncyCastle.Asn1.Tests } } -#if !LIB public static void Main( string[] args) { RunTest(new Iso4217CurrencyCodeUnitTest()); } -#endif [Test] public void TestFunction() diff --git a/crypto/test/src/asn1/test/IssuingDistributionPointTest.cs b/crypto/test/src/asn1/test/IssuingDistributionPointTest.cs index e9dcbae0d..f23edfaef 100644 --- a/crypto/test/src/asn1/test/IssuingDistributionPointTest.cs +++ b/crypto/test/src/asn1/test/IssuingDistributionPointTest.cs @@ -115,13 +115,13 @@ namespace Org.BouncyCastle.Asn1.Tests return o1.Equals(o2); } -#if !LIB + public static void Main( string[] args) { RunTest(new IssuingDistributionPointUnitTest()); } -#endif + [Test] public void TestFunction() { diff --git a/crypto/test/src/asn1/test/KeyUsageTest.cs b/crypto/test/src/asn1/test/KeyUsageTest.cs index 7e155e88f..d7ed3655d 100644 --- a/crypto/test/src/asn1/test/KeyUsageTest.cs +++ b/crypto/test/src/asn1/test/KeyUsageTest.cs @@ -31,13 +31,13 @@ namespace Org.BouncyCastle.Asn1.Tests BitStringConstantTester.testFlagValueCorrect(7, KeyUsage.EncipherOnly); BitStringConstantTester.testFlagValueCorrect(8, KeyUsage.DecipherOnly); } -#if !LIB + public static void Main( string[] args) { RunTest(new KeyUsageTest()); } -#endif + [Test] public void TestFunction() { diff --git a/crypto/test/src/asn1/test/LDSSecurityObjectUnitTest.cs b/crypto/test/src/asn1/test/LDSSecurityObjectUnitTest.cs index 729506be0..545399621 100644 --- a/crypto/test/src/asn1/test/LDSSecurityObjectUnitTest.cs +++ b/crypto/test/src/asn1/test/LDSSecurityObjectUnitTest.cs @@ -191,13 +191,13 @@ namespace Org.BouncyCastle.Asn1.Tests Fail("version info found when none expected."); } } -#if !LIB + public static void Main( string[] args) { RunTest(new LDSSecurityObjectUnitTest()); } -#endif + [Test] public void TestFunction() { diff --git a/crypto/test/src/asn1/test/MiscTest.cs b/crypto/test/src/asn1/test/MiscTest.cs index 1918fd782..5c48b6f07 100644 --- a/crypto/test/src/asn1/test/MiscTest.cs +++ b/crypto/test/src/asn1/test/MiscTest.cs @@ -130,13 +130,12 @@ namespace Org.BouncyCastle.Asn1.Tests { get { return "Misc"; } } -#if !LIB + public static void Main( string[] args) { RunTest(new MiscTest()); } -#endif [Test] public void TestFunction() diff --git a/crypto/test/src/asn1/test/MonetaryLimitUnitTest.cs b/crypto/test/src/asn1/test/MonetaryLimitUnitTest.cs index 38d906105..cdeb2eca5 100644 --- a/crypto/test/src/asn1/test/MonetaryLimitUnitTest.cs +++ b/crypto/test/src/asn1/test/MonetaryLimitUnitTest.cs @@ -75,13 +75,13 @@ namespace Org.BouncyCastle.Asn1.Tests checkMandatoryField("amount", amount, limit.Amount.IntValue); checkMandatoryField("exponent", exponent, limit.Exponent.IntValue); } -#if !LIB + public static void Main( string[] args) { RunTest(new MonetaryLimitUnitTest()); } -#endif + [Test] public void TestFunction() { diff --git a/crypto/test/src/asn1/test/OIDTest.cs b/crypto/test/src/asn1/test/OIDTest.cs index 261f67e5f..b0782db04 100644 --- a/crypto/test/src/asn1/test/OIDTest.cs +++ b/crypto/test/src/asn1/test/OIDTest.cs @@ -128,7 +128,7 @@ namespace Org.BouncyCastle.Asn1.Tests onCheck("1.1", "1.1.1", true); onCheck("1.1", "1.1.2", true); } -#if !LIB + public static void Main( string[] args) { @@ -137,7 +137,7 @@ namespace Org.BouncyCastle.Asn1.Tests Console.WriteLine(result); } -#endif + [Test] public void TestFunction() { diff --git a/crypto/test/src/cms/test/AuthenticatedDataTest.cs b/crypto/test/src/cms/test/AuthenticatedDataTest.cs index c34d70e48..0ad34a95b 100644 --- a/crypto/test/src/cms/test/AuthenticatedDataTest.cs +++ b/crypto/test/src/cms/test/AuthenticatedDataTest.cs @@ -124,7 +124,7 @@ namespace Org.BouncyCastle.Cms.Tests // super(name); // } // -// public static void Main(string args[]) +// public static void main(string args[]) // { // junit.textui.TestRunner.run(AuthenticatedDataTest.class); // } |