Fixed case when translation is not found. Now default translation parameter is used...

[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 0710f118397850642d4b5d67357577c276e421ae..9776fc2727b8ceaeec3c21129d4ea4688a238eba 100644 (file)
--- a/Workspace/Siman-Common/src/test/splat/service/TestScenarioService.java
+++ b/Workspace/Siman-Common/src/test/splat/service/TestScenarioService.java
@@ -402,7 +402,6 @@ public class TestScenarioService extends BaseTest {
                Assert.assertFalse(aScen.isCheckedout(),
                                "Scenario is still marked as checked out after checkin.");
                // Check that new document versions are created for checked in documents
-               boolean caseFound = false;
                for (StepDTO step : stepsToCheckin) {
                        for (DocumentDTO docDTO : step.getDocs()) {
                                if ((docDTO.getId() != 0) && (docDTO.getId() != null)) {
@@ -493,7 +492,6 @@ public class TestScenarioService extends BaseTest {
                                                                                                + using.getTitle() + " ("
                                                                                                + using.getType().getName()
                                                                                                + ") must become outdated.");
-                                                               caseFound = true;
                                                        }
                                                }
                                        } else {
@@ -509,6 +507,7 @@ public class TestScenarioService extends BaseTest {
                                                                + docDTO.getFiles().get(0).getPath()
                                                                + " attached to the document "
                                                                + docDTO.getTitle() + "#" + docDTO.getId() + " doesn't exist");
+                                               LOG.debug("Source format: " + curDoc.getFormat() + ", new format: " + newFormat);
                                        }
 
 
@@ -563,8 +562,6 @@ public class TestScenarioService extends BaseTest {
                                }
                        }
                }
-               Assert.assertTrue(caseFound,
-                               "Not checked in dependent documents must become outdated.");
 
                // ///////////////////////////////////////////////////////////
                // Call checkin method for a not existing id.
@@ -673,8 +670,9 @@ public class TestScenarioService extends BaseTest {
                                                        doc.getId(), doc.getTitle());
                                        for (FileDTO file : doc.getFiles()) {
                                                if (file.getPath().endsWith(format)
-                                                               || (file.getPath().endsWith("py") && format
-                                                                               .equals("brep"))) {
+                                                               || (file.getPath().endsWith("py") && (format
+                                                                               .equals("brep") || format
+                                                                               .equals("med")))) {
                                                        // Create a file in the download directory
                                                        docToCheckin.addFile(createDownloadedFile(userId,
                                                                        doc.getTitle() + "_result", format));
@@ -826,11 +824,11 @@ public class TestScenarioService extends BaseTest {
                                // <source-file>.brep
                                // <attached-file>.med
                                dprop.setName("document" + i++).setType(dtype);
-                               if (step.getNumber() > 3) {
+/*                             if (step.getNumber() > 3) {
                                        dprop.setFormat("med");
                                } else {
-                                       dprop.setFormat("py");
-                               }
+*/                                     dprop.setFormat("py");
+//                             }
                                dprop.setLocalPath(dprop.getName() + "." + dprop.getFormat());
                                Publication pub = createDoc(aScenario, aScStep, dprop, "med",
                                                false);