Package org.projectnessie.versioned.tests

Class AbstractMerge

java.lang.Object

org.projectnessie.versioned.tests.AbstractNestedVersionStore

org.projectnessie.versioned.tests.AbstractMerge

Direct Known Subclasses:

AbstractVersionStoreTestBase.Merge

@ExtendWith(org.assertj.core.api.junit.jupiter.SoftAssertionsExtension.class)
public abstract class AbstractMerge
extends AbstractNestedVersionStore

Field Summary

Fields

Modifier and Type	Field	Description
static org.projectnessie.versioned.BranchName	MAIN_BRANCH
protected org.assertj.core.api.SoftAssertions	soft

Fields inherited from class org.projectnessie.versioned.tests.AbstractNestedVersionStore

store

Constructor Summary

Constructors

Modifier	Constructor	Description
protected	AbstractMerge(org.projectnessie.versioned.VersionStore store)

Method Summary

Modifier and Type	Method	Description
protected void	mergeEmptyCommit(boolean individualCommits, boolean dryRun)
void	mergeFromAndIntoHead(boolean dryRun)
protected void	mergeIntoConflictingBranch(boolean individualCommits, boolean dryRun)
protected void	mergeIntoEmptyBranch1Commit(boolean individualCommits)
protected void	mergeIntoEmptyBranch3Commits(boolean individualCommits)
protected void	mergeIntoEmptyBranchModifying(boolean individualCommits)
protected void	mergeIntoNonConflictingBranch(boolean individualCommits)
protected void	mergeIntoNonExistingBranch(boolean individualCommits, boolean dryRun)
protected void	mergeIntoNonExistingReference(boolean individualCommits, boolean dryRun)
protected void	mergeKeyBehaviorValidation(boolean dryRun)
protected void	mergeResolveConflict(boolean individualCommits)
protected void	mergeWithCommonAncestor(boolean individualCommits)
protected void	mergeWithConflictingKeys(boolean individualCommits, boolean dryRun)
protected void	nonEmptyFastForwardMerge(boolean individualCommits)
protected void	setupCommits()

Methods inherited from class org.projectnessie.versioned.tests.AbstractNestedVersionStore

assertCommitMeta, commit, commit, commit, commit, commitsList, commitsListMap, contentsWithoutId, contentWithoutId, contentWithoutId, delete, diffsWithoutContentId, filterMainBranch, forceCommit, isNewStorageModel, operationsWithoutContentId, put, storageCheckpoint, store, unchanged

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Field Detail

MAIN_BRANCH

public static final org.projectnessie.versioned.BranchName MAIN_BRANCH

soft

protected org.assertj.core.api.SoftAssertions soft

Constructor Detail

AbstractMerge

protected AbstractMerge(org.projectnessie.versioned.VersionStore store)

Method Detail

setupCommits

@BeforeEach
protected void setupCommits()
                     throws org.projectnessie.versioned.VersionStoreException

Throws:

org.projectnessie.versioned.VersionStoreException

mergeKeyBehaviorValidation

@ParameterizedTest
@ValueSource(booleans={false,true})
protected void mergeKeyBehaviorValidation(boolean dryRun)
                                   throws java.lang.Exception

Throws:

java.lang.Exception

mergeResolveConflict

@ParameterizedTest
@ValueSource(booleans={false,true})
protected void mergeResolveConflict(boolean individualCommits)
                             throws org.projectnessie.versioned.VersionStoreException

Throws:

org.projectnessie.versioned.VersionStoreException

mergeIntoEmptyBranch3Commits

@ParameterizedTest
@ValueSource(booleans={false,true})
protected void mergeIntoEmptyBranch3Commits(boolean individualCommits)
                                     throws org.projectnessie.versioned.VersionStoreException

Throws:

org.projectnessie.versioned.VersionStoreException

mergeIntoEmptyBranch1Commit

@ParameterizedTest
@ValueSource(booleans={false,true})
protected void mergeIntoEmptyBranch1Commit(boolean individualCommits)
                                    throws org.projectnessie.versioned.VersionStoreException

Throws:

org.projectnessie.versioned.VersionStoreException

mergeIntoEmptyBranchModifying

@ParameterizedTest
@ValueSource(booleans={false,true})
protected void mergeIntoEmptyBranchModifying(boolean individualCommits)
                                      throws org.projectnessie.versioned.VersionStoreException

Throws:

org.projectnessie.versioned.VersionStoreException

mergeIntoNonConflictingBranch

@ParameterizedTest
@ValueSource(booleans={false,true})
protected void mergeIntoNonConflictingBranch(boolean individualCommits)
                                      throws org.projectnessie.versioned.VersionStoreException

Throws:

org.projectnessie.versioned.VersionStoreException

nonEmptyFastForwardMerge

@ParameterizedTest
@ValueSource(booleans={false,true})
protected void nonEmptyFastForwardMerge(boolean individualCommits)
                                 throws org.projectnessie.versioned.VersionStoreException

Throws:

org.projectnessie.versioned.VersionStoreException

mergeWithCommonAncestor

@ParameterizedTest
@ValueSource(booleans={false,true})
protected void mergeWithCommonAncestor(boolean individualCommits)
                                throws org.projectnessie.versioned.VersionStoreException

Throws:

org.projectnessie.versioned.VersionStoreException

mergeWithConflictingKeys

@ParameterizedTest
@CsvSource({"false,false","false,true","true,false","true,true"})
protected void mergeWithConflictingKeys(boolean individualCommits,
                                        boolean dryRun)
                                 throws org.projectnessie.versioned.VersionStoreException

Throws:

org.projectnessie.versioned.VersionStoreException

mergeIntoConflictingBranch

@ParameterizedTest
@CsvSource({"false,false","false,true","true,false","true,true"})
protected void mergeIntoConflictingBranch(boolean individualCommits,
                                          boolean dryRun)
                                   throws org.projectnessie.versioned.VersionStoreException

Throws:

org.projectnessie.versioned.VersionStoreException

mergeIntoNonExistingBranch

@ParameterizedTest
@CsvSource({"false,false","false,true","true,false","true,true"})
protected void mergeIntoNonExistingBranch(boolean individualCommits,
                                          boolean dryRun)

mergeIntoNonExistingReference

@ParameterizedTest
@CsvSource({"false,false","false,true","true,false","true,true"})
protected void mergeIntoNonExistingReference(boolean individualCommits,
                                             boolean dryRun)
                                      throws org.projectnessie.versioned.VersionStoreException

Throws:

org.projectnessie.versioned.VersionStoreException

mergeEmptyCommit

@ParameterizedTest
@CsvSource({"false,false","false,true","true,false","true,true"})
protected void mergeEmptyCommit(boolean individualCommits,
                                boolean dryRun)
                         throws org.projectnessie.versioned.VersionStoreException

Throws:

org.projectnessie.versioned.VersionStoreException

mergeFromAndIntoHead

@ParameterizedTest
@ValueSource(booleans={false,true})
public void mergeFromAndIntoHead(boolean dryRun)
                          throws java.lang.Exception

Throws:

java.lang.Exception