Package com._1c.g5.v8.dt.bsl.compare.merge

Class MergeFormatterTest

java.lang.Object

com._1c.g5.v8.dt.bsl.compare.merge.MergeFormatterTest

public class MergeFormatterTest
extends Object

Tests for MergeFormattingSupport.

Constructor Summary

Constructors

Constructor	Description
MergeFormatterTest()

Method Summary

Modifier and Type	Method	Description
static void	initializeBsl()
void	testCatalogFormModuleMergingPrioritizingOtherThreeWay()
void	testCatalogObjectModuleMergingPrioritizingOtherThreeWay()
void	testClearLineChangedOnMainMergePrioritizingMain3way()
void	testClearLineChangedOnMainMergePrioritizingOther3way()
void	testClearLineChangedOnOtherMergePrioritizingMain3way()
void	testClearLineChangedOnOtherMergePrioritizingOther3way()
void	testCollectMergeConflictsForEmptyModule()
void	testEmptyLineAddedOnMainMergePrioritizingMain3way()
void	testEmptyLineAddedOnMainMergePrioritizingOther3way()
void	testEmptyLineAddedOnOtherMergePrioritizingMain3way()
void	testEmptyLineAddedOnOtherMergePrioritizingOther3way()
void	testEmptyLineDeletedOnMainMergePrioritizingMain3way()
void	testEmptyLineDeletedOnMainMergePrioritizingOther3way()
void	testEmptyLineDeletedOnOtherMergePrioritizingMain3way()
void	testEmptyLineDeletedOnOtherMergePrioritizingOther3way()
void	testLineAddedOnMainMergePrioritizingMain3way()
void	testLineAddedOnMainMergePrioritizingOther3way()
void	testLineAddedOnOtherMergePrioritizingMain3way()
void	testLineAddedOnOtherMergePrioritizingOther3way()
void	testLineClearedOnMainMergePrioritizingMain3way()
void	testLineClearedOnMainMergePrioritizingOther3way()
void	testLineClearedOnOtherMergePrioritizingMain3way()
void	testLineClearedOnOtherMergePrioritizingOther3way()
void	testLineDeletedOnMainAndOtherMergePrioritizingMain3way()
void	testLineDeletedOnMainAndOtherMergePrioritizingOther3way()
void	testLineDeletedOnMainMergePrioritizingMain3way()
void	testLineDeletedOnMainMergePrioritizingOther3way()
void	testLineDeletedOnOtherMergePrioritizingMain3way()
void	testLineDeletedOnOtherMergePrioritizingOther3way()
void	testMergeCRLFWithCRLineEndings()
void	testMergeCRLFWithLFLineEndings()
void	testMergeCRWithCRLFLineEndings()
void	testMergeCRWithLFLineEndings()
void	testMergeLFWithCRLFLineEndings()
void	testMergeLFWithCRLineEndings()
void	testMergingPrioritizingMain()
void	testMergingPrioritizingMainThreeWay()
void	testMergingPrioritizingMainThreeWayLeftIsEmpty()
void	testMergingPrioritizingMainThreeWayRightIsEmpty()
void	testMergingPrioritizingMainWithEmptyDiffs()
void	testMergingPrioritizingOther()
void	testMergingPrioritizingOtherThreeWay()
void	testMergingPrioritizingOtherThreeWayLeftIsEmpty()
void	testMergingPrioritizingOtherThreeWayRightIsEmpty()
void	testMergingPrioritizingOtherWithEmptyDiffs()

Methods inherited from class java.lang.Object

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

Constructor Detail

MergeFormatterTest

public MergeFormatterTest()

Method Detail

initializeBsl

public static void initializeBsl()

testMergingPrioritizingMain

public void testMergingPrioritizingMain()
                                 throws IOException,
                                        com._1c.g5.gumtree.core.tree.TreeGeneratorException

Throws:

IOException

com._1c.g5.gumtree.core.tree.TreeGeneratorException

testMergingPrioritizingOther

public void testMergingPrioritizingOther()
                                  throws IOException,
                                         com._1c.g5.gumtree.core.tree.TreeGeneratorException

Throws:

IOException

com._1c.g5.gumtree.core.tree.TreeGeneratorException

testMergingPrioritizingMainWithEmptyDiffs

public void testMergingPrioritizingMainWithEmptyDiffs()
                                               throws IOException,
                                                      com._1c.g5.gumtree.core.tree.TreeGeneratorException

Throws:

