Merge pull request #30 from digipost/updated-assembly-version

Updated assembly version to match nuget version
digipost · Jan 2, 2024 · 9ca1da0 · 9ca1da0
2 parents 49d8c12 + c6e6e43
commit 9ca1da0
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 104 deletions.
diff --git a/Digipost.Api.Client.Shared.Tests/Certificate/CertificateChainValidatorTests.cs b/Digipost.Api.Client.Shared.Tests/Certificate/CertificateChainValidatorTests.cs
@@ -27,10 +27,10 @@ public void Fails_with_self_signed_certificate()
             public void Fails_with_wrong_root_and_intermediate()
             {
                 //Arrange
-                var productionCertificate = CertificateResource.UnitTests.GetProduksjonsMottakerSertifikatOppslagstjenesten();
+                var productionCertificate = CertificateResource.UnitTests.Seid2TestSertifikat();
 
                 //Act
-                var certificateChainValidator = new CertificateChainValidator(CertificateChainUtility.FunksjoneltTestmiljøSertifikater());
+                var certificateChainValidator = new CertificateChainValidator(CertificateChainUtility.ProduksjonsSertifikater());
                 var result = certificateChainValidator.Validate(productionCertificate);
 
                 //Assert
@@ -42,11 +42,11 @@ public void Fails_with_wrong_root_and_intermediate()
             public void Valid_with_correct_root_and_intermediate()
             {
                 //Arrange
-                var productionCertificate = CertificateResource.UnitTests.GetProduksjonsMottakerSertifikatOppslagstjenesten();
-                var certificateChainValidator = new CertificateChainValidator(CertificateChainUtility.ProduksjonsSertifikater());
+                var testCertificate = CertificateResource.UnitTests.Seid2TestSertifikat();
+                var certificateChainValidator = new CertificateChainValidator(CertificateChainUtility.FunksjoneltTestmiljøSertifikater());
 
                 //Act
-                var result = certificateChainValidator.Validate(productionCertificate);
+                var result = certificateChainValidator.Validate(testCertificate);
 
                 //Assert
                 Assert.Equal(CertificateValidationType.Valid, result.Type);

diff --git a/Digipost.Api.Client.Shared.Tests/Certificate/CertificateValidatorTests.cs b/Digipost.Api.Client.Shared.Tests/Certificate/CertificateValidatorTests.cs
@@ -60,19 +60,6 @@ public void Returns_not_ok_if_valid_seid2_certificate_and_chain_but_wrong_org_nu
                 Assert.Equal(InvalidCertificate, result.Type);
             }
 
-            [Fact]
-            public void Returns_ok_if_valid_certificate_and_chain()
-            {
-                //Arrange
-                var funksjoneltTestmiljøSertifikater = FunksjoneltTestmiljøSertifikater();
-
-                //Act
-                var result = ValidateCertificateAndChainInternal(GetPostenTestCertificate(), "984661185", funksjoneltTestmiljøSertifikater);
-
-                //Assert
-                Assert.Equal(Valid, result.Type);
-                Assert.Contains("is a valid certificate", result.Message);
-            }
         }
 
         public class ValidateCertificateMethodWithOrganizationNumber : CertificateValidatorTests
