Changeset 1277

Timestamp:

03/07/10 12:57:25 (5 months ago)

Author:

dreisch

Message:

-fixed #1106

Location:

ide/trunk/src

Files:

• org/korsakow/domain/command/AdjustToAbsolutePathsCommand.java (modified) (1 diff)
• org/korsakow/domain/command/AdjustToRelativePathsCommand.java (modified) (1 diff)
• org/korsakow/domain/command/FindSubtitlesCommand.java (modified) (1 diff)
• resources/build (modified) (1 diff)
• test/org/korsakow/AllTests.java (modified) (1 diff)
• test/org/korsakow/command/TestAdjustToAbsolutePathsCommand.java (modified) (3 diffs)
• test/org/korsakow/command/TestAdjustToRelativePathsCommand.java (modified) (3 diffs)
• test/org/korsakow/command/TestFrontController.java (modified) (3 diffs)
• test/org/korsakow/command/TestInsertCommand.java (modified) (4 diffs)
• test/util/DOFactory.java (modified) (1 diff)

ide/trunk/src/org/korsakow/domain/command/AdjustToAbsolutePathsCommand.java

@@ -88 +88 @@
                 }
                 for (IVideo video : subtitleMap.keySet()) {
-                        String path = pathMap.get(video);
+                        String path = subtitleMap.get(video);
                         video.setSubtitles(path);
                         UoW.getCurrent().registerDirty(video);

ide/trunk/src/org/korsakow/domain/command/AdjustToRelativePathsCommand.java

@@ -116 +116 @@
                 }
                 for (IVideo video : subtitleMap.keySet()) {
-                        String path = pathMap.get(video);
+                        String path = subtitleMap.get(video);
                         video.setSubtitles(path);
                         UoW.getCurrent().registerDirty(video);

ide/trunk/src/org/korsakow/domain/command/FindSubtitlesCommand.java

@@ -67 +67 @@
                 for (IMedia medium : media)
                 {
-                        if (ResourceType.forId(medium.getType()) == ResourceType.VIDEO)
+                        if (ResourceType.forId(medium.getType()) != ResourceType.VIDEO)
                                 continue;
                         IVideo video = (IVideo)medium;

ide/trunk/src/resources/build

@@ -1 @@
-#Sat Mar 06 15:52:00 EST 2010
-build.number=145
+#Sun Mar 07 11:44:26 EST 2010
+build.number=149
 version.number=5.0.4
 release.number=19.0

ide/trunk/src/test/org/korsakow/AllTests.java

@@ -14 +14 @@
                 suite.addTest(test.org.korsakow.dom.AllTests.suite());
                 suite.addTest(test.org.korsakow.domain.AllTests.suite());
+                suite.addTest(test.org.korsakow.command.AllTests.suite());
                 suite.addTest(test.org.korsakow.export.AllTests.suite());
                 suite.addTest(test.org.korsakow.k3.AllTests.suite());

ide/trunk/src/test/org/korsakow/command/TestAdjustToAbsolutePathsCommand.java

@@ -8 +8 @@
 
 import org.dsrg.soenea.uow.UoW;
+import org.korsakow.domain.ProjectFactory;
 import org.korsakow.domain.command.AdjustToAbsolutePathsCommand;
-import org.korsakow.domain.command.AdjustToRelativePathsCommand;
 import org.korsakow.domain.command.Request;
 import org.korsakow.domain.command.Response;
 import org.korsakow.domain.interf.IMedia;
 import org.korsakow.domain.interf.IProject;
+import org.korsakow.domain.interf.IVideo;
 import org.korsakow.ide.DataRegistry;
 
@@ -26 +27 @@
                 super(TestAdjustToAbsolutePathsCommand.class.getCanonicalName());
         }
+        @Override
         public void setUp() throws Exception
         {
@@ -86 +88 @@
                 }
         }
