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

First updates following code review on RM-1945 & RM-1946. Thanks Roy & Tom!

Browse Source 
Renamed a public service method to getClassificationLevels.
Removed a redundant test method.
Code tidying.
Various internal renames to help readability.
Slight javadoc improvements.
Also some trivial changes like fixing typos and copyright years etc.
Removing warnings from within AuthenticationUtil blocks allows IntelliJ to fold them to Java 8 closure format. (fistpump).  


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100020 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Neil McErlean
2015-03-24 21:15:22 +00:00
parent ff4fb3b7d0
commit 0cfc1a98bf
6 changed files with 33 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationServiceImplUnitTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2014 Alfresco Software Limited.
* Copyright (C) 2005-2015 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -31,7 +31,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
/**
* Unit tests for {@link ClassificationServiceImpl}.
*
@@ -63,21 +62,11 @@ public class ClassificationServiceImplUnitTest extends BaseUnitTest
ClassificationLevel.class.getSimpleName(), idsAndLabels.length));
}
final int resultLength = idsAndLabels.length / 2;
final String[] ids = new String[resultLength];
final String[] labels = new String[resultLength];
final List<ClassificationLevel> levels = new ArrayList<>(idsAndLabels.length / 2);
for (int i = 0; i < idsAndLabels.length; i++)
for (int i = 0; i < idsAndLabels.length; i += 2)
{
if (i % 2 == 0) { ids[i / 2] = idsAndLabels[i]; }
else { labels[(i - 1) / 2] = idsAndLabels[i]; }
}
final List<ClassificationLevel> levels = new ArrayList<>(resultLength);
for (int i = 0; i < resultLength; i++)
{
levels.add(new ClassificationLevel(ids[i], labels[i]));
levels.add(new ClassificationLevel(idsAndLabels[i], idsAndLabels[i+1]));
}
return levels;
@@ -94,17 +83,7 @@ public class ClassificationServiceImplUnitTest extends BaseUnitTest
classificationService.initConfiguredClassificationLevels();
assertEquals(DEFAULT_CLASSIFICATION_LEVELS, classificationService.getApplicableLevels());
}
@Test public void alternativeConfigurationVanillaSystem()
{
classificationService = new TestClassificationService(null, ALT_CLASSIFICATION_LEVELS);
classificationService.setAttributeService(mockedAttributeService);
classificationService.initConfiguredClassificationLevels();
assertEquals(ALT_CLASSIFICATION_LEVELS, classificationService.getApplicableLevels());
assertEquals(DEFAULT_CLASSIFICATION_LEVELS, classificationService.getClassificationLevels());
}
@Test public void alternativeConfigurationPreviouslyStartedSystem()
@@ -114,7 +93,7 @@ public class ClassificationServiceImplUnitTest extends BaseUnitTest
classificationService.initConfiguredClassificationLevels();
assertEquals(ALT_CLASSIFICATION_LEVELS, classificationService.getApplicableLevels());
assertEquals(ALT_CLASSIFICATION_LEVELS, classificationService.getClassificationLevels());
}
@Test (expected=MissingConfiguration.class)
@@ -141,6 +120,6 @@ public class ClassificationServiceImplUnitTest extends BaseUnitTest
}
@Override List<ClassificationLevel> getPersistedLevels() { return persisted; }
@Override List<ClassificationLevel> getConfiguredLevels() { return configured; }
@Override List<ClassificationLevel> getConfigurationLevels() { return configured; }
}
}