inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)

Browse Source 
128482 jvonka: REPO-839: Follow-on to fix test fallout
   - subtle fix to mimeType guess (ie. application/octet-stream should be last resort, if magic bytes indicate txt/xml and there is no file ext)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129163 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Martin Muller
2016-08-05 13:46:30 +00:00
parent 44a7a5d8aa
commit 84ae12693f
1 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
source/test-java/org/alfresco/filesys/repo/ContentDiskDriverTest.java
View File

@@ -1,28 +1,28 @@
/*
* #%L
* Alfresco Repository
* %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
/*
* #%L
* Alfresco Repository
* %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
package org.alfresco.filesys.repo;
import java.io.FileNotFoundException;
@@ -66,6 +66,7 @@ import org.alfresco.jlan.server.filesys.TreeConnection;
import org.alfresco.model.ContentModel;
import org.alfresco.model.ForumModel;
import org.alfresco.repo.action.evaluator.NoConditionEvaluator;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.management.subsystems.ApplicationContextFactory;
import org.alfresco.repo.model.Repository;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
@@ -7948,15 +7949,15 @@ public class ContentDiskDriverTest extends TestCase
/**
* Guess mimetype with insufficient data for ACE-4523
* Guess mimetype with sufficient data - originally related to ACE-4523
* Simulate creating a plain text document via Alfresco Share
* then updating it via CIFS/FTP
*
* 1. create a document called "foo" with just a little data with an explicit mimetype set.
* 1. create a document called "foo" with just a little data with an explicit (incorrect) mimetype set.
* 2. update the document with different text
* 3. check the mimetype of the test doc has not changed
* 3. check the mimetype of the test doc has changed (since it can be guessed)
*/
public void testMimetypeWithInsufficiantData() throws Exception
public void testMimetypeWithSufficientData() throws Exception
{
logger.debug("testMimetypeWithInsufficiantData");
@@ -7970,7 +7971,7 @@ public class ContentDiskDriverTest extends TestCase
};
final TestContext testContext = new TestContext();
final String TEST_DIR = TEST_ROOT_DOS_PATH + "\\testMimetypeWithInsufficiantData";
final String TEST_DIR = TEST_ROOT_DOS_PATH + "\\testMimetypeWithSufficientData";
// this is a made up mimetype - so there is no way that it could be guessed.
final String TEST_MIMETYPE = "text\bar";
@@ -8075,17 +8076,17 @@ public class ContentDiskDriverTest extends TestCase
/**
* Validate mimetype has not changed
* Validate mimetype has changed - we can guess that it is text !
*/
assertEquals("mimeType is wrong", TEST_MIMETYPE, data.getMimetype());
assertEquals("mimeType is wrong", MimetypeMap.MIMETYPE_TEXT_PLAIN, data.getMimetype());
return null;
}
};
tran.doInTransaction(validateCB, true, true);
logger.debug("end testMimetypeWithInsufficiantData");
} // testMimetypeWithInsufficiantData"
logger.debug("end testMimetypeWithSufficientData");
} // testMimetypeWithSufficientData"