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

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

diff --git a/Workspace/Siman-Common/src/test/splat/service/TestScenarioService.java b/Workspace/Siman-Common/src/test/splat/service/TestScenarioService.java
index 7661d628ef7ed10b0281dd87e922612b75d749cd..e70d404366c3eb9b2d5c026501a76bfb077049ee 100644 (file)
--- a/Workspace/Siman-Common/src/test/splat/service/TestScenarioService.java
+++ b/Workspace/Siman-Common/src/test/splat/service/TestScenarioService.java
@@ -56,6 +56,7 @@ import org.splat.service.dto.FileDTO;
 import org.splat.service.dto.StepDTO;
 import org.splat.service.technical.ProjectSettingsService;
 import org.splat.service.technical.RepositoryService;
+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;
@@ -130,6 +131,13 @@ public class TestScenarioService 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.
         */
@@ -203,7 +211,7 @@ public class TestScenarioService extends BaseTest {
                Assert.assertNotNull(steps, "List of steps must not be null.");
                Assert.assertTrue(steps.size() > 0, "No steps are read.");
 
-               List<Step> projSteps = _projectSettings.getStepsOf(Scenario.class);
+               List<Step> projSteps = _stepsConfigService.getStepsOf(Scenario.class);
                Assert.assertEquals(steps.size(), projSteps.size(),
                                "Not all steps are listed.");
                int docIndex = 0;
@@ -361,8 +369,7 @@ public class TestScenarioService extends BaseTest {
                startNestedTransaction();
 
                _projectSettings.getAllSteps().clear(); // Clear config to be able to load it again
-               _projectSettings.configure(ClassLoader
-                               .getSystemResource("test/som.xml").getPath());
+               _projectSettings.configure("classpath:test/som.xml");
                getHibernateTemplate().flush();
                long scenarioId = createScenario();
                Scenario aScen = _scenarioDAO.get(scenarioId);
@@ -830,12 +837,11 @@ public class TestScenarioService extends BaseTest {
                _projectSettings.getAllSteps().clear(); // Clear config to be able to load it again
                // Load workflow customization
                try {
-                       _projectSettings.configure(ClassLoader.getSystemResource(
-                                       "test/som.xml").getPath());
+                       _projectSettings.configure("classpath:test/som.xml");
                } catch (FileNotFoundException e) {
                        Assert.fail("Can't find som.xml: ", e);
                }
-               List<Step> steps = _projectSettings.getStepsOf(Scenario.class);
+               List<Step> steps = _stepsConfigService.getStepsOf(Scenario.class);
                Assert.assertTrue(steps.size() > 0, "No steps are created.");
 
                // Create a test user
@@ -1060,8 +1066,7 @@ public class TestScenarioService extends BaseTest {
 
                Database.getInstance().reset();
                _projectSettings.getAllSteps().clear(); // Clear config to be able to load it again
-               _projectSettings.configure(ClassLoader
-                               .getSystemResource("test/som.xml").getPath());
+               _projectSettings.configure("classpath:test/som.xml");
 
                // Create a test user
                User.Properties uprop = new User.Properties();
@@ -1148,8 +1153,7 @@ public class TestScenarioService extends BaseTest {
 
                Database.getInstance().reset();
                _projectSettings.getAllSteps().clear(); // Clear config to be able to load it again
-               _projectSettings.configure(ClassLoader
-                               .getSystemResource("test/som.xml").getPath());
+               _projectSettings.configure("classpath:test/som.xml");
 
                // Create a test user
                User goodUser = TestEntitiesGenerator.getTestUser("goodUser");