+        public void testSubtitlesWithInitialFilenameAbsoluteSuccess() throws Exception
+        {
+                IProject project = ProjectFactory.createNew();
+                IVideo video = DOFactory.createVideo(DOFactory.getEmptyPNGFile(parentDir));
+                File subtitleFile = File.createTempFile("subtitle", ".txt", parentDir);
+                video.setSubtitles(subtitleFile.getAbsolutePath());
+                
+                UoW.getCurrent().commit();
+                UoW.newCurrent();
+                
+                final String basePath = dataFile.getParentFile().getAbsolutePath();
+                
+                Request request = new Request();
+                request.set("id", project.getId());
+                Response response = new Response();
+                new AdjustToAbsolutePathsCommand(request, response).execute();
+                Collection<IMedia> actualMedia = (Collection<IMedia>)response.get("media");
+                IVideo actualVideo = (IVideo)actualMedia.iterator().next();
+                Assert.assertEquals(subtitleFile.getAbsolutePath(), actualVideo.getSubtitles());
+        }
+        public void testSubtitlesWithInitialFilenameRelativeSuccess() throws Exception
+        {
+                IProject project = ProjectFactory.createNew();
+                IVideo video = DOFactory.createVideo(DOFactory.getEmptyPNGFile(parentDir));
+                File subtitleFile = File.createTempFile("subtitle", ".txt", parentDir);
+                final String basePath = dataFile.getParentFile().getAbsolutePath();
+                video.setSubtitles(subtitleFile.getAbsolutePath().substring(basePath.length()+1));
+                
+                UoW.getCurrent().commit();
+                UoW.newCurrent();
+                
+                
+                Request request = new Request();
+                request.set("id", project.getId());
+                Response response = new Response();
+                new AdjustToAbsolutePathsCommand(request, response).execute();
+                Collection<IMedia> actualMedia = (Collection<IMedia>)response.get("media");
+                IVideo actualVideo = (IVideo)actualMedia.iterator().next();
+                
+                Assert.assertEquals(subtitleFile.getAbsolutePath(), actualVideo.getSubtitles());
+        }
 }

ide/trunk/src/test/org/korsakow/command/TestAdjustToRelativePathsCommand.java

@@ -7 +7 @@
 import junit.framework.Assert;
 
-import org.dsrg.soenea.domain.interf.IDomainObject;
 import org.dsrg.soenea.uow.UoW;
-import org.korsakow.domain.ImageFactory;
-import org.korsakow.domain.InterfaceFactory;
 import org.korsakow.domain.ProjectFactory;
-import org.korsakow.domain.SnuFactory;
-import org.korsakow.domain.SoundFactory;
-import org.korsakow.domain.VideoFactory;
 import org.korsakow.domain.command.AdjustToRelativePathsCommand;
-import org.korsakow.domain.command.DeleteImageCommand;
-import org.korsakow.domain.command.DeleteSoundCommand;
-import org.korsakow.domain.command.DeleteVideoCommand;
-import org.korsakow.domain.command.RemoveReferencesToResourceCommand;
 import org.korsakow.domain.command.Request;
 import org.korsakow.domain.command.Response;
-import org.korsakow.domain.interf.IImage;
-import org.korsakow.domain.interf.IInterface;
 import org.korsakow.domain.interf.IMedia;
 import org.korsakow.domain.interf.IProject;
-import org.korsakow.domain.interf.IResource;
-import org.korsakow.domain.interf.ISnu;
-import org.korsakow.domain.interf.ISound;
+import org.korsakow.domain.interf.IVideo;
 import org.korsakow.ide.DataRegistry;
 import org.korsakow.ide.util.FileUtil;
@@ -42 +28 @@
                 super(TestAdjustToRelativePathsCommand.class.getCanonicalName());
         }
+        @Override
         public void setUp() throws Exception
         {
@@ -138 +125 @@
                 }
         }
