Bug 271: Adpation auf neue Struktur des Konfigurationsfiles abgeschlossen. Noch ungetestet.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@414 d688527b-c9ab-4aba-bd8d-4036d912da1d

2 files changed, 3 insertions, 12 deletions

diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest.java b/spss.server/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest.java
index 07b3c7010..d41b8e4b2 100644
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest.java
+++ b/spss.server/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest.java
@@ -110,9 +110,9 @@ public class ConfigurationProviderTest extends SPSSTestCase {
   public void testGetCRLDP() {
     Set dps;
 
-    dps = provider.getCRLDP(atrustCert);
+    dps = provider.getDistributionPoints(atrustCert);
     assertEquals(0, dps.size());
-    dps = provider.getCRLDP(iaikCert);
+    dps = provider.getDistributionPoints(iaikCert);
     assertEquals(3, dps.size());
   }
 
@@ -120,15 +120,6 @@ public class ConfigurationProviderTest extends SPSSTestCase {
     assertEquals(365, provider.getCRLArchiveDuration());
   }
 
-  public void testGetGenericConfiguration() {
-    assertEquals(
-      "tmp/aValidPathName",
-      provider.getGenericConfiguration("DirectoryCertStoreParameters.RootDir"));
-    assertNull(provider.getGenericConfiguration("notExisting"));
-    assertEquals(
-      "default",
-      provider.getGenericConfiguration("notExisting", "default"));
-  }
 
   public void testGetCreateTransformsInfoProfile() {
     Element profile;
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java b/spss.server/src/test/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java
index 29e00e0e7..be1090e4a 100644
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java
+++ b/spss.server/src/test/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java
@@ -97,7 +97,7 @@ public class ConfigurationDataImplTest extends SPSSTestCase {
 
     // test revocation configuration
     distributionPoints =
-      revocationConfig.getAlternativeDistributionPoints(iaikCert, new Date());
+      revocationConfig.getAlternativeDistributionPoints(iaikCert, null, new Date());
     assertEquals(3, distributionPoints.size());
     found = false;
     for (iter = distributionPoints.iterator(); iter.hasNext();) {