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

REPO-2434: Fix testGetPersistentType

Browse Source 
- Renamed to testGetPersistentTypeForStrings
 - divorce the test from any dialect that happens to set the string length by setting and resetting the string length
 - Test explicitly around 2000 chars rather than the default


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137722 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2017-06-21 08:52:55 +00:00
parent cf2240d301
commit 4191e3beed
2 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
View File

@@ -189,7 +189,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean
/**
* @see #DEFAULT_MAX_STRING_LENGTH
*/
private static final void setMaxStringLength(int length, Dialect dialect)
public static final void setMaxStringLength(int length, Dialect dialect)
{
int max = (dialect instanceof AlfrescoMySQLClusterNDBDialect ? DEFAULT_MAX_STRING_LENGTH_NDB : DEFAULT_MAX_STRING_LENGTH);

38
source/test-java/org/alfresco/repo/domain/propval/PropertyTypeConverterTest.java
View File

@@ -25,14 +25,17 @@
*/
package org.alfresco.repo.domain.propval;
import static org.junit.Assert.assertEquals;
import org.alfresco.repo.domain.schema.SchemaBootstrap;
import org.alfresco.test_category.OwnJVMTestsCategory;
import org.apache.commons.lang.RandomStringUtils;
import org.hibernate.dialect.MySQLInnoDBDialect;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import static org.junit.Assert.assertEquals;
/**
* @see PropertyTypeConverter
*
@@ -42,9 +45,23 @@ import org.junit.experimental.categories.Category;
@Category(OwnJVMTestsCategory.class)
public class PropertyTypeConverterTest
{
private int stringLen;
@Before
public void setMaxStringLength()
{
stringLen = SchemaBootstrap.getMaxStringLength();
SchemaBootstrap.setMaxStringLength(2000, new MySQLInnoDBDialect());
}
@After
public void resetMaxStringLength()
{
SchemaBootstrap.setMaxStringLength(stringLen, new MySQLInnoDBDialect());
}
@Test
public void testGetPersistentType()
public void testGetPersistentTypeForStrings()
{
DefaultPropertyTypeConverter defaultPropertyTypeConverter = new DefaultPropertyTypeConverter();
@@ -52,12 +69,17 @@ public class PropertyTypeConverterTest
PropertyValueEntity.PersistedType persistedType = PropertyValueEntity.getPersistedTypeEnum("test", defaultPropertyTypeConverter);
assertEquals(PropertyValueEntity.PersistedType.STRING, persistedType);
// String value with length grater then the DB supported threshold.
String stringValue = RandomStringUtils.randomAlphanumeric(SchemaBootstrap.getMaxStringLength() + 1);
// Check long string that was truncated (see MNT-17523 for details).
// String value with length greater than the DB supported threshold.
String stringValue = RandomStringUtils.randomAlphanumeric(2001);
// ... persisted as blobs (see MNT-17523 for details).
persistedType = PropertyValueEntity.getPersistedTypeEnum(stringValue, defaultPropertyTypeConverter);
assertEquals(PropertyValueEntity.PersistedType.SERIALIZABLE, persistedType);
// String value with length less than the DB supported threshold.
stringValue = RandomStringUtils.randomAlphanumeric(1999);
// ... persisted as strings
persistedType = PropertyValueEntity.getPersistedTypeEnum(stringValue, defaultPropertyTypeConverter);
assertEquals(PropertyValueEntity.PersistedType.STRING, persistedType);
}
}