Constructor
new MergeAdapter(path, displayName)
Create a new MergeAdapter instance.
Parameters:
Name | Type | Description |
---|---|---|
path |
String | The path to the directory containing the merge algorithm and the run script |
displayName |
String | The name to display for the merge algorithm this adapter represents. |
Classes
Methods
evalCase(testCase) → {MergeTestResult}
Parameters:
Name | Type | Description |
---|---|---|
testCase |
MergeTestCase | The merge test case to run. |
Returns:
The result.
- Type
- MergeTestResult
run(base, branch1, branch2) → {String}
Run this three-way merge algorithm.
Parameters:
Name | Type | Description |
---|---|---|
base |
Node | The root of the base process tree. |
branch1 |
Node | The root of the first branch process tree. |
branch2 |
Node | The root of the second branch process tree. |
Returns:
The merge result as an XML document.
- Type
- String
verifyResult(actualMerge, expectedMerge) → {String}
Verify that an actual merge result matches the expected result.
Parameters:
Name | Type | Description |
---|---|---|
actualMerge |
ActualMerge | The actual merge result. |
expectedMerge |
ExpectedMerge | The expected merge result. |
Returns:
The verdict
- Type
- String