Various changes due to refactoring of Authentication Approach.

Author: Joerg Huber

SIF3InfraREST/sif3InfraCommon/src/test/java/sif3/infra/common/test/env/TestAdapterEnvStore.java

@@ -27,9 +27,9 @@
  */
 public class TestAdapterEnvStore
 {
-//	private static final String PROP_FILE_NAME = "StudentProvider";
+	private static final String PROP_FILE_NAME = "StudentProvider";
 //	private static final String PROP_FILE_NAME = "BrokeredSISProvider";
-	private static final String PROP_FILE_NAME = "StudentConsumer";
+//	private static final String PROP_FILE_NAME = "StudentConsumer";
 //  private static final String PROP_FILE_NAME = "BrokeredAttTrackerConsumer";
 
 	private AdapterEnvironmentStore testGetEnvironmentStore(String propFileName)

SIF3InfraREST/sif3InfraCommon/src/test/java/sif3/infra/common/test/env/TestConsumerEnvStoreOps.java

@@ -21,6 +21,7 @@
 import sif3.common.CommonConstants.AdapterType;
 import sif3.common.exception.MarshalException;
 import sif3.common.exception.UnsupportedMediaTypeExcpetion;
+import sif3.common.persist.common.HibernateUtil;
 import sif3.infra.common.conversion.InfraMarshalFactory;
 import sif3.infra.common.env.ops.ConsumerEnvironmentStoreOperations;
 import sif3.infra.common.model.EnvironmentType;
@@ -50,6 +51,7 @@ public class TestConsumerEnvStoreOps
 
 	public TestConsumerEnvStoreOps()
 	{
+        HibernateUtil.initialise(null);
 		envOps = new ConsumerEnvironmentStoreOperations(SERVICE_NAME);
 	}
 
@@ -87,11 +89,6 @@ private void testExistTemplateEnvironment()
 //		System.out.println("Workstore XML for Session Token "+SESSION_TOKEN+" exists: "+envOps.existEnvInWorkstoreBySessionToken(SESSION_TOKEN));
 //	}
 
-//	private void testExistWorkstoreEnvByEnvID() throws IllegalArgumentException, PersistenceException
-//	{
-//		System.out.println("Workstore XML for Env ID "+ENV_ID+" exists: "+envOps.existEnvInWorkstoreByEnvID(ENV_ID));
-//	}
-
 	private void testLoadTemplateEnvironment()
 	{
 		printEnvironment(envOps.loadTemplateEnvironmentData(TEMPLATE_FILE_NAME, CONSUMER, DIRECT));
@@ -102,18 +99,14 @@ private void testLoadTemplateEnvironment()
 //		printEnvironment(envOps.loadWorkstoreEnvBySessionToken(SESSION_TOKEN));
 //	}
 
-//	private void testLoadWorkstoreEnvByEnvID()
-//	{
-//		printEnvironment(envOps.loadWorkstoreEnvByEnvID(ENV_ID));
-//	}
 
 	private void testStoreEnvironmentToWorkstore()
 	{
 		EnvironmentType env = envOps.loadTemplateEnvironmentData(TEMPLATE_FILE_NAME, CONSUMER, DIRECT);
 		env.setConsumerName("TestConsumer");
 		env.setSolutionId("test");
 		env.getApplicationInfo().setApplicationKey("MY_APP");
-		env.setAuthenticationMethod("Basic");
+		env.setAuthenticationMethod("SAML");
 		env.setId(ENV_ID);
 		env.setSessionToken(SESSION_TOKEN);
 //		SIF3Session session = new SIF3Session(new EnvironmentKey("test", "MY_APP"));
@@ -129,11 +122,6 @@ private void testRemoveEnvFromWorkstoreBySessionTK()
 		System.out.println("Environment Removed: "+envOps.removeEnvFromWorkstoreBySessionToken(SESSION_TOKEN));
 	}
 
-//	private void testRemoveEnvFromWorkstoreByEnvID()
-//	{
-//		System.out.println("Environment Removed: "+envOps.removeEnvFromWorkstoreByEnvID(ENV_ID));
-//	}
-
 	public static void main(String[] args)
 	{
 		TestConsumerEnvStoreOps tester = new TestConsumerEnvStoreOps();
@@ -143,13 +131,10 @@ public static void main(String[] args)
 			System.out.println("Start Testing ConsumerEnvironmentStoreOperations...");
 
 //			tester.testExistTemplateEnvironment();
-//			tester.testExistWorkstoreEnvByEnvID();
 //			tester.testExistWorkstoreEnvBySessionTK();
-//			tester.testLoadTemplateEnvironment();
-//			tester.testLoadWorkstoreEnvByEnvID();
+			tester.testLoadTemplateEnvironment();
 //			tester.testLoadWorkstoreEnvBySessionTK();
-			tester.testStoreEnvironmentToWorkstore();
-//			tester.testRemoveEnvFromWorkstoreByEnvID();
+//			tester.testStoreEnvironmentToWorkstore();
 //			tester.testRemoveEnvFromWorkstoreBySessionTK();
 		}
 		catch (Exception ex)

SIF3InfraREST/sif3InfraCommon/src/test/java/sif3/infra/common/test/env/TestDirectProviderEnvStoreOps.java

@@ -24,6 +24,7 @@
 import sif3.common.exception.MarshalException;
 import sif3.common.exception.UnsupportedMediaTypeExcpetion;
 import sif3.common.model.EnvironmentKey;
+import sif3.common.persist.common.HibernateUtil;
 import sif3.common.persist.service.SIF3SessionService;
 import sif3.infra.common.conversion.InfraMarshalFactory;
 import sif3.infra.common.env.ops.DirectProviderEnvStoreOps;
@@ -45,7 +46,8 @@ public class TestDirectProviderEnvStoreOps
 	private DirectProviderEnvStoreOps envOps = null;
 	private SIF3SessionService service = new SIF3SessionService();
 
-	private static final String TEMPLATE_FILE_NAME="systemicDemoBrokerResponse.xml";
+//	private static final String TEMPLATE_FILE_NAME="systemicDemoBrokerResponse.xml";
+    private static final String TEMPLATE_FILE_NAME="devLocal.xml";
 	private static final String SERVICE_NAME="StudentProvider";
 
 	private static ObjectFactory objFactory = new ObjectFactory();
@@ -61,6 +63,7 @@ public class TestDirectProviderEnvStoreOps
 
 	public TestDirectProviderEnvStoreOps()
 	{
+        HibernateUtil.initialise(null);
 		envOps = new DirectProviderEnvStoreOps(SERVICE_NAME);
 	}
 
@@ -159,15 +162,15 @@ private void testRemoveEnvFromWorkstoreBySessionToken()
 
 	private void testCreateEnvironment()
 	{
-		EnvironmentType inputEnv = envOps.loadEnvironmentFromTemplate(TEMPLATE_FILE_NAME); // use this if BROKERED
-//		EnvironmentType inputEnv = getInputEnvironment(); // use this for DIRECT
+//		EnvironmentType inputEnv = envOps.loadEnvironmentFromTemplate(TEMPLATE_FILE_NAME); // use this if BROKERED
+		EnvironmentType inputEnv = getInputEnvironment(); // use this for DIRECT
 		printEnvironment(envOps.createEnvironmentAndSession(inputEnv, null, USE_HTTPS));
 	}
 
 	private void testCreateSession()
 	{
-		EnvironmentType inputEnv = envOps.loadEnvironmentFromTemplate(TEMPLATE_FILE_NAME); // use this if BROKERED
-//		EnvironmentType inputEnv = getInputEnvironment(); // use this for DIRECT
+//		EnvironmentType inputEnv = envOps.loadEnvironmentFromTemplate(TEMPLATE_FILE_NAME); // use this if BROKERED
+		EnvironmentType inputEnv = getInputEnvironment(); // use this for DIRECT
 
 		System.out.println("Session:\n" + envOps.createSession(inputEnv, null, USE_HTTPS));
 	}
@@ -206,10 +209,10 @@ public static void main(String[] args)
 //		tester.testExistEnvInWorkstore();
 //		tester.testLoadEnvironmentFromWorkstore();
 //		tester.testCreateEnvironment();
-//		tester.testCreateSession();
+		tester.testCreateSession();
 //		tester.testRemoveEnvFromWorkstoreByEnvID();
 //		tester.testRemoveEnvFromWorkstoreBySessionToken();
-		tester.testUpdateSessionSecurityInfo();
+//		tester.testUpdateSessionSecurityInfo();
 
 		System.out.println("End Testing ProviderEnvironmentStoreOperations.");
 	}