Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-11 07:55:47 +01:00
Code Issues Packages Projects Releases Activity

Merge with 2.0.0-m3

Browse Source
This commit is contained in:
René Pfeuffer
2018-09-14 17:47:45 +02:00
parent 37ea231340 3c08fcb42e
commit a5dcc8cf8a
74 changed files with 1639 additions and 548 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/client/spi/HgCommitCommand.java
View File

@@ -32,11 +32,11 @@ package sonia.scm.repository.client.spi;
import com.aragost.javahg.Repository;
import com.google.common.collect.Lists;
import java.io.IOException;
import sonia.scm.repository.Changeset;
import sonia.scm.repository.Modifications;
import sonia.scm.repository.Person;
import java.io.IOException;
/**
* Mercurial implementation of the {@link CommitCommand}.
*
@@ -70,9 +70,6 @@ public class HgCommitCommand implements CommitCommand
changeset.setBranches(Lists.newArrayList(c.getBranch()));
changeset.setTags(c.tags());
changeset.setModifications(
new Modifications(c.getAddedFiles(), c.getModifiedFiles(), c.getDeletedFiles())
);
return changeset;
}

26
scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgLogCommandTest.java
View File

@@ -39,6 +39,9 @@ import org.junit.Test;
import sonia.scm.repository.Changeset;
import sonia.scm.repository.ChangesetPagingResult;
import sonia.scm.repository.Modifications;
import sonia.scm.repository.RevisionNotFoundException;
import java.io.IOException;
import static org.hamcrest.Matchers.contains;
import static org.junit.Assert.assertEquals;
@@ -133,27 +136,28 @@ public class HgLogCommandTest extends AbstractHgCommandTestBase
}
@Test
public void testGetCommit() {
public void testGetCommit() throws IOException, RevisionNotFoundException {
HgLogCommand command = createComamnd();
String revision = "a9bacaf1b7fa0cebfca71fed4e59ed69a6319427";
Changeset c =
command.getChangeset("a9bacaf1b7fa0cebfca71fed4e59ed69a6319427");
command.getChangeset(revision);
assertNotNull(c);
assertEquals("a9bacaf1b7fa0cebfca71fed4e59ed69a6319427", c.getId());
assertEquals(revision, c.getId());
assertEquals("added a and b files", c.getDescription());
checkDate(c.getDate());
assertEquals("Douglas Adams", c.getAuthor().getName());
assertEquals("douglas.adams@hitchhiker.com", c.getAuthor().getMail());
assertEquals("added a and b files", c.getDescription());
ModificationsCommand modificationsCommand = new HgModificationsCommand(cmdContext, repository);
Modifications modifications = modificationsCommand.getModifications(revision);
Modifications mods = c.getModifications();
assertNotNull(mods);
assertTrue("modified list should be empty", mods.getModified().isEmpty());
assertTrue("removed list should be empty", mods.getRemoved().isEmpty());
assertFalse("added list should not be empty", mods.getAdded().isEmpty());
assertEquals(2, mods.getAdded().size());
assertThat(mods.getAdded(), contains("a.txt", "b.txt"));
assertNotNull(modifications);
assertTrue("modified list should be empty", modifications.getModified().isEmpty());
assertTrue("removed list should be empty", modifications.getRemoved().isEmpty());
assertFalse("added list should not be empty", modifications.getAdded().isEmpty());
assertEquals(2, modifications.getAdded().size());
assertThat(modifications.getAdded(), contains("a.txt", "b.txt"));
}
@Test

111
scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgModificationsCommandTest.java Normal file
View File

@@ -0,0 +1,111 @@
package sonia.scm.repository.spi;
import com.aragost.javahg.Changeset;
import com.aragost.javahg.commands.RemoveCommand;
import org.junit.Before;
import org.junit.Test;
import sonia.scm.repository.HgTestUtil;
import sonia.scm.repository.Modifications;
import java.io.File;
import java.util.function.Consumer;
import static org.assertj.core.api.Java6Assertions.assertThat;
public class HgModificationsCommandTest extends IncomingOutgoingTestBase {
private HgModificationsCommand outgoingModificationsCommand;
@Before
public void init() {
HgCommandContext outgoingContext = new HgCommandContext(HgTestUtil.createHookManager(), handler, outgoingRepository, outgoingDirectory);
outgoingModificationsCommand = new HgModificationsCommand(outgoingContext, outgoingRepository);
}
@Test
public void shouldReadAddedFiles() throws Exception {
String fileName = "a.txt";
writeNewFile(outgoing, outgoingDirectory, fileName, "bal bla");
Changeset changeset = commit(outgoing, "added a.txt");
String revision = String.valueOf(changeset.getRevision());
Consumer<Modifications> assertModifications = assertAddedFile(fileName);
assertModifications.accept(outgoingModificationsCommand.getModifications(revision));
}
@Test
public void shouldReadModifiedFiles() throws Exception {
String fileName = "a.txt";
writeNewFile(outgoing, outgoingDirectory, fileName, "bal bla");
commit(outgoing, "added a.txt");
writeNewFile(outgoing, outgoingDirectory, fileName, "new content");
Changeset changeset = commit(outgoing, "modified a.txt");
String revision = String.valueOf(changeset.getRevision());
Consumer<Modifications> assertModifications = assertModifiedFiles(fileName);
assertModifications.accept(outgoingModificationsCommand.getModifications(revision));
}
@Test
public void shouldReadRemovedFiles() throws Exception {
String fileName = "a.txt";
writeNewFile(outgoing, outgoingDirectory, fileName, "bal bla");
commit(outgoing, "added a.txt");
File file = new File(outgoingDirectory, fileName);
file.delete();
RemoveCommand.on(outgoing).execute(file);
Changeset changeset = commit(outgoing, "removed a.txt");
String revision = String.valueOf(changeset.getRevision());
Consumer<Modifications> assertModifications = assertRemovedFiles(fileName);
assertModifications.accept(outgoingModificationsCommand.getModifications(revision));
}
Consumer<Modifications> assertRemovedFiles(String fileName) {
return (modifications) -> {
assertThat(modifications).isNotNull();
assertThat(modifications.getAdded())
.as("added files modifications")
.hasSize(0);
assertThat(modifications.getModified())
.as("modified files modifications")
.hasSize(0);
assertThat(modifications.getRemoved())
.as("removed files modifications")
.hasSize(1)
.containsOnly(fileName);
};
}
Consumer<Modifications> assertModifiedFiles(String file) {
return (modifications) -> {
assertThat(modifications).isNotNull();
assertThat(modifications.getAdded())
.as("added files modifications")
.hasSize(0);
assertThat(modifications.getModified())
.as("modified files modifications")
.hasSize(1)
.containsOnly(file);
assertThat(modifications.getRemoved())
.as("removed files modifications")
.hasSize(0);
};
}
Consumer<Modifications> assertAddedFile(String addedFile) {
return (modifications) -> {
assertThat(modifications).isNotNull();
assertThat(modifications.getAdded())
.as("added files modifications")
.hasSize(1)
.containsOnly(addedFile);
assertThat(modifications.getModified())
.as("modified files modifications")
.hasSize(0);
assertThat(modifications.getRemoved())
.as("removed files modifications")
.hasSize(0);
};
}
}