IOException

com._1c.g5.gumtree.core.tree.TreeGeneratorException

testMergingPrioritizingOtherWithEmptyDiffs

public void testMergingPrioritizingOtherWithEmptyDiffs()
                                                throws IOException,
                                                       com._1c.g5.gumtree.core.tree.TreeGeneratorException

Throws:

IOException

com._1c.g5.gumtree.core.tree.TreeGeneratorException

testMergingPrioritizingMainThreeWay

public void testMergingPrioritizingMainThreeWay()
                                         throws IOException,
                                                com._1c.g5.gumtree.core.tree.TreeGeneratorException

Throws:

IOException

com._1c.g5.gumtree.core.tree.TreeGeneratorException

testMergingPrioritizingOtherThreeWay

public void testMergingPrioritizingOtherThreeWay()
                                          throws IOException,
                                                 com._1c.g5.gumtree.core.tree.TreeGeneratorException

Throws:

IOException

com._1c.g5.gumtree.core.tree.TreeGeneratorException

testCatalogObjectModuleMergingPrioritizingOtherThreeWay

public void testCatalogObjectModuleMergingPrioritizingOtherThreeWay()
                                                             throws IOException,
                                                                    com._1c.g5.gumtree.core.tree.TreeGeneratorException

Throws:

IOException

com._1c.g5.gumtree.core.tree.TreeGeneratorException

testCatalogFormModuleMergingPrioritizingOtherThreeWay

public void testCatalogFormModuleMergingPrioritizingOtherThreeWay()
                                                           throws IOException,
                                                                  com._1c.g5.gumtree.core.tree.TreeGeneratorException

Throws:

IOException

com._1c.g5.gumtree.core.tree.TreeGeneratorException

testMergingPrioritizingMainThreeWayLeftIsEmpty

public void testMergingPrioritizingMainThreeWayLeftIsEmpty()
                                                    throws IOException,
                                                           com._1c.g5.gumtree.core.tree.TreeGeneratorException

Throws:

IOException

com._1c.g5.gumtree.core.tree.TreeGeneratorException

testMergingPrioritizingOtherThreeWayLeftIsEmpty

public void testMergingPrioritizingOtherThreeWayLeftIsEmpty()
                                                     throws IOException,
                                                            com._1c.g5.gumtree.core.tree.TreeGeneratorException

Throws:

IOException

com._1c.g5.gumtree.core.tree.TreeGeneratorException

testMergingPrioritizingMainThreeWayRightIsEmpty

public void testMergingPrioritizingMainThreeWayRightIsEmpty()
                                                     throws IOException,
                                                            com._1c.g5.gumtree.core.tree.TreeGeneratorException

Throws:

IOException

com._1c.g5.gumtree.core.tree.TreeGeneratorException

testMergingPrioritizingOtherThreeWayRightIsEmpty

public void testMergingPrioritizingOtherThreeWayRightIsEmpty()
                                                      throws IOException,
                                                             com._1c.g5.gumtree.core.tree.TreeGeneratorException

Throws:

IOException

com._1c.g5.gumtree.core.tree.TreeGeneratorException

testMergeCRLFWithLFLineEndings

public void testMergeCRLFWithLFLineEndings()
                                    throws IOException

Throws:

IOException

testMergeLFWithCRLFLineEndings

public void testMergeLFWithCRLFLineEndings()
                                    throws IOException

Throws:

IOException

testMergeCRLFWithCRLineEndings

public void testMergeCRLFWithCRLineEndings()
                                    throws IOException

Throws:

IOException

testMergeCRWithCRLFLineEndings

public void testMergeCRWithCRLFLineEndings()
                                    throws IOException

Throws:

IOException

testMergeLFWithCRLineEndings

public void testMergeLFWithCRLineEndings()
                                  throws IOException

Throws:

IOException

testMergeCRWithLFLineEndings

public void testMergeCRWithLFLineEndings()
                                  throws IOException

Throws:

IOException

testCollectMergeConflictsForEmptyModule

public void testCollectMergeConflictsForEmptyModule()

testLineClearedOnOtherMergePrioritizingOther3way

public void testLineClearedOnOtherMergePrioritizingOther3way()
                                                      throws Exception

Throws:

Exception

testLineClearedOnOtherMergePrioritizingMain3way

public void testLineClearedOnOtherMergePrioritizingMain3way()
                                                     throws Exception

Throws:

Exception

testLineClearedOnMainMergePrioritizingOther3way

