mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-30 18:15:39 +00:00
Fix CifsIntegrationTest
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13798 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
parent
2593e1298c
commit
b1380aca02
@ -24,7 +24,7 @@
|
|||||||
*/
|
*/
|
||||||
package org.alfresco.filesys.repo;
|
package org.alfresco.filesys.repo;
|
||||||
|
|
||||||
import org.alfresco.filesys.CIFSServerBean;
|
import org.alfresco.jlan.server.config.ServerConfigurationAccessor;
|
||||||
import org.alfresco.jlan.server.filesys.DiskSharedDevice;
|
import org.alfresco.jlan.server.filesys.DiskSharedDevice;
|
||||||
import org.alfresco.jlan.server.filesys.FilesystemsConfigSection;
|
import org.alfresco.jlan.server.filesys.FilesystemsConfigSection;
|
||||||
import org.alfresco.service.ServiceRegistry;
|
import org.alfresco.service.ServiceRegistry;
|
||||||
@ -42,22 +42,22 @@ public class CifsIntegrationTest extends BaseAlfrescoTestCase
|
|||||||
|
|
||||||
public void testGetServerName()
|
public void testGetServerName()
|
||||||
{
|
{
|
||||||
CIFSServerBean cifsServer = (CIFSServerBean) ctx.getBean("cifsServer");
|
ServerConfigurationAccessor config = (ServerConfigurationAccessor) ctx.getBean("fileServerConfiguration");
|
||||||
assertNotNull("No CIFS server available", cifsServer);
|
assertNotNull("No file server config available", config);
|
||||||
// the server might, quite legitimately, not start
|
// the server might, quite legitimately, not start
|
||||||
if (!cifsServer.isStarted())
|
if (!config.isServerRunning( "CIFS"))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// get the server name
|
// get the server name
|
||||||
String serverName = cifsServer.getConfiguration().getServerName();
|
String serverName = config.getServerName();
|
||||||
assertNotNull("No server name available", serverName);
|
assertNotNull("No server name available", serverName);
|
||||||
assertTrue("No server name available (zero length)", serverName.length() > 0);
|
assertTrue("No server name available (zero length)", serverName.length() > 0);
|
||||||
|
|
||||||
// Get the primary filesystem, might be null if the home folder mapper is configured
|
// Get the primary filesystem, might be null if the home folder mapper is configured
|
||||||
|
|
||||||
FilesystemsConfigSection filesysConfig = (FilesystemsConfigSection) cifsServer.getConfiguration().getConfigSection(FilesystemsConfigSection.SectionName);
|
FilesystemsConfigSection filesysConfig = (FilesystemsConfigSection) config.getConfigSection(FilesystemsConfigSection.SectionName);
|
||||||
DiskSharedDevice mainFilesys = (DiskSharedDevice) filesysConfig.getShares().enumerateShares().nextElement();
|
DiskSharedDevice mainFilesys = (DiskSharedDevice) filesysConfig.getShares().enumerateShares().nextElement();
|
||||||
|
|
||||||
if ( mainFilesys != null)
|
if ( mainFilesys != null)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user