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 final 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 dryRun)
void	mergeFromAndIntoHead(boolean dryRun)
protected void	mergeIntoConflictingBranch(boolean dryRun)
protected void	mergeIntoNonExistingBranch(boolean dryRun)
protected void	mergeIntoNonExistingReference(boolean dryRun)
protected void	mergeKeyBehaviorValidation(boolean dryRun)
protected void	mergeResolveConflict()
protected void	setupCommits()

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

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

Methods inherited from class java.lang.Object

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

Field Details

MAIN_BRANCH

public static final org.projectnessie.versioned.BranchName MAIN_BRANCH

soft

protected org.assertj.core.api.SoftAssertions soft

Constructor Details

AbstractMerge

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

Method Details

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 Exception

Throws:

Exception

mergeResolveConflict

@Test
protected void mergeResolveConflict()
                             throws org.projectnessie.versioned.VersionStoreException

Throws:

org.projectnessie.versioned.VersionStoreException

mergeIntoConflictingBranch

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

Throws:

org.projectnessie.versioned.VersionStoreException

mergeIntoNonExistingBranch

@ParameterizedTest
@ValueSource(booleans={false,true})
protected void mergeIntoNonExistingBranch(boolean dryRun)

mergeIntoNonExistingReference

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

Throws:

org.projectnessie.versioned.VersionStoreException

mergeEmptyCommit

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

Throws:

org.projectnessie.versioned.VersionStoreException

mergeFromAndIntoHead

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

Throws:

Exception