Skip to content
This repository was archived by the owner on Apr 15, 2021. It is now read-only.

Commit b4cb8d9

Browse files
Dawid ChojnackiDawid Chojnacki
Dawid Chojnacki
authored and
Dawid Chojnacki
committed
Novermber release
1 parent 1b9f4b5 commit b4cb8d9

File tree

146 files changed

+4431
-2105
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+4431
-2105
lines changed

‎oscm-accountmgmt-unittests/javasrc-it/org/oscm/accountservice/bean/AccountServiceBeanIT.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
import org.mockito.MockitoAnnotations;
6868
import org.mockito.invocation.InvocationOnMock;
6969
import org.mockito.stubbing.Answer;
70-
7170
import org.oscm.accountservice.assembler.OrganizationAssembler;
7271
import org.oscm.accountservice.assembler.PaymentTypeAssembler;
7372
import org.oscm.accountservice.dao.PaymentTypeDao;
@@ -152,6 +151,7 @@
152151
import org.oscm.usergroupservice.auditlog.UserGroupAuditLogCollector;
153152
import org.oscm.usergroupservice.bean.UserGroupServiceLocalBean;
154153
import org.oscm.usergroupservice.dao.UserGroupDao;
154+
import org.oscm.usergroupservice.dao.UserGroupUsersDao;
155155
import org.oscm.internal.intf.AccountService;
156156
import org.oscm.internal.intf.IdentityService;
157157
import org.oscm.internal.types.enumtypes.ConfigurationKey;
@@ -278,6 +278,7 @@ public void setup(final TestContainer container) throws Exception {
278278
setInvoiceAsDefaultPayment = false;
279279

280280
container.login(1L);
281+
container.enableInterfaceMocking(true);
281282

282283
container.addBean(new DataServiceBean());
283284
container.addBean(new PaymentTypeDao());
@@ -338,6 +339,7 @@ public boolean storeLocalizedResource(String localeString,
338339
container.addBean(userGroupDao);
339340
userGroupServiceLocal = mock(UserGroupServiceLocalBean.class);
340341
container.addBean(userGroupServiceLocal);
342+
container.addBean(new UserGroupUsersDao());
341343
container.addBean(new ImageResourceServiceStub() {
342344
ImageResource saved;
343345

‎oscm-app-unittests/.classpath‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
<classpathentry combineaccessrules="false" kind="src" path="/oscm-identitymgmt-intsvc"/>
1919
<classpathentry combineaccessrules="false" kind="src" path="/oscm-app-startup"/>
2020
<classpathentry combineaccessrules="false" kind="src" path="/oscm-webservices"/>
21-
<classpathentry kind="lib" path="/libraries/slf4j/javalib/slf4j-api-1.7.7.jar"/><classpathentry kind="lib" path="/libraries/slf4j/javalib/slf4j-simple-1.7.7.jar"/>
21+
<classpathentry kind="lib" path="/libraries/slf4j/javalib/slf4j-api-1.7.7.jar"/>
22+
<classpathentry kind="lib" path="/libraries/slf4j/javalib/slf4j-simple-1.7.7.jar"/>
2223
<classpathentry kind="lib" path="/libraries/slf4j-log4j/javalib/slf4j-log4j12-1.7.7.jar"/>
2324
<classpathentry kind="lib" path="/libraries/apache-log4j/javalib/log4j-1.2.16.jar"/>
2425
<classpathentry kind="lib" path="/libraries/apache-codec/javalib/commons-codec-1.7.jar"/>

‎oscm-app-unittests/javasrc-it/org/oscm/app/business/APPlatformControllerFactoryIT.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@
66

77
import javax.naming.InitialContext;
88

9+
import org.junit.Assert;
10+
import org.junit.Before;
911
import org.junit.Test;
1012
import org.mockito.Mockito;
1113

14+
import org.oscm.app.adapter.APPlatformControllerAdapter;
1215
import org.oscm.test.EJBTestBase;
1316
import org.oscm.test.ejb.TestContainer;
1417
import org.oscm.app.business.APPlatformControllerFactory;
@@ -22,14 +25,16 @@
2225
*/
2326
public class APPlatformControllerFactoryIT extends EJBTestBase {
2427

28+
private InitialContext context;
29+
2530
@Override
2631
protected void setup(TestContainer container) throws Exception {
32+
context = new InitialContext();
2733
}
2834

2935
@Test(expected = ControllerLookupException.class)
3036
public void testWrongInterface() throws Exception {
3137

32-
InitialContext context = new InitialContext();
3338
context.bind(APPlatformController.JNDI_PREFIX + "test.controller",
3439
new String());
3540
APPlatformControllerFactory.getInstance("test.controller");
@@ -39,10 +44,10 @@ public void testWrongInterface() throws Exception {
3944
public void testOK() throws Exception {
4045

4146
new APPlatformControllerFactory(); // coverage
42-
InitialContext context = new InitialContext();
4347
context.bind(APPlatformController.JNDI_PREFIX + "test.controller",
4448
Mockito.mock(APPlatformController.class));
45-
APPlatformControllerFactory.getInstance("test.controller");
49+
APPlatformController instance = APPlatformControllerFactory.getInstance("test.controller");
50+
Assert.assertTrue(instance instanceof APPlatformControllerAdapter);
4651
}
4752

4853
@Test(expected = ControllerLookupException.class)

‎oscm-app-unittests/javasrc/org/oscm/app/adapter/APPlatformControllerAdapterTest.java‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
/*******************************************************************************
2+
*
3+
* Copyright FUJITSU LIMITED 2015
4+
*
5+
* Creation Date: 29.10.15 10:08
6+
*
7+
******************************************************************************/
8+
9+
package org.oscm.app.adapter;
10+
11+
import static org.junit.Assert.assertNotNull;
12+
import static org.mockito.Mockito.mock;
13+
14+
import org.junit.Before;
15+
import org.junit.Test;
16+
import org.oscm.app.v1_0.exceptions.APPlatformException;
17+
import org.oscm.app.v1_0.intf.APPlatformController;
18+
19+
public class APPlatformControllerAdapterTest {
20+
21+
@Before
22+
public void setUp() throws Exception {
23+
24+
}
25+
26+
@Test
27+
public void constructorTest() throws APPlatformException {
28+
APPlatformController controllerInterface = mock(APPlatformController.class);
29+
APPlatformControllerAdapter adapter = new APPlatformControllerAdapter(controllerInterface);
30+
assertNotNull(adapter.getDelegate());
31+
}
32+
33+
@Test
34+
public void testGetConverterData() throws Exception {
35+
36+
}
37+
38+
@Test
39+
public void testGetConverterException() throws Exception {
40+
41+
}
42+
43+
@Test
44+
public void testGetControllerInterface() throws Exception {
45+
46+
}
47+
48+
@Test
49+
public void testSetControllerInterface() throws Exception {
50+
51+
}
52+
53+
@Test
54+
public void testCreateInstance() throws Exception {
55+
56+
}
57+
58+
@Test
59+
public void testModifyInstance() throws Exception {
60+
61+
}
62+
63+
@Test
64+
public void testDeleteInstance() throws Exception {
65+
66+
}
67+
68+
@Test
69+
public void testGetInstanceStatus() throws Exception {
70+
71+
}
72+
73+
@Test
74+
public void testNotifyInstance() throws Exception {
75+
76+
}
77+
78+
@Test
79+
public void testActivateInstance() throws Exception {
80+
81+
}
82+
83+
@Test
84+
public void testDeactivateInstance() throws Exception {
85+
86+
}
87+
88+
@Test
89+
public void testCreateUsers() throws Exception {
90+
91+
}
92+
93+
@Test
94+
public void testDeleteUsers() throws Exception {
95+
96+
}
97+
98+
@Test
99+
public void testUpdateUsers() throws Exception {
100+
101+
}
102+
103+
@Test
104+
public void testGetControllerStatus() throws Exception {
105+
106+
}
107+
108+
@Test
109+
public void testGetOperationParameters() throws Exception {
110+
111+
}
112+
113+
@Test
114+
public void testExecuteServiceOperation() throws Exception {
115+
116+
}
117+
118+
@Test
119+
public void testSetControllerSettings() throws Exception {
120+
121+
}
122+
}

‎oscm-app/.classpath‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,22 @@
55
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
66
<classpathentry combineaccessrules="false" kind="src" path="/oscm-extsvc-provisioning"/>
77
<classpathentry kind="lib" path="/libraries/sun-glassfish-rt31/javalib/javaee.jar"/>
8-
<classpathentry kind="lib" path="/libraries/slf4j/javalib/slf4j-api-1.7.7.jar"/><classpathentry kind="lib" path="/libraries/slf4j/javalib/slf4j-simple-1.7.7.jar"/>
8+
<classpathentry kind="lib" path="/libraries/slf4j/javalib/slf4j-api-1.7.7.jar"/>
9+
<classpathentry kind="lib" path="/libraries/slf4j/javalib/slf4j-simple-1.7.7.jar"/>
910
<classpathentry combineaccessrules="false" kind="src" path="/oscm-webservices-client"/>
1011
<classpathentry kind="lib" path="/libraries/wsdl4j/javalib/wsdl4j.jar"/>
1112
<classpathentry combineaccessrules="false" kind="src" path="/oscm-common"/>
1213
<classpathentry combineaccessrules="false" kind="src" path="/oscm-server-common"/>
1314
<classpathentry kind="lib" path="/libraries/apache-log4j/javalib/log4j-1.2.16.jar"/>
14-
<classpathentry kind="lib" path="/libraries/redhat-hibernate/javalib/antlr-2.7.7.jar"/><classpathentry kind="lib" path="/libraries/redhat-hibernate/javalib/dom4j-1.6.1.jar"/><classpathentry kind="lib" path="/libraries/redhat-hibernate/javalib/hibernate-commons-annotations-4.0.1.Final.jar"/><classpathentry kind="lib" path="/libraries/redhat-hibernate/javalib/hibernate-core-4.1.8.Final.jar"/><classpathentry kind="lib" path="/libraries/redhat-hibernate/javalib/hibernate-entitymanager-4.1.8.Final.jar"/><classpathentry kind="lib" path="/libraries/redhat-hibernate/javalib/hibernate-jpa-2.0-api-1.0.1.Final.jar"/><classpathentry kind="lib" path="/libraries/redhat-hibernate/javalib/javassist-3.15.0-GA.jar"/><classpathentry kind="lib" path="/libraries/redhat-hibernate/javalib/jboss-logging-3.1.0.GA.jar"/><classpathentry kind="lib" path="/libraries/redhat-hibernate/javalib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/>
15+
<classpathentry kind="lib" path="/libraries/redhat-hibernate/javalib/antlr-2.7.7.jar"/>
16+
<classpathentry kind="lib" path="/libraries/redhat-hibernate/javalib/dom4j-1.6.1.jar"/>
17+
<classpathentry kind="lib" path="/libraries/redhat-hibernate/javalib/hibernate-commons-annotations-4.0.1.Final.jar"/>
18+
<classpathentry kind="lib" path="/libraries/redhat-hibernate/javalib/hibernate-core-4.1.8.Final.jar"/>
19+
<classpathentry kind="lib" path="/libraries/redhat-hibernate/javalib/hibernate-entitymanager-4.1.8.Final.jar"/>
20+
<classpathentry kind="lib" path="/libraries/redhat-hibernate/javalib/hibernate-jpa-2.0-api-1.0.1.Final.jar"/>
21+
<classpathentry kind="lib" path="/libraries/redhat-hibernate/javalib/javassist-3.15.0-GA.jar"/>
22+
<classpathentry kind="lib" path="/libraries/redhat-hibernate/javalib/jboss-logging-3.1.0.GA.jar"/>
23+
<classpathentry kind="lib" path="/libraries/redhat-hibernate/javalib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/>
1524
<classpathentry kind="lib" path="/libraries/slf4j-log4j/javalib/slf4j-log4j12-1.7.7.jar"/>
1625
<classpathentry kind="lib" path="/libraries/apache-codec/javalib/commons-codec-1.7.jar"/>
1726
<classpathentry combineaccessrules="false" kind="src" path="/oscm-extsvc"/>

‎oscm-app/javasrc/org/oscm/app/adapter/APPlatformControllerAdapter.java‎

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
/*******************************************************************************
2+
*
3+
* Copyright FUJITSU LIMITED 2015
4+
*
5+
* Creation Date: 29.10.15 10:01
6+
*
7+
******************************************************************************/
8+
9+
package org.oscm.app.adapter;
10+
11+
import java.util.List;
12+
import java.util.Properties;
13+
14+
import org.oscm.app.v1_0.data.ControllerSettings;
15+
import org.oscm.app.v1_0.data.InstanceDescription;
16+
import org.oscm.app.v1_0.data.InstanceStatus;
17+
import org.oscm.app.v1_0.data.InstanceStatusUsers;
18+
import org.oscm.app.v1_0.data.LocalizedText;
19+
import org.oscm.app.v1_0.data.OperationParameter;
20+
import org.oscm.app.v1_0.data.ProvisioningSettings;
21+
import org.oscm.app.v1_0.data.ServiceUser;
22+
import org.oscm.app.v1_0.exceptions.APPlatformException;
23+
import org.oscm.app.v1_0.intf.APPlatformController;
24+
25+
public class APPlatformControllerAdapter implements APPlatformController {
26+
27+
private APPlatformController delegate;
28+
29+
private APPlatformControllerAdapter() {
30+
}
31+
32+
public APPlatformControllerAdapter(APPlatformController delegate) {
33+
this.delegate = delegate;
34+
}
35+
36+
public Object getDelegate() {
37+
return delegate;
38+
}
39+
40+
public void setDelegate(APPlatformController delegate) {
41+
this.delegate = delegate;
42+
}
43+
44+
@Override
45+
public InstanceDescription createInstance(ProvisioningSettings settings)
46+
throws APPlatformException {
47+
return delegate.createInstance(settings);
48+
}
49+
50+
@Override
51+
public InstanceStatus modifyInstance(String instanceId,
52+
ProvisioningSettings currentSettings,
53+
ProvisioningSettings newSettings) throws APPlatformException {
54+
return delegate.modifyInstance(instanceId, currentSettings,
55+
newSettings);
56+
}
57+
58+
@Override
59+
public InstanceStatus deleteInstance(String instanceId,
60+
ProvisioningSettings settings) throws APPlatformException {
61+
return delegate.deleteInstance(instanceId, settings);
62+
}
63+
64+
@Override
65+
public InstanceStatus getInstanceStatus(String instanceId,
66+
ProvisioningSettings settings) throws APPlatformException {
67+
return delegate.getInstanceStatus(instanceId, settings);
68+
}
69+
70+
@Override
71+
public InstanceStatus notifyInstance(String instanceId,
72+
ProvisioningSettings settings, Properties properties)
73+
throws APPlatformException {
74+
return delegate.notifyInstance(instanceId, settings, properties);
75+
}
76+
77+
@Override
78+
public InstanceStatus activateInstance(String instanceId,
79+
ProvisioningSettings settings) throws APPlatformException {
80+
return delegate.activateInstance(instanceId, settings);
81+
}
82+
83+
@Override
84+
public InstanceStatus deactivateInstance(String instanceId,
85+
ProvisioningSettings settings) throws APPlatformException {
86+
return delegate.deactivateInstance(instanceId, settings);
87+
}
88+
89+
@Override
90+
public InstanceStatusUsers createUsers(String instanceId,
91+
ProvisioningSettings settings, List<ServiceUser> users)
92+
throws APPlatformException {
93+
return delegate.createUsers(instanceId, settings, users);
94+
}
95+
96+
@Override
97+
public InstanceStatus deleteUsers(String instanceId,
98+
ProvisioningSettings settings, List<ServiceUser> users)
99+
throws APPlatformException {
100+
return delegate.deleteUsers(instanceId, settings, users);
101+
}
102+
103+
@Override
104+
public InstanceStatus updateUsers(String instanceId,
105+
ProvisioningSettings settings, List<ServiceUser> users)
106+
throws APPlatformException {
107+
return delegate.updateUsers(instanceId, settings, users);
108+
}
109+
110+
@Override
111+
public List<LocalizedText> getControllerStatus(ControllerSettings settings)
112+
throws APPlatformException {
113+
return delegate.getControllerStatus(settings);
114+
}
115+
116+
@Override
117+
public List<OperationParameter> getOperationParameters(String userId,
118+
String instanceId, String operationId,
119+
ProvisioningSettings settings) throws APPlatformException {
120+
return delegate.getOperationParameters(userId, instanceId, operationId,
121+
settings);
122+
}
123+
124+
@Override
125+
public InstanceStatus executeServiceOperation(String userId,
126+
String instanceId, String transactionId, String operationId,
127+
List<OperationParameter> parameters, ProvisioningSettings settings)
128+
throws APPlatformException {
129+
return delegate.executeServiceOperation(userId, instanceId,
130+
transactionId, operationId, parameters, settings);
131+
}
132+
133+
@Override
134+
public void setControllerSettings(ControllerSettings settings) {
135+
delegate.setControllerSettings(settings);
136+
}
137+
}

‎oscm-app/javasrc/org/oscm/app/business/APPlatformControllerFactory.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
import javax.naming.InitialContext;
88

9-
import org.slf4j.Logger;
10-
import org.slf4j.LoggerFactory;
11-
9+
import org.oscm.app.adapter.APPlatformControllerAdapter;
1210
import org.oscm.app.i18n.Messages;
1311
import org.oscm.app.v1_0.exceptions.ControllerLookupException;
1412
import org.oscm.app.v1_0.intf.APPlatformController;
13+
import org.slf4j.Logger;
14+
import org.slf4j.LoggerFactory;
1515

1616
public class APPlatformControllerFactory {
1717

@@ -31,7 +31,8 @@ public static APPlatformController getInstance(String controllerId)
3131
throw new ControllerLookupException(
3232
Messages.getAll("error_controller_lookup"));
3333
}
34-
return (APPlatformController) lookup;
34+
35+
return new APPlatformControllerAdapter((APPlatformController)lookup);
3536
} catch (Exception e) {
3637
logger.warn("Exception during controller lookup ["
3738
+ controllerFullId + "]", e);

0 commit comments

Comments
 (0)