Merge branch 'datentechnik_modularization' into moa-id-2.2-merge

Conflicts:
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
	id/server/stork2-commons/pom.xml
	id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/entries
	id/server/stork2-commons/src/main/resources/.svn/entries
	id/server/stork2-saml-engine/pom.xml
	pom.xml

1 files changed, 0 insertions, 134 deletions

diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeProvidersMapTestCase.java.svn-base b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeProvidersMapTestCase.java.svn-base
deleted file mode 100644
index 89f5adbed..000000000
--- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeProvidersMapTestCase.java.svn-base
+++ /dev/null
@@ -1,134 +0,0 @@
-package eu.stork.peps.tests;

-

-import static org.junit.Assert.assertFalse;

-import static org.junit.Assert.assertTrue;

-

-import org.junit.Test;

-

-import eu.stork.peps.auth.commons.AttributeProvider;

-import eu.stork.peps.auth.commons.AttributeProvidersMap;

-import eu.stork.peps.auth.commons.AttributeSource;

-import eu.stork.peps.auth.commons.Country;

-import eu.stork.peps.auth.commons.IAttributeProvidersMap;

-import eu.stork.peps.auth.commons.IPersonalAttributeList;

-import eu.stork.peps.auth.commons.PersonalAttributeList;

-

-/**

- * The AttributeSource's Test Case.

- * 

- * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr)

- * 

- * @version $Revision: $, $Date: $

- */

-public class AttributeProvidersMapTestCase {

-

-	@Test

-	public void testObjectOK1() {

-		final IAttributeProvidersMap map = new AttributeProvidersMap();

-		final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");

-		final IPersonalAttributeList pal = new PersonalAttributeList();

-		boolean outcome = false;

-

-		//Add a single item

-		map.put(source, pal);

-

-		if ( map.containsKey(source) ) {

-			outcome = true;

-		}

-

-		assertTrue(outcome);

-	}

-

-	@Test

-	public void testObjectOK2() {

-		final IAttributeProvidersMap map = new AttributeProvidersMap();

-		final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");

-		final IPersonalAttributeList pal = new PersonalAttributeList();

-		boolean outcome = false;

-

-		//Add a single item

-		map.put(source, pal);

-

-		if ( map.containsKey(source) ) {

-			if ( map.get(source)!=null ) {

-				outcome = true;

-			}

-		}

-

-		assertTrue(outcome);

-	}

-

-	@Test

-	public void testObjectOK3() {

-		final IAttributeProvidersMap map = new AttributeProvidersMap();

-		final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");

-		final AttributeSource target = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");

-		final IPersonalAttributeList pal = new PersonalAttributeList();

-		boolean outcome = false;

-

-		//Add a single item

-		map.put(source, pal);

-

-		if ( map.containsKey(target) ) {

-			outcome = true;

-		}

-

-		assertTrue(outcome);

-	}

-

-	@Test

-	public void testObjectOK4() {

-		final IAttributeProvidersMap map = new AttributeProvidersMap();

-		final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");

-		final AttributeSource target = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");

-		final IPersonalAttributeList pal = new PersonalAttributeList();

-		boolean outcome = false;

-

-		//Add a single item

-		map.put(source, pal);

-

-		if ( map.containsKey(target) ) {

-			if ( map.get(target)!=null ) {

-				outcome = true;

-			}

-		}

-

-		assertTrue(outcome);

-	}

-

-	@Test

-	public void testObjectNOK1() {

-		final IAttributeProvidersMap map = new AttributeProvidersMap();

-		final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");

-		final AttributeSource target = new AttributeSource(new Country("ID1", "Name 1"), "URL");

-		final IPersonalAttributeList pal = new PersonalAttributeList();

-		boolean outcome = false;

-

-		//Add a single item

-		map.put(source, pal);

-

-		if ( map.containsKey(target) ) {

-			outcome = true;

-		}

-

-		assertFalse(outcome);

-	}

-

-	@Test

-	public void testObjectNOK2() {

-		final IAttributeProvidersMap map = new AttributeProvidersMap();

-		final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");

-		final AttributeSource target = new AttributeSource(new AttributeProvider("ID2", "Name 1", null), "URL");

-		final IPersonalAttributeList pal = new PersonalAttributeList();

-		boolean outcome = false;

-

-		//Add a single item

-		map.put(source, pal);

-

-		if ( map.containsKey(target) ) {

-			outcome = true;

-		}

-

-		assertFalse(outcome);

-	}

-}