Fixed issues with detecting correct license

This commit is contained in:
Roy Wetherall
2016-02-29 13:52:17 +11:00
parent 0f80b9f992
commit e5e5597efc
2 changed files with 13 additions and 5 deletions

View File

@@ -26,8 +26,8 @@ import static org.mockito.Mockito.when;
import org.alfresco.service.cmr.admin.RepoUsage.LicenseMode;
import org.alfresco.service.cmr.module.ModuleDetails;
import org.alfresco.service.cmr.module.ModuleService;
import org.alfresco.service.descriptor.Descriptor;
import org.alfresco.service.descriptor.DescriptorService;
import org.alfresco.service.license.LicenseDescriptor;
import org.junit.Before;
import org.junit.Test;
import org.mockito.InjectMocks;
@@ -50,7 +50,7 @@ public class ModuleCompatibilityComponentUnitTest
@Mock private ContextRefreshedEvent mockedContextRefreshedEvent;
@Mock private ConfigurableApplicationContext mockedApplicationContext;
@Mock private ModuleDetails mockedModuleDetails;
@Mock private Descriptor mockedDescriptor;
@Mock private LicenseDescriptor mockedDescriptor;
/** object under test */
@InjectMocks private ModuleCompatibilityComponent moduleCompatibilityComponent;
@@ -65,8 +65,8 @@ public class ModuleCompatibilityComponentUnitTest
when(mockedContextRefreshedEvent.getApplicationContext())
.thenReturn(mockedApplicationContext);
when(mockedDescriptorService.getServerDescriptor())
.thenReturn(mockedDescriptor);
when(mockedDescriptorService.getLicenseDescriptor())
.thenReturn(mockedDescriptor);
}
/**