ProjectSettings are now configured when the bean is created (without call to a struts...

[tools/siman.git] / Workspace / Siman-Common / src / test / splat / service / TestProjectSettingsService.java

diff --git a/Workspace/Siman-Common/src/test/splat/service/TestProjectSettingsService.java b/Workspace/Siman-Common/src/test/splat/service/TestProjectSettingsService.java
index 78d376b3564c0c1a395e2e05315fa28db8a39782..5d9e769c0a65881e7e6cc27d71fa7782976a644e 100644 (file)
--- a/Workspace/Siman-Common/src/test/splat/service/TestProjectSettingsService.java
+++ b/Workspace/Siman-Common/src/test/splat/service/TestProjectSettingsService.java
@@ -22,6 +22,7 @@ import org.splat.service.DocumentTypeService;
 import org.splat.service.KnowledgeElementTypeService;
 import org.splat.service.SimulationContextService;
 import org.splat.service.technical.ProjectSettingsService;
+import org.splat.service.technical.StepsConfigService;
 import org.splat.service.technical.ProjectSettingsService.Step;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -52,6 +53,13 @@ public class TestProjectSettingsService extends BaseTest {
        @Qualifier("projectSettings")
        private transient ProjectSettingsService _projectSettings;
 
+       /**
+        * The StepsConfigService. Later injected by Spring.
+        */
+       @Autowired
+       @Qualifier("stepsConfigService")
+       private transient StepsConfigService _stepsConfigService;
+
        /**
         * The DocumentTypeService. Later injected by Spring.
         */
@@ -113,12 +121,11 @@ public class TestProjectSettingsService extends BaseTest {
                 */
                _projectSettings.getAllSteps().clear(); // Clear config to be able to load it again
                try {
-                       _projectSettings.configure(ClassLoader.getSystemResource(
-                                       "test/som.xml").getPath());
+                       _projectSettings.configure("classpath:test/som.xml");
                } catch (FileNotFoundException e) {
                        Assert.fail("Can't find configuration file: ", e);
                }
-               List<Step> steps = _projectSettings.getStepsOf(Scenario.class);
+               List<Step> steps = _stepsConfigService.getStepsOf(Scenario.class);
                Assert.assertTrue(steps.size() > 0, "No steps are created.");
                Assert.assertTrue(_projectSettings.doImport("geometry", "brep"));
                Assert.assertTrue(_projectSettings.doImport("model", "med"));
@@ -128,12 +135,11 @@ public class TestProjectSettingsService extends BaseTest {
                // ////// Load workflow customization with empty mappings
                _projectSettings.getAllSteps().clear(); // Clear config to be able to load it again
                try {
-                       _projectSettings.configure(ClassLoader.getSystemResource(
-                                       "test/som-without-mappings.xml").getPath());
+                       _projectSettings.configure("classpath:test/som-without-mappings.xml");
                } catch (FileNotFoundException e) {
                        Assert.fail("Can't find configuration file: ", e);
                }
-               steps = _projectSettings.getStepsOf(Scenario.class);
+               steps = _stepsConfigService.getStepsOf(Scenario.class);
                Assert.assertTrue(steps.size() > 0, "No steps are created.");
                Assert.assertFalse(_projectSettings.doImport("geometry", "brep"));
                Assert.assertFalse(_projectSettings.doImport("model", "med"));
@@ -143,9 +149,7 @@ public class TestProjectSettingsService extends BaseTest {
                // ////// Load workflow customization from not existing file
                _projectSettings.getAllSteps().clear(); // Clear config to be able to load it again
                try {
-                       _projectSettings.configure(ClassLoader.getSystemResource("/")
-                                       .getPath()
-                                       + "test/xxx.xml");
+                       _projectSettings.configure("classpath:test/xxx.xml");
                        Assert
                                        .fail("Customization loading must fail for not existing configuration file.");
                } catch (FileNotFoundException e) {
@@ -242,14 +246,13 @@ public class TestProjectSettingsService extends BaseTest {
                Database.getInstance().reset();
                _projectSettings.getAllSteps().clear(); // Clear config to be able to load it again
                try {
-                       _projectSettings.configure(ClassLoader.getSystemResource(
-                                       "test/som.xml").getPath());
+                       _projectSettings.configure("classpath:test/som.xml");
                } catch (FileNotFoundException e) {
                        Assert.fail("Can't find configuration file: ", e);
                }
                Assert.assertTrue(_documentTypeService.selectAllTypes().size() > 0,
                                "No document types are created.");
-               List<Step> steps = _projectSettings.getStepsOf(Scenario.class);
+               List<Step> steps = _stepsConfigService.getStepsOf(Scenario.class);
                Assert.assertTrue(steps.size() > 0, "No steps are created.");
 
                for (Step step : steps) {
@@ -401,12 +404,11 @@ public class TestProjectSettingsService extends BaseTest {
                // ////// Load workflow customization with empty mappings
                _projectSettings.getAllSteps().clear(); // Clear config to be able to load it again
                try {
-                       _projectSettings.configure(ClassLoader.getSystemResource(
-                                       "test/som-without-mappings.xml").getPath());
+                       _projectSettings.configure("classpath:test/som-without-mappings.xml");
                } catch (FileNotFoundException e) {
                        Assert.fail("Can't find configuration file: ", e);
                }
-               steps = _projectSettings.getStepsOf(Scenario.class);
+               steps = _stepsConfigService.getStepsOf(Scenario.class);
                Assert.assertTrue(steps.size() > 0, "No steps are created.");
                for (Step step : steps) {
                        List<String> defTypes = _projectSettings.getDefaultFormats(step);
@@ -436,9 +438,7 @@ public class TestProjectSettingsService extends BaseTest {
                // ////// Load workflow customization from not existing file
                _projectSettings.getAllSteps().clear(); // Clear config to be able to load it again
                try {
-                       _projectSettings.configure(ClassLoader.getSystemResource("/")
-                                       .getPath()
-                                       + "test/xxx.xml");
+                       _projectSettings.configure("classpath:test/xxx.xml");
                        Assert
                                        .fail("Customization loading must fail for not existing configuration file.");
                } catch (FileNotFoundException e) {
@@ -481,14 +481,13 @@ public class TestProjectSettingsService extends BaseTest {
                _projectSettings.getAllSteps().clear(); // Clear config to be able to load it again
                Database.getInstance().reset();
                try {
-                       _projectSettings.configure(ClassLoader.getSystemResource(
-                                       "test/som.xml").getPath());
+                       _projectSettings.configure("classpath:test/som.xml");
                } catch (FileNotFoundException e) {
                        Assert.fail("Can't find configuration file: ", e);
                }
 
                getHibernateTemplate().flush();
-               List<Step> steps = _projectSettings.getStepsOf(Scenario.class);
+               List<Step> steps = _stepsConfigService.getStepsOf(Scenario.class);
                Assert.assertTrue(steps.size() > 0, "No steps are created.");
                KnowledgeElementType ucase = _knowledgeElementTypeService.selectType("usecase");
                Assert.assertNotNull(ucase, "Knowledge type 'usecase' must be created in the database.");
@@ -500,12 +499,11 @@ public class TestProjectSettingsService extends BaseTest {
                Database.getInstance().reset();
                _projectSettings.getAllSteps().clear(); // Clear config to be able to load it again
                try {
-                       _projectSettings.configure(ClassLoader.getSystemResource(
-                                       "test/som.xml").getPath());
+                       _projectSettings.configure("classpath:test/som.xml");
                } catch (FileNotFoundException e) {
                        Assert.fail("Can't find configuration file: ", e);
                }
-               steps = _projectSettings.getStepsOf(Scenario.class);
+               steps = _stepsConfigService.getStepsOf(Scenario.class);
                Assert.assertTrue(steps.size() > 0, "No steps are created.");
                ucase = _knowledgeElementTypeService.selectType("usecase");
                Assert.assertNotNull(ucase, "Knowledge type 'usecase' must be created in the database.");
@@ -563,13 +561,13 @@ public class TestProjectSettingsService extends BaseTest {
                startNestedTransaction();
                // ///////////////////////////////////////////////////
                // ////// Load good workflow customization
+               getHibernateTemplate().bulkUpdate("delete from User");
                getHibernateTemplate().bulkUpdate("delete from Role");
                getHibernateTemplate().flush();
                Database.getInstance().reset();
                _projectSettings.getAllSteps().clear(); // Clear config to be able to load it again
                try {
-                       _projectSettings.configure(ClassLoader.getSystemResource(
-                                       "test/som.xml").getPath());
+                       _projectSettings.configure("classpath:test/som.xml");
                } catch (FileNotFoundException e) {
                        Assert.fail("Can't find configuration file: ", e);
                }