inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-22 15:12:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)

Browse Source 
121619 mrogers: MNT-14860 - Unit test failure in CIFS Content Comparator for PPT


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121671 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Raluca Munteanu
2016-01-29 14:32:32 +00:00
parent 81128204c6
commit 46b53eb6c8
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/filesys/repo/CIFSContentComparator.java
View File

@@ -1,6 +1,7 @@
package org.alfresco.filesys.repo; package org.alfresco.filesys.repo;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
@@ -16,15 +17,13 @@ import org.alfresco.util.EqualsHelper;
import org.alfresco.util.TempFileProvider; import org.alfresco.util.TempFileProvider;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hslf.HSLFSlideShow; import org.apache.poi.hslf.HSLFSlideShow;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.poifs.filesystem.DirectoryEntry; import org.apache.poi.poifs.filesystem.DirectoryEntry;
import org.apache.poi.poifs.filesystem.EntryUtils; import org.apache.poi.poifs.filesystem.EntryUtils;
import org.apache.poi.poifs.filesystem.FilteringDirectoryNode; import org.apache.poi.poifs.filesystem.FilteringDirectoryNode;
import org.apache.poi.poifs.filesystem.NPOIFSFileSystem; import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
import java.io.File;
/** /**
* Compares content for to see if content is equal. * Compares content for to see if content is equal.
* <p> * <p>
@@ -144,7 +143,8 @@ public class CIFSContentComparator implements ContentComparator
} }
return retVal; return retVal;
} }
// Comparator for MS Project // Comparator for MS Project
private class MPPContentComparator implements ContentComparator private class MPPContentComparator implements ContentComparator
{ {
@@ -384,6 +384,7 @@ public class CIFSContentComparator implements ContentComparator
} }
Collection<String> excludes = new HashSet<String>(); Collection<String> excludes = new HashSet<String>();
excludes.add("Current User");
leftIs = existingContent.getContentInputStream(); leftIs = existingContent.getContentInputStream();
HSLFSlideShow slideShow1 = new HSLFSlideShow(leftIs); HSLFSlideShow slideShow1 = new HSLFSlideShow(leftIs);
@@ -394,7 +395,7 @@ public class CIFSContentComparator implements ContentComparator
if (lastEditUsername1.equals(lastEditUsername2)) if (lastEditUsername1.equals(lastEditUsername2))
{ {
logger.debug("powerpoint files are different size"); logger.debug("powerpoint files are edited by different users");
// Different size // Different size
return false; return false;
} }