X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=Workspace%2FSiman-Common%2Fsrc%2Ftest%2FTest.java;h=1806e0f721af1965050b8715e36dcd0adf388c61;hb=e239e95ec3924d357bcc03d234c73c7d8534461c;hp=e0e7083a9f7a1201203ff705fc4af8e96f4bab84;hpb=579560456cc897f82bffbed049624d26d6927e59;p=tools%2Fsiman.git

diff --git a/Workspace/Siman-Common/src/test/Test.java b/Workspace/Siman-Common/src/test/Test.java
index e0e7083..1806e0f 100644
--- a/Workspace/Siman-Common/src/test/Test.java
+++ b/Workspace/Siman-Common/src/test/Test.java
@@ -7,11 +7,26 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Vector;
 
+import org.splat.service.SearchServiceImpl;
+import org.splat.service.dto.Proxy;
+import org.splat.service.technical.ProjectSettingsServiceImpl;
 import org.splat.som.*;
+import org.splat.dal.bo.kernel.Role;
+import org.splat.dal.bo.kernel.User;
+import org.splat.dal.bo.som.ConvertsRelation;
+import org.splat.dal.bo.som.Document;
+import org.splat.dal.bo.som.DocumentType;
+import org.splat.dal.bo.som.KnowledgeElement;
+import org.splat.dal.bo.som.KnowledgeElementType;
+import org.splat.dal.bo.som.ProgressState;
+import org.splat.dal.bo.som.Publication;
+import org.splat.dal.bo.som.Scenario;
+import org.splat.dal.bo.som.SimulationContext;
+import org.splat.dal.bo.som.SimulationContextType;
+import org.splat.dal.bo.som.Study;
+import org.splat.dal.bo.som.ValidationCycle;
+import org.splat.dal.dao.som.Database;
 import org.splat.kernel.Do;
-import org.splat.kernel.UserDirectory;
-import org.splat.kernel.User;
-import org.splat.kernel.Role;
 import org.splat.manox.Reader;
 import org.splat.manox.Toolbox;
 import org.splat.manox.Writer;
@@ -29,12 +44,12 @@ public class Test {
 //  Main
 //  ==============================================================================================================================
 
-	public static void main(String[] args) {
+	public static void main(String[] args) {/* TODO: Create unit tests
 //  --------------------------------------
       Session     session = Database.getSession();       // Single session for multiple operations
       Transaction transax = session.beginTransaction();	  
 	  	  
-	  ProjectSettings project = ProjectSettings.getMe();
+	  ProjectSettingsServiceImpl project = ProjectSettingsServiceImpl.getMe();
 	  String          path    = System.getProperty("user.dir");
       try {
 	    project.configure(path + "/src/som.xml");
@@ -563,7 +578,7 @@ public class Test {
       try {
         Study.Properties  criter1 = new Study.Properties().setState(ProgressState.inPROGRESS);
         Study.Properties  criter2 = new Study.Properties().setState(ProgressState.inWORK).setManager(user);
-        List<Proxy>       result  = Database.selectStudiesWhere(criter1, criter2);
+        List<Proxy>       result  = SearchServiceImpl.selectStudiesWhere(criter1, criter2);
         if (result.size() == 0) {
           logger.info("No study found.");
         } else {
@@ -584,7 +599,7 @@ public class Test {
       String words = "sercoter";
       try {
         Study.Properties  criteria = new Study.Properties();
-        List<Proxy>       result   = Database.selectStudiesWhere(criteria.setTitle(words));
+        List<Proxy>       result   = SearchServiceImpl.selectStudiesWhere(criteria.setTitle(words));
         if (result.size() == 0) {
           logger.info("No study found with a title including \"" + words + "\".");
         } else {
@@ -632,7 +647,7 @@ public class Test {
           context.add(reactor);
     		
           Study.Properties sprop = new Study.Properties();
-          List<Proxy> result = Database.selectStudiesWhere(sprop.setSimulationContexts(context)
+          List<Proxy> result = SearchServiceImpl.selectStudiesWhere(sprop.setSimulationContexts(context)
     				                                            .setState(ProgressState.inPROGRESS));
           if (result.size() == 0) {
             logger.info("Study on Réacteur RAPSODIE not found.");
@@ -676,7 +691,7 @@ public class Test {
 
           KnowledgeElementType        ktype = KnowledgeElement.selectType("Bonne pratique");
           KnowledgeElement.Properties sprop = new KnowledgeElement.Properties();
-          List<Proxy> result = Database.selectKnowledgeElementsWhere(sprop.setSimulationContexts(context)
+          List<Proxy> result = SearchServiceImpl.selectKnowledgeElementsWhere(sprop.setSimulationContexts(context)
     				                                                      .setType(ktype));
           if (result.size() == 0) {
             logger.info("Study on Réacteur RAPSODIE not found.");
@@ -831,6 +846,6 @@ public class Test {
       }
       catch (Exception e) {
         return false;
-      }
+      }*/
     }
 }
\ No newline at end of file