@@ -98,7 +85,7 @@ public void Calls_validate_certificate_overload_with_no_organization_number()
             public void Ignores_issued_to_organization_if_no_organization_number()
             {
                 //Act
-                var result = ValidateCertificate(GetPostenTestCertificate(), string.Empty);
+                var result = ValidateCertificate(Seid2TestSertifikat(), string.Empty);
 
                 //Assert
                 Assert.Equal(Valid, result.Type);
@@ -112,7 +99,7 @@ public void Returns_fail_if_not_issued_to_organization_number()
                 const string certificateOrganizationNumber = "123456789";
 
                 //Act
-                var result = ValidateCertificate(TestIntegrasjonssertifikat(), certificateOrganizationNumber);
+                var result = ValidateCertificate(Seid2TestSertifikat(), certificateOrganizationNumber);
 
                 //Assert
                 Assert.Equal(InvalidCertificate, result.Type);
@@ -123,10 +110,10 @@ public void Returns_fail_if_not_issued_to_organization_number()
             public void Returns_ok_if_valid()
             {
                 //Arrange
-                const string certificateOrganizationNumber = "984661185";
+                const string certificateOrganizationNumber = "100101688";
 
                 //Act
-                var result = ValidateCertificate(GetPostenTestCertificate(), certificateOrganizationNumber);
+                var result = ValidateCertificate(Seid2TestSertifikat(), certificateOrganizationNumber);
 
                 //Assert
                 Assert.Equal(Valid, result.Type);
@@ -181,7 +168,7 @@ public void Returns_ok_if_valid()
                 //Arrange
 
                 //Act
-                var result = ValidateCertificate(GetPostenTestCertificate());
+                var result = ValidateCertificate(Seid2TestSertifikat());
 
                 //Assert
                 Assert.Equal(Valid, result.Type);

diff --git a/Digipost.Api.Client.Shared/Resources/Certificate/CertificateResource.cs b/Digipost.Api.Client.Shared/Resources/Certificate/CertificateResource.cs
@@ -16,16 +16,6 @@ private static X509Certificate2 GetCertificate(params string[] path)
 
         public static class UnitTests
         {
-            public static X509Certificate2 GetProduksjonsMottakerSertifikatOppslagstjenesten()
-            {
-                return GetCertificate("UnitTests", "produksjonsmottakersertifikatFraOppslagstjenesten.pem");
-            }
-
-            public static X509Certificate2 GetFunksjoneltTestmiljøMottakerSertifikatOppslagstjenesten()
-            {
-                return GetCertificate("UnitTests", "testmottakersertifikatFraOppslagstjenesten.pem");
-            }
-
             public static X509Certificate2 NotActivatedSelfSignedTestCertificate()
             {
                 return GetCertificate("UnitTests", "NotActivatedSelfSignedBringAs.cer");
@@ -41,21 +31,11 @@ public static X509Certificate2 GetValidSelfSignedTestCertificate()
                 return GetCertificate("UnitTests", "ValidSelfSignedBringAs.cer");
             }
 
-            public static X509Certificate2 TestIntegrasjonssertifikat()
-            {
-                return GetPostenTestCertificate();
-            }
-
             public static X509Certificate2 GetEnhetstesterSelvsignertSertifikat()
             {
                 return GetCertificate("UnitTests", "difi-enhetstester.cer");
             }
 
-            public static X509Certificate2 GetPostenTestCertificate()
-            {
-                return GetFunksjoneltTestmiljøMottakerSertifikatOppslagstjenesten();
-            }
-
             public static X509Certificate2 Seid2TestSertifikat()
             {
                 return GetCertificate("UnitTests", "seid2.cer");

diff --git a/...esources/Certificate/Data/UnitTests/produksjonsmottakersertifikatFraOppslagstjenesten.pem b/...esources/Certificate/Data/UnitTests/produksjonsmottakersertifikatFraOppslagstjenesten.pem
diff --git a/...hared/Resources/Certificate/Data/UnitTests/testmottakersertifikatFraOppslagstjenesten.pem b/...hared/Resources/Certificate/Data/UnitTests/testmottakersertifikatFraOppslagstjenesten.pem
diff --git a/SolutionItems/AssemblyInfo.cs b/SolutionItems/AssemblyInfo.cs
@@ -4,7 +4,7 @@
 [assembly: AssemblyTrademark("Posten Norge AS")]
 [assembly: AssemblyProduct("Api Client Shared")]
 [assembly: AssemblyDescription("Digipost common library for API integration.")]
-[assembly: AssemblyVersion("6.0.0.0")]
-[assembly: AssemblyFileVersion("6.0.0.0")]
+[assembly: AssemblyVersion("7.0.0.0")]
+[assembly: AssemblyFileVersion("7.0.0.0")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyCopyright("© 2015-2020 Posten Norge AS")]