+        public void testSubtitlesWithInitialFilenameAbsoluteSuccess() throws Exception
+        {
+                IProject project = ProjectFactory.createNew();
+                IVideo video = DOFactory.createVideo(DOFactory.getEmptyPNGFile(parentDir));
+                File subtitleFile = File.createTempFile("subtitle", ".txt", parentDir);
+                video.setSubtitles(subtitleFile.getAbsolutePath());
+                
+                UoW.getCurrent().commit();
+                UoW.newCurrent();
+                
+                final String basePath = dataFile.getParentFile().getAbsolutePath();
+                
+                Request request = new Request();
+                request.set("id", project.getId());
+                request.set("basePath", basePath);
+                Response response = new Response();
+                new AdjustToRelativePathsCommand(request, response).execute();
+                Collection<IMedia> actualMedia = (Collection<IMedia>)response.get("media");
+                IVideo actualVideo = (IVideo)actualMedia.iterator().next();
+                
+                Assert.assertEquals(Boolean.TRUE, response.getBoolean("status"));
+                Assert.assertEquals(subtitleFile.getAbsolutePath(), basePath + File.separator + actualVideo.getSubtitles());
+        }
+        public void testSubtitlesWithInitialFilenameRelativeSuccess() throws Exception
+        {
+                IProject project = ProjectFactory.createNew();
+                IVideo video = DOFactory.createVideo(DOFactory.getEmptyPNGFile(parentDir));
+                File subtitleFile = File.createTempFile("subtitle", ".txt", parentDir);
+                final String basePath = dataFile.getParentFile().getAbsolutePath();
+                video.setSubtitles(subtitleFile.getAbsolutePath().substring(basePath.length()+1));
+                
+                UoW.getCurrent().commit();
+                UoW.newCurrent();
+                
+                
+                Request request = new Request();
+                request.set("id", project.getId());
+                request.set("basePath", basePath);
+                Response response = new Response();
+                new AdjustToRelativePathsCommand(request, response).execute();
+                Collection<IMedia> actualMedia = (Collection<IMedia>)response.get("media");
+                IVideo actualVideo = (IVideo)actualMedia.iterator().next();
+                
+                Assert.assertEquals(Boolean.TRUE, response.getBoolean("status"));
+                Assert.assertEquals(subtitleFile.getAbsolutePath(), basePath + File.separator + actualVideo.getSubtitles());
+        }
 }

ide/trunk/src/test/org/korsakow/command/TestFrontController.java

@@ -2 +2 @@
 
 import java.io.File;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
 
 import org.dsrg.soenea.domain.command.CommandException;
@@ -8 +11 @@
 import org.korsakow.domain.command.AbstractCommand;
 import org.korsakow.domain.command.Helper;
-import org.korsakow.domain.command.ICommand;
 import org.korsakow.ide.DataRegistry;
 import org.korsakow.ide.util.DomUtil;
 
 import test.util.DomainTestUtil;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
 
 public class TestFrontController extends TestCase {
@@ -46 +45 @@
 
                 public void execute() throws CommandException {
-                        DomUtil.appendTextNode(DataRegistry.getDocument(), DataRegistry.getDocument(), "commandNode", "commandValue");
+                        DomUtil.appendTextNode(DataRegistry.getDocument(), DataRegistry.getDocument().getDocumentElement(), "commandNode", "commandValue");
                         
                         throw new CommandException();

ide/trunk/src/test/org/korsakow/command/TestInsertCommand.java

@@ -2 +2 @@
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
@@ -12 +13 @@
 import org.korsakow.domain.TextFactory;
 import org.korsakow.domain.VideoFactory;
-import org.korsakow.domain.command.ICommand;
 import org.korsakow.domain.command.InsertImageCommand;
 import org.korsakow.domain.command.InsertInterfaceCommand;
@@ -20 +20 @@
 import org.korsakow.domain.command.InsertTextCommand;
 import org.korsakow.domain.command.InsertVideoCommand;
-import org.korsakow.domain.command.InsertWidgetCommand;
 import org.korsakow.domain.command.Request;
 import org.korsakow.domain.command.Response;
@@ -156 +155 @@
                 request.set(UpdateSnuCommand.STARTER, obj.getStarter());
                 ViewHelper.addRulesToRequest(request, obj.getRules());
+                ViewHelper.addEventsToRequest(request, Collections.EMPTY_LIST);
                 InsertSnuCommand command = new InsertSnuCommand(request, response);
                 command.execute();

ide/trunk/src/test/util/DOFactory.java

@@ -154 +154 @@
         public static IProject createDefaultTestProject(File parentDir) throws Exception
         {
-                DataRegistry.initialize(DataRegistry.createDefaultDocument(), parentDir);
+                DataRegistry.initialize(DataRegistry.createDefaultDocument(), DataRegistry.getFile());
                 IProject project = NewProjectCommand.newProject(DataRegistry.getFile());
                 project.setName("Default Test Project");