fixed test case in DemoConnectorTest.java and included the test again

modules/activiti-cycle/pom.xml

@@ -30,7 +30,6 @@
         <configuration>
           <excludes>
             <exclude>**/RepositoryConnectorConfigurationManagerImplTest.java</exclude>
-            <exclude>**/DemoConnectorTest.java</exclude>
           </excludes>
         </configuration>
       </plugin>

modules/activiti-cycle/src/test/java/org/activiti/cycle/impl/connector/demo/DemoConnectorTest.java

@@ -4,7 +4,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import java.io.File;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -12,22 +11,20 @@ import java.util.Map;
 
 import org.activiti.cycle.Content;
 import org.activiti.cycle.ContentRepresentation;
+import org.activiti.cycle.CycleService;
 import org.activiti.cycle.RepositoryArtifact;
-import org.activiti.cycle.RepositoryConnector;
 import org.activiti.cycle.RepositoryFolder;
 import org.activiti.cycle.RepositoryNode;
+import org.activiti.cycle.impl.CycleServiceImpl;
 import org.activiti.cycle.impl.conf.ConfigurationContainer;
+import org.activiti.cycle.impl.conf.RepositoryConnectorConfiguration;
 import org.activiti.cycle.impl.connector.demo.action.CopyArtifactAction;
-import org.activiti.cycle.impl.connector.fs.FileSystemConnectorConfiguration;
-import org.activiti.cycle.impl.connector.signavio.SignavioConnectorConfiguration;
-import org.activiti.cycle.impl.connector.view.RootConnectorConfiguration;
 import org.activiti.cycle.impl.plugin.PluginFinder;
