mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-14 17:58:59 +00:00
Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
122856 mward: UTF-384: swapped the 'fresh' and 'updated' in the comparison method call so that the report appears with them in the correct columns. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124015 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -136,13 +136,13 @@ public class EndToEndIntegrationTest
|
|||||||
/**
|
/**
|
||||||
* Run the diff tool
|
* Run the diff tool
|
||||||
*
|
*
|
||||||
* @param path1
|
* @param freshInstallation
|
||||||
* @param path2
|
* @param updatedInstallation
|
||||||
*/
|
*/
|
||||||
public void compare(File path1, File path2) throws IOException
|
public void compare(File freshInstallation, File updatedInstallation) throws IOException
|
||||||
{
|
{
|
||||||
FileTreeCompare comparator = new FileTreeCompareImpl();
|
FileTreeCompare comparator = new FileTreeCompareImpl();
|
||||||
ResultSet resultSet = comparator.compare(path1.toPath(), path2.toPath());
|
ResultSet resultSet = comparator.compare(updatedInstallation.toPath(), freshInstallation.toPath());
|
||||||
|
|
||||||
File dircompDir = new File(targetDir, "installation-diff");
|
File dircompDir = new File(targetDir, "installation-diff");
|
||||||
dircompDir.mkdirs();
|
dircompDir.mkdirs();
|
||||||
|
Reference in New Issue
Block a user