public void testLineClearedOnMainMergePrioritizingOther3way()
                                                     throws Exception

Throws:

Exception

testLineClearedOnMainMergePrioritizingMain3way

public void testLineClearedOnMainMergePrioritizingMain3way()
                                                    throws Exception

Throws:

Exception

testClearLineChangedOnOtherMergePrioritizingOther3way

public void testClearLineChangedOnOtherMergePrioritizingOther3way()
                                                           throws Exception

Throws:

Exception

testClearLineChangedOnOtherMergePrioritizingMain3way

public void testClearLineChangedOnOtherMergePrioritizingMain3way()
                                                          throws Exception

Throws:

Exception

testClearLineChangedOnMainMergePrioritizingOther3way

public void testClearLineChangedOnMainMergePrioritizingOther3way()
                                                          throws Exception

Throws:

Exception

testClearLineChangedOnMainMergePrioritizingMain3way

public void testClearLineChangedOnMainMergePrioritizingMain3way()
                                                         throws Exception

Throws:

Exception

testLineDeletedOnOtherMergePrioritizingOther3way

public void testLineDeletedOnOtherMergePrioritizingOther3way()
                                                      throws Exception

Throws:

Exception

testLineDeletedOnOtherMergePrioritizingMain3way

public void testLineDeletedOnOtherMergePrioritizingMain3way()
                                                     throws Exception

Throws:

Exception

testLineDeletedOnMainMergePrioritizingOther3way

public void testLineDeletedOnMainMergePrioritizingOther3way()
                                                     throws Exception

Throws:

Exception

testLineDeletedOnMainMergePrioritizingMain3way

public void testLineDeletedOnMainMergePrioritizingMain3way()
                                                    throws Exception

Throws:

Exception

testLineAddedOnOtherMergePrioritizingOther3way

public void testLineAddedOnOtherMergePrioritizingOther3way()
                                                    throws Exception

Throws:

Exception

testLineAddedOnOtherMergePrioritizingMain3way

public void testLineAddedOnOtherMergePrioritizingMain3way()
                                                   throws Exception

Throws:

Exception

testLineAddedOnMainMergePrioritizingOther3way

public void testLineAddedOnMainMergePrioritizingOther3way()
                                                   throws Exception

Throws:

Exception

testLineAddedOnMainMergePrioritizingMain3way

public void testLineAddedOnMainMergePrioritizingMain3way()
                                                  throws Exception

Throws:

Exception

testEmptyLineDeletedOnOtherMergePrioritizingOther3way

public void testEmptyLineDeletedOnOtherMergePrioritizingOther3way()
                                                           throws Exception

Throws:

Exception

testEmptyLineDeletedOnOtherMergePrioritizingMain3way

public void testEmptyLineDeletedOnOtherMergePrioritizingMain3way()
                                                          throws Exception

Throws:

Exception

testEmptyLineDeletedOnMainMergePrioritizingOther3way

public void testEmptyLineDeletedOnMainMergePrioritizingOther3way()
                                                          throws Exception

Throws:

Exception

testEmptyLineDeletedOnMainMergePrioritizingMain3way

public void testEmptyLineDeletedOnMainMergePrioritizingMain3way()
                                                         throws Exception

Throws:

Exception

testEmptyLineAddedOnOtherMergePrioritizingOther3way

public void testEmptyLineAddedOnOtherMergePrioritizingOther3way()
                                                         throws Exception

Throws:

Exception

testEmptyLineAddedOnOtherMergePrioritizingMain3way

public void testEmptyLineAddedOnOtherMergePrioritizingMain3way()
                                                        throws Exception

Throws:

Exception

testEmptyLineAddedOnMainMergePrioritizingOther3way

public void testEmptyLineAddedOnMainMergePrioritizingOther3way()
                                                        throws Exception

Throws:

Exception

testEmptyLineAddedOnMainMergePrioritizingMain3way

public void testEmptyLineAddedOnMainMergePrioritizingMain3way()
                                                       throws Exception

Throws:

Exception

testLineDeletedOnMainAndOtherMergePrioritizingMain3way

public void testLineDeletedOnMainAndOtherMergePrioritizingMain3way()
                                                            throws Exception

Throws:

Exception

testLineDeletedOnMainAndOtherMergePrioritizingOther3way

public void testLineDeletedOnMainAndOtherMergePrioritizingOther3way()
                                                             throws Exception

Throws:

Exception