-import org.activiti.cycle.impl.util.RepositoryLogHelper;
 import org.junit.Before;
 import org.junit.Test;
 
 public class DemoConnectorTest {
-  
+
   @Before
   public void init() {
     // TODO: Should be done in Bootstrapping
@@ -35,53 +32,56 @@ public class DemoConnectorTest {
   }
 
   @Test
-  public void testFirstPlay() throws Exception {    
+  public void testFirstPlay() throws Exception {
     // create demo connector but accessed via the customized view connector
-    ConfigurationContainer userConfiguration = new ConfigurationContainer("bernd");
-    userConfiguration.addRepositoryConnectorConfiguration(new DemoConnectorConfiguration("demo"));
-    RepositoryConnector conn = new RootConnectorConfiguration(userConfiguration).createConnector();
-    
-    List<RepositoryNode> childNodes = conn.getChildren("/").asList();
-    assertEquals(1, childNodes.size());
-    assertEquals("demo", childNodes.get(0).getCurrentPath());
+    ConfigurationContainer configurationContainer = new ConfigurationContainer("bernd");
+    RepositoryConnectorConfiguration configuration = new DemoConnectorConfiguration("demo");
+    configurationContainer.addRepositoryConnectorConfiguration(configuration);
+
+    CycleService cycleService = new CycleServiceImpl(configurationContainer.getConnectorList());
 
-    
-    childNodes = conn.getChildren("demo").asList();
+    // TODO: Correct user / password handling!!!!
+    cycleService.login("bernd", "bernd");
+
+    List<RepositoryNode> childNodes = cycleService.getChildren("demo", "/").asList();
+//    assertEquals(1, childNodes.size());
+//    assertEquals("demo", childNodes.get(0).getCurrentPath());
+
+//    childNodes = cycleService.getChildren("demo", "/").asList();
     assertEquals(2, childNodes.size());
 
     assertTrue(childNodes.get(0) instanceof RepositoryFolder);
     RepositoryFolder folder1 = (RepositoryFolder) childNodes.get(0);
-    assertEquals("/demo/minutes", folder1.getCurrentPath());
+    assertEquals("/minutes", folder1.getCurrentPath());
     // assertEquals("http://localhost:8080/activiti-cycle/demo/minutes",
     // folder1.getClientUrl());
-    
+
     assertTrue(childNodes.get(1) instanceof RepositoryFolder);
     RepositoryFolder folder2 = (RepositoryFolder) childNodes.get(1);
-    assertEquals("/demo/BPMN", folder2.getCurrentPath());
-    
+    assertEquals("/BPMN", folder2.getCurrentPath());
+
     // check sub elements of folder 1
-    childNodes = conn.getChildren(folder1.getCurrentPath()).asList();
+    childNodes = cycleService.getChildren("demo", folder1.getCurrentPath()).asList();
     assertEquals(2, childNodes.size());
 
     RepositoryArtifact file1 = (RepositoryArtifact) childNodes.get(0);
-    assertEquals("/demo/minutes/20100701-KickOffMeeting.txt", file1.getCurrentPath());
+    assertEquals("/minutes/20100701-KickOffMeeting.txt", file1.getCurrentPath());
 
     RepositoryArtifact file2 = (RepositoryArtifact) childNodes.get(1);
-    assertEquals("/demo/minutes/InitialMindmap.mm", file2.getCurrentPath());
-    
+    assertEquals("/minutes/InitialMindmap.mm", file2.getCurrentPath());
 
     // check sub elements of folder 2
-    childNodes = conn.getChildren(folder2.getCurrentPath()).asList();
+    childNodes = cycleService.getChildren("demo", folder2.getCurrentPath()).asList();
     assertEquals(1, childNodes.size());
 
     RepositoryFolder folder3 = (RepositoryFolder) childNodes.get(0);
-    assertEquals("/demo/BPMN/Level3", folder3.getCurrentPath());
+    assertEquals("/BPMN/Level3", folder3.getCurrentPath());
 
-    childNodes = conn.getChildren(folder3.getCurrentPath()).asList();
+    childNodes = cycleService.getChildren("demo", folder3.getCurrentPath()).asList();
     assertEquals(1, childNodes.size());
 
     RepositoryArtifact file3 = (RepositoryArtifact) childNodes.get(0);
-    assertEquals("/demo/BPMN/Level3/InitialBpmnModel", file3.getCurrentPath());
+    assertEquals("/BPMN/Level3/InitialBpmnModel", file3.getCurrentPath());
     assertEquals("InitialBpmnModel", file3.getMetadata().getName());
     assertEquals("/BPMN/Level3", file3.getMetadata().setParentFolderId());
     //
@@ -91,7 +91,7 @@ public class DemoConnectorTest {
     //    
     Collection<ContentRepresentation> contentRepresentations = file3.getArtifactType().getContentRepresentations();
     for (ContentRepresentation contentRepresentation : contentRepresentations) {
-      Content content = conn.getContent(file3.getCurrentPath(), contentRepresentation.getId());
+      Content content = cycleService.getContent("demo", file3.getCurrentPath(), contentRepresentation.getId());
       assertNotNull(content);
       assertNotNull(content.asByteArray());
     }
@@ -101,36 +101,42 @@ public class DemoConnectorTest {
     Map<String, Object> parameters = new HashMap<String, Object>();
     parameters.put("targetName", "xxx.txt");
     parameters.put("copyCount", 2);
-    parameters.put("targetFolderConnector", conn);
-    parameters.put("targetFolder", "/demo/minutes");
-    
-    conn.executeParameterizedAction(file1.getCurrentPath(), CopyArtifactAction.class.getName(), parameters);
-    
+    parameters.put("targetConnectorId", "demo");
+    parameters.put("targetFolderId", "/minutes");
+
+    cycleService.executeParameterizedAction("demo", file1.getCurrentPath(), CopyArtifactAction.class.getName(), parameters);
+
     List<RepositoryNode> nodes = DemoConnector.nodes;
     assertEquals(8, DemoConnector.nodes.size());
-    
-    childNodes = conn.getChildren(folder1.getCurrentPath()).asList();
+
+    childNodes = cycleService.getChildren("demo", folder1.getCurrentPath()).asList();
     assertEquals(4, childNodes.size());
 
-    assertEquals("/demo/minutes/20100701-KickOffMeeting.txt", childNodes.get(0).getCurrentPath());
-    assertEquals("/demo/minutes/InitialMindmap.mm", childNodes.get(1).getCurrentPath());
-    assertEquals("/demo/minutes/xxx.txt0", childNodes.get(2).getCurrentPath());
+    assertEquals("/minutes/20100701-KickOffMeeting.txt", childNodes.get(0).getCurrentPath());
+    assertEquals("/minutes/InitialMindmap.mm", childNodes.get(1).getCurrentPath());
+    assertEquals("/minutes/xxx.txt0", childNodes.get(2).getCurrentPath());
     assertEquals("xxx.txt0", childNodes.get(2).getMetadata().getName());
-    assertEquals("/demo/minutes/xxx.txt1", childNodes.get(3).getCurrentPath());
+    assertEquals("/minutes/xxx.txt1", childNodes.get(3).getCurrentPath());
     assertEquals("xxx.txt1", childNodes.get(3).getMetadata().getName());
   }
 
   // @Test
   public void testPlay() {
 
-    ConfigurationContainer configuration = new ConfigurationContainer("bernd");
-    configuration.addRepositoryConnectorConfiguration(new DemoConnectorConfiguration("demo"));
-    configuration.addRepositoryConnectorConfiguration(new SignavioConnectorConfiguration("signavio", "http://localhost:8080/activiti-modeler/"));
-    configuration.addRepositoryConnectorConfiguration(new FileSystemConnectorConfiguration("files", new File("C:/temp")));
-    
-    RepositoryConnector conn = new RootConnectorConfiguration(configuration).createConnector();
-    
-    RepositoryLogHelper.printNodes(conn, conn.getChildren("/").asList());
+    // ConfigurationContainer configuration = new
+    // ConfigurationContainer("bernd");
+    // configuration.addRepositoryConnectorConfiguration(new
+    // DemoConnectorConfiguration("demo"));
+    // configuration.addRepositoryConnectorConfiguration(new
+    // SignavioConnectorConfiguration("signavio",
+    // "http://localhost:8080/activiti-modeler/"));
+    // configuration.addRepositoryConnectorConfiguration(new
+    // FileSystemConnectorConfiguration("files", new File("C:/temp")));
+    //    
+    // RepositoryConnector conn = new
+    // RootConnectorConfiguration(configuration).createConnector();
+    //    
+    // RepositoryLogHelper.printNodes(conn, conn.getChildren("/").asList());
 
   }
 }