diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/AbstractGitCommandTestBase.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/AbstractGitCommandTestBase.java index 0878e570c7..8ccf81affa 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/AbstractGitCommandTestBase.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/AbstractGitCommandTestBase.java @@ -75,6 +75,19 @@ public class AbstractGitCommandTestBase repositoryDirectory = createRepositoryDirectory(); } + /** + * Method description + * + * + * @param date + */ + protected void checkDate(Long date) + { + assertNotNull(date); + assertTrue("Date should not be older than current date", + date < System.currentTimeMillis()); + } + /** * Method description * diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBrowseCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBrowseCommandTest.java new file mode 100644 index 0000000000..3846199696 --- /dev/null +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBrowseCommandTest.java @@ -0,0 +1,157 @@ +/** + * Copyright (c) 2010, Sebastian Sdorra All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. 2. Redistributions in + * binary form must reproduce the above copyright notice, this list of + * conditions and the following disclaimer in the documentation and/or other + * materials provided with the distribution. 3. Neither the name of SCM-Manager; + * nor the names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * http://bitbucket.org/sdorra/scm-manager + * + */ + + + +package sonia.scm.repository.spi; + +//~--- non-JDK imports -------------------------------------------------------- + +import org.junit.Test; + +import sonia.scm.repository.BrowserResult; +import sonia.scm.repository.FileObject; + +import static org.junit.Assert.*; + +//~--- JDK imports ------------------------------------------------------------ + +import java.util.List; + +/** + * + * @author Sebastian Sdorra + */ +public class GitBrowseCommandTest extends AbstractGitCommandTestBase +{ + + /** + * Method description + * + */ + @Test + public void testBrowse() + { + BrowserResult result = new GitBrowseCommand( + repository, + repositoryDirectory).getBrowserResult( + new BrowseCommandRequest()); + + assertNotNull(result); + + List foList = result.getFiles(); + + assertNotNull(foList); + assertFalse(foList.isEmpty()); + assertEquals(4, foList.size()); + + FileObject a = null; + FileObject c = null; + + for (FileObject f : foList) + { + if ("a.txt".equals(f.getName())) + { + a = f; + } + else if ("c".equals(f.getName())) + { + c = f; + } + } + + assertNotNull(a); + assertFalse(a.isDirectory()); + assertEquals("a.txt", a.getName()); + assertEquals("a.txt", a.getPath()); + assertEquals("added a and b files", a.getDescription()); + assertTrue(a.getLength() > 0); + checkDate(a.getLastModified()); + assertNotNull(c); + assertTrue(c.isDirectory()); + assertEquals("c", c.getName()); + assertEquals("c", c.getPath()); + } + + /** + * Method description + * + */ + @Test + public void testBrowseSubDirectory() + { + BrowseCommandRequest request = new BrowseCommandRequest(); + request.setPath("c"); + + BrowserResult result = new GitBrowseCommand( + repository, + repositoryDirectory).getBrowserResult( + request); + + assertNotNull(result); + + List foList = result.getFiles(); + + assertNotNull(foList); + assertFalse(foList.isEmpty()); + assertEquals(2, foList.size()); + + FileObject d = null; + FileObject e = null; + + for (FileObject f : foList) + { + if ("d.txt".equals(f.getName())) + { + d = f; + } + else if ("e.txt".equals(f.getName())) + { + e = f; + } + } + + assertNotNull(d); + assertFalse(d.isDirectory()); + assertEquals("d.txt", d.getName()); + assertEquals("c/d.txt", d.getPath()); + assertEquals("added file d and e in folder c", d.getDescription()); + assertTrue(d.getLength() > 0); + checkDate(d.getLastModified()); + + assertNotNull(e); + assertFalse(e.isDirectory()); + assertEquals("e.txt", e.getName()); + assertEquals("c/e.txt", e.getPath()); + assertEquals("added file d and e in folder c", e.getDescription()); + assertTrue(e.getLength() > 0); + checkDate(e.getLastModified()); + } + +} diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitLogCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitLogCommandTest.java index 9365cd1696..0913fdf173 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitLogCommandTest.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitLogCommandTest.java @@ -172,17 +172,4 @@ public class GitLogCommandTest extends AbstractGitCommandTestBase assertNotNull(c2); assertEquals("435df2f061add3589cb3", c2.getId()); } - - /** - * Method description - * - * - * @param date - */ - private void checkDate(Long date) - { - assertNotNull(date); - assertTrue("Date should not be older than current date", - date < System.currentTimeMillis()); - } }