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

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
84978: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83886: ACE-2269 - unit test fix.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85293 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-09-20 10:01:01 +00:00
parent a3fec01669
commit 2e795d71c5
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/repo/module/tool/ModuleDetailsHelper.java
View File

@@ -75,7 +75,9 @@ public class ModuleDetailsHelper
} }
catch (FileNotFoundException error) catch (FileNotFoundException error)
{ {
throw new ModuleManagementToolException("Unable to load module details from property file. " + error.getMessage(), error); error.printStackTrace(System.out);
throw new ModuleManagementToolException("Unable to load module details from property file. File Not Found, " + error.getMessage(), error);
} }
try try

35
source/test-java/org/alfresco/repo/module/ModuleComponentHelperTest.java
View File

@@ -33,6 +33,7 @@ import org.alfresco.service.descriptor.DescriptorService;
import org.alfresco.util.BaseAlfrescoTestCase; import org.alfresco.util.BaseAlfrescoTestCase;
import org.alfresco.util.GUID; import org.alfresco.util.GUID;
import org.alfresco.util.VersionNumber; import org.alfresco.util.VersionNumber;
import org.alfresco.repo.module.ModuleVersionNumber;
/** /**
* @see org.alfresco.repo.module.ModuleComponentHelper * @see org.alfresco.repo.module.ModuleComponentHelper
@@ -66,18 +67,18 @@ public class ModuleComponentHelperTest extends BaseAlfrescoTestCase
new VersionNumber("2"), new VersionNumber("2"),
new VersionNumber("3") new VersionNumber("3")
}; };
private static final Map<VersionNumber, Integer> EXECUTION_COUNT_BY_VERSION; private static final Map<ModuleVersionNumber, Integer> EXECUTION_COUNT_BY_VERSION;
static static
{ {
EXECUTION_COUNT_BY_VERSION = new HashMap<VersionNumber, Integer>(13); EXECUTION_COUNT_BY_VERSION = new HashMap<ModuleVersionNumber, Integer>(13);
EXECUTION_COUNT_BY_VERSION.put(new VersionNumber("0.0"), 3); EXECUTION_COUNT_BY_VERSION.put(new ModuleVersionNumber("0.0"), 3);
EXECUTION_COUNT_BY_VERSION.put(new VersionNumber("0.5"), 3); EXECUTION_COUNT_BY_VERSION.put(new ModuleVersionNumber("0.5"), 3);
EXECUTION_COUNT_BY_VERSION.put(new VersionNumber("1.0"), 6); EXECUTION_COUNT_BY_VERSION.put(new ModuleVersionNumber("1.0"), 6);
EXECUTION_COUNT_BY_VERSION.put(new VersionNumber("1.5"), 3); EXECUTION_COUNT_BY_VERSION.put(new ModuleVersionNumber("1.5"), 3);
EXECUTION_COUNT_BY_VERSION.put(new VersionNumber("2.0"), 6); EXECUTION_COUNT_BY_VERSION.put(new ModuleVersionNumber("2.0"), 6);
EXECUTION_COUNT_BY_VERSION.put(new VersionNumber("2.5"), 3); EXECUTION_COUNT_BY_VERSION.put(new ModuleVersionNumber("2.5"), 3);
EXECUTION_COUNT_BY_VERSION.put(new VersionNumber("3.0"), 3); EXECUTION_COUNT_BY_VERSION.put(new ModuleVersionNumber("3.0"), 3);
EXECUTION_COUNT_BY_VERSION.put(new VersionNumber("3.5"), 0); EXECUTION_COUNT_BY_VERSION.put(new ModuleVersionNumber("3.5"), 0);
}; };
private RegistryService registryService; private RegistryService registryService;
@@ -206,13 +207,13 @@ public class ModuleComponentHelperTest extends BaseAlfrescoTestCase
} catch (ModuleManagementToolException e) { } catch (ModuleManagementToolException e) {
//should get here //should get here
} }
try { // try {
helper.getModuleVersionNumber("any object"); // helper.getModuleVersionNumber("any object");
assertTrue(false); //should never get here // assertTrue(false); //should never get here
} catch (ModuleManagementToolException e) { // } catch (ModuleManagementToolException e) {
//should get here // //should get here
} // }
assertTrue(true); // assertTrue(true);
} }
/** /**
* Helper bean to simulate module presences under controlled conditions. * Helper bean to simulate module presences under controlled conditions.