mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-04 19:56:49 +02:00
Code Issues Projects Releases Wiki Activity

Removed the setServiceDirectory() method from the base web resource

Browse Source 
This is a testing only API and potentially dangerous to allow to be public.
I modified the tests that use it to set the value using TestUtils.setField()

Change-Id: Ic590f4641f4e3de208dffa16b3df9a9a2106114b
This commit is contained in:
Ray Milkey 2018-01-22 14:03:54 -08:00 committed by Thomas Vachuska
parent 96b2640b27
commit 094a135ef5
45 changed files with 192 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/acl/src/test/java/org/onosproject/acl/AclWebResourceTest.java
View File

@ -27,6 +27,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.onlab.junit.TestUtils;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
@ -65,7 +66,7 @@ public class AclWebResourceTest extends JerseyTest {
ServiceDirectory testDirectory = new TestServiceDirectory()
.add(AclService.class, mockAclService)
.add(AclStore.class, mockAclStore);
BaseResource.setServiceDirectory(testDirectory);
TestUtils.setField(BaseResource.class, "services", testDirectory);
AclRule.idGenerator = new MockIdGenerator();
}

4
apps/cfm/src/test/java/org/onosproject/cfm/impl/MaWebResourceTest.java
View File

@ -22,7 +22,6 @@ import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.packet.VlanId;
import org.onlab.rest.BaseResource;
import org.onosproject.cfm.CfmCodecContext;
import org.onosproject.codec.CodecService;
import org.onosproject.incubator.net.l2monitoring.cfm.Component;
@ -43,7 +42,6 @@ import javax.ws.rs.InternalServerErrorException;
import javax.ws.rs.client.Entity;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.Response;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@ -72,7 +70,7 @@ public class MaWebResourceTest extends CfmResourceTest {
ServiceDirectory testDirectory = new TestServiceDirectory()
.add(CfmMdService.class, mdService)
.add(CodecService.class, context.codecManager());
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
ma1 = DefaultMaintenanceAssociation
.builder(MANAME1, MDNAME1.getNameLength())

3
apps/cfm/src/test/java/org/onosproject/cfm/impl/MdWebResourceTest.java
View File

@ -21,7 +21,6 @@ import org.junit.Before;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.cfm.CfmCodecContext;
import org.onosproject.codec.CodecService;
import org.onosproject.incubator.net.l2monitoring.cfm.DefaultMaintenanceDomain;
@ -65,7 +64,7 @@ public class MdWebResourceTest extends CfmResourceTest {
ServiceDirectory testDirectory = new TestServiceDirectory()
.add(CfmMdService.class, mdService)
.add(CodecService.class, context.codecManager());
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
mdList = new ArrayList<>();

3
apps/cfm/src/test/java/org/onosproject/cfm/impl/MepWebResourceTest.java
View File

@ -22,7 +22,6 @@ import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.packet.VlanId;
import org.onlab.rest.BaseResource;
import org.onosproject.cfm.CfmCodecContext;
import org.onosproject.codec.CodecService;
import org.onosproject.incubator.net.l2monitoring.cfm.DefaultMaintenanceAssociation;
@ -86,7 +85,7 @@ public class MepWebResourceTest extends CfmResourceTest {
.add(CfmMepService.class, mepService)
.add(CfmMdService.class, mdService)
.add(CodecService.class, context.codecManager());
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
mepEntry1 = DefaultMepEntry.builder(
MEPID1,

8
apps/cfm/src/test/java/org/onosproject/soam/impl/DmWebResourceTest.java
View File

@ -21,7 +21,6 @@ import org.junit.Before;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.cfm.CfmCodecContext;
import org.onosproject.cfm.impl.CfmResourceTest;
import org.onosproject.codec.CodecService;
@ -50,7 +49,6 @@ import javax.ws.rs.InternalServerErrorException;
import javax.ws.rs.client.Entity;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.Response;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@ -61,7 +59,9 @@ import java.util.ArrayList;
import java.util.List;
import static junit.framework.TestCase.fail;
import static org.easymock.EasyMock.*;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
@ -88,7 +88,7 @@ public class DmWebResourceTest extends CfmResourceTest {
.add(CfmMepService.class, mepService)
.add(SoamService.class, soamService)
.add(CodecService.class, context.codecManager());
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
DelayMeasurementStatCurrent.DmStatCurrentBuilder dmCurrBuilder1 =
(DelayMeasurementStatCurrent.DmStatCurrentBuilder)

3
apps/cfm/src/test/java/org/onosproject/soam/impl/LmWebResourceTest.java
View File

@ -21,7 +21,6 @@ import org.junit.Before;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.cfm.CfmCodecContext;
import org.onosproject.cfm.impl.CfmResourceTest;
import org.onosproject.codec.CodecService;
@ -87,7 +86,7 @@ public class LmWebResourceTest extends CfmResourceTest {
.add(CfmMepService.class, mepService)
.add(SoamService.class, soamService)
.add(CodecService.class, context.codecManager());
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
lm1 = DefaultLmEntry.builder(
DelayMeasurementCreate.Version.Y17312008,

3
apps/cpman/app/src/test/java/org/onosproject/cpman/rest/ControlMetricsCollectorResourceTest.java
View File

@ -32,7 +32,6 @@ import org.onlab.metrics.MetricsReporter;
import org.onlab.metrics.MetricsService;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.cpman.ControlPlaneMonitorService;
import org.onosproject.cpman.SystemInfo;
import org.onosproject.cpman.impl.SystemInfoFactory;
@ -86,7 +85,7 @@ public class ControlMetricsCollectorResourceTest extends ResourceTest {
new TestServiceDirectory()
.add(ControlPlaneMonitorService.class, mockControlPlaneMonitorService)
.add(MetricsService.class, mockMetricsService);
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}
/**

3
apps/cpman/app/src/test/java/org/onosproject/cpman/rest/ControlMetricsResourceTest.java
View File

@ -22,7 +22,6 @@ import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.packet.IpAddress;
import org.onlab.rest.BaseResource;
import org.onosproject.cluster.ClusterService;
import org.onosproject.cluster.ControllerNode;
import org.onosproject.cluster.NodeId;
@ -151,7 +150,7 @@ public class ControlMetricsResourceTest extends ResourceTest {
mockControlPlaneMonitorService)
.add(ClusterService.class, mockClusterService)
.add(CodecService.class, codecService);
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
nodeId = new NodeId("1");
mockControlLoad = new MockControlLoad();

3
apps/faultmanagement/fmweb/src/test/java/org/onosproject/faultmanagement/web/AlarmsWebResourceTest.java
View File

@ -20,7 +20,6 @@ import org.junit.Ignore;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.codec.CodecService;
import org.onosproject.codec.impl.CodecManager;
import org.onosproject.rest.resources.ResourceTest;
@ -48,7 +47,7 @@ public class AlarmsWebResourceTest extends ResourceTest {
// Currently no alarms-service implemented
// .add(AlarmsService.class, alarmsService)
.add(CodecService.class, codecService);
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}
@Test

3
apps/mappingmanagement/web/src/test/java/org/onosproject/mapping/web/MappingsWebResourceTest.java
View File

@ -30,7 +30,6 @@ import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.packet.IpPrefix;
import org.onlab.rest.BaseResource;
import org.onosproject.codec.CodecService;
import org.onosproject.codec.impl.CodecManager;
import org.onosproject.mapping.DefaultMappingKey;
@ -278,7 +277,7 @@ public class MappingsWebResourceTest extends ResourceTest {
.add(DeviceService.class, mockDeviceService)
.add(CodecService.class, codecService);
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}
/**

3
apps/ofagent/src/test/java/org/onosproject/ofagent/rest/OFAgentWebResourceTest.java
View File

@ -27,7 +27,6 @@ import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.packet.IpAddress;
import org.onlab.packet.TpPort;
import org.onlab.rest.BaseResource;
import org.onosproject.incubator.net.virtual.NetworkId;
import org.onosproject.incubator.net.virtual.TenantId;
import org.onosproject.ofagent.api.OFAgent;
@ -141,7 +140,7 @@ public class OFAgentWebResourceTest extends ResourceTest {
ServiceDirectory testDirectory = new TestServiceDirectory()
.add(OFAgentAdminService.class, mockOFAgentAdminService)
.add(OFAgentService.class, mockOFAgentService);
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}
/**

31
apps/pce/app/src/test/java/org/onosproject/pce/pceservice/DefaultPcePathTest.java
View File

@ -17,21 +17,8 @@
package org.onosproject.pce.pceservice;
import com.google.common.collect.Lists;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.onosproject.pce.pceservice.PathComputationTest.D2;
import static org.easymock.EasyMock.createMock;
import com.google.common.testing.EqualsTester;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.junit.Test;
import org.onosproject.incubator.net.tunnel.TunnelId;
import org.onosproject.pce.pceservice.constraint.CostConstraint;
import org.onosproject.pce.pceservice.constraint.PceBandwidthConstraint;
@ -39,23 +26,17 @@ import org.onosproject.pce.pcestore.api.PceStore;
import java.util.List;
import static org.easymock.EasyMock.createMock;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.onosproject.pce.pceservice.PathComputationTest.D2;
/**
* Unit tests for DefaultPcePath class.
*/
public class DefaultPcePathTest {
private PceStore pceStore = createMock(PceStore.class);
@Before
public void setup() {
ServiceDirectory testDirectory = new TestServiceDirectory()
.add(PceStore.class, pceStore);
BaseResource.setServiceDirectory(testDirectory);
}
@After
public void tearDownTest() {
}
/**
* Checks the operation of equals() methods.
*/

3
apps/pce/pcerest/src/test/java/org/onosproject/pcerest/PcePathResourceTest.java
View File

@ -44,6 +44,7 @@ import com.google.common.collect.Lists;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.onlab.junit.TestUtils;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.packet.IpAddress;
@ -109,7 +110,7 @@ public class PcePathResourceTest extends PceResourceTest {
.add(TunnelService.class, tunnelService)
.add(PceStore.class, pceStore)
.add(CodecService.class, context.codecManager());
BaseResource.setServiceDirectory(testDirectory);
TestUtils.setField(BaseResource.class, "services", testDirectory);
// Tunnel creation
// Links

3
apps/vtn/vtnweb/src/test/java/org/onosproject/vtnweb/resources/ClassifierResourceTest.java
View File

@ -23,7 +23,6 @@ import org.junit.Before;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.codec.CodecService;
import org.onosproject.net.Device;
import org.onosproject.net.DeviceId;
@ -57,7 +56,7 @@ public class ClassifierResourceTest extends VtnResourceTest {
SfcCodecContext context = new SfcCodecContext();
ServiceDirectory testDirectory = new TestServiceDirectory().add(ClassifierService.class, classifierService)
.add(CodecService.class, context.codecManager());
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}

3
apps/vtn/vtnweb/src/test/java/org/onosproject/vtnweb/resources/FlowClassifierResourceTest.java
View File

@ -23,7 +23,6 @@ import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.packet.IpPrefix;
import org.onlab.rest.BaseResource;
import org.onosproject.codec.CodecService;
import org.onosproject.vtnrsc.FlowClassifier;
import org.onosproject.vtnrsc.FlowClassifierId;
@ -208,7 +207,7 @@ public class FlowClassifierResourceTest extends VtnResourceTest {
ServiceDirectory testDirectory = new TestServiceDirectory()
.add(FlowClassifierService.class, flowClassifierService)
.add(CodecService.class, context.codecManager());
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}

39
apps/vtn/vtnweb/src/test/java/org/onosproject/vtnweb/resources/PortChainDeviceMapResourceTest.java
View File

@ -15,27 +15,15 @@
*/
package org.onosproject.vtnweb.resources;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.junit.Assert.assertThat;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import javax.ws.rs.client.WebTarget;
import com.eclipsesource.json.Json;
import com.eclipsesource.json.JsonObject;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.codec.CodecService;
import org.onosproject.net.DeviceId;
import org.onosproject.vtnrsc.FiveTuple;
@ -49,10 +37,19 @@ import org.onosproject.vtnrsc.TenantId;
import org.onosproject.vtnrsc.portchain.PortChainService;
import org.onosproject.vtnweb.web.SfcCodecContext;
import com.eclipsesource.json.Json;
import com.eclipsesource.json.JsonObject;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import javax.ws.rs.client.WebTarget;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.junit.Assert.assertThat;
/**
* Unit tests for port chain device map REST APIs.
@ -223,7 +220,7 @@ public class PortChainDeviceMapResourceTest extends VtnResourceTest {
ServiceDirectory testDirectory = new TestServiceDirectory()
.add(PortChainService.class, portChainService)
.add(CodecService.class, context.codecManager());
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}
/**

55
apps/vtn/vtnweb/src/test/java/org/onosproject/vtnweb/resources/PortChainResourceTest.java
View File

@ -15,35 +15,15 @@
*/
package org.onosproject.vtnweb.resources;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import javax.ws.rs.NotFoundException;
import javax.ws.rs.client.Entity;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import com.eclipsesource.json.Json;
import com.eclipsesource.json.JsonObject;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.codec.CodecService;
import org.onosproject.net.DeviceId;
import org.onosproject.vtnrsc.FiveTuple;
@ -57,10 +37,27 @@ import org.onosproject.vtnrsc.TenantId;
import org.onosproject.vtnrsc.portchain.PortChainService;
import org.onosproject.vtnweb.web.SfcCodecContext;
import com.eclipsesource.json.Json;
import com.eclipsesource.json.JsonObject;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import javax.ws.rs.NotFoundException;
import javax.ws.rs.client.Entity;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
/**
* Unit tests for port chain REST APIs.
@ -221,7 +218,7 @@ public class PortChainResourceTest extends VtnResourceTest {
ServiceDirectory testDirectory = new TestServiceDirectory()
.add(PortChainService.class, portChainService)
.add(CodecService.class, context.codecManager());
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}

43
apps/vtn/vtnweb/src/test/java/org/onosproject/vtnweb/resources/PortChainSfMapResourceTest.java
View File

@ -15,6 +15,25 @@
*/
package org.onosproject.vtnweb.resources;
import com.eclipsesource.json.Json;
import com.eclipsesource.json.JsonObject;
import com.google.common.collect.Lists;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onosproject.codec.CodecService;
import org.onosproject.vtnrsc.PortPairId;
import org.onosproject.vtnrsc.ServiceFunctionGroup;
import org.onosproject.vtnrsc.portchainsfmap.PortChainSfMapService;
import org.onosproject.vtnweb.web.SfcCodecContext;
import javax.ws.rs.client.WebTarget;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
@ -23,28 +42,6 @@ import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.junit.Assert.assertThat;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import javax.ws.rs.client.WebTarget;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.codec.CodecService;
import org.onosproject.vtnrsc.PortPairId;
import org.onosproject.vtnrsc.ServiceFunctionGroup;
import org.onosproject.vtnrsc.portchainsfmap.PortChainSfMapService;
import org.onosproject.vtnweb.web.SfcCodecContext;
import com.eclipsesource.json.Json;
import com.eclipsesource.json.JsonObject;
import com.google.common.collect.Lists;
/**
* Unit tests for port chain sf map REST APIs.
*/
@ -68,7 +65,7 @@ public class PortChainSfMapResourceTest extends VtnResourceTest {
ServiceDirectory testDirectory = new TestServiceDirectory()
.add(PortChainSfMapService.class, portChainSfMapService)
.add(CodecService.class, context.codecManager());
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}
/**

5
apps/vtn/vtnweb/src/test/java/org/onosproject/vtnweb/resources/PortPairGroupResourceTest.java
View File

@ -19,13 +19,11 @@ import com.eclipsesource.json.Json;
import com.eclipsesource.json.JsonObject;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import java.util.Map;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.codec.CodecService;
import org.onosproject.vtnrsc.PortPairGroup;
import org.onosproject.vtnrsc.PortPairGroupId;
@ -43,6 +41,7 @@ import java.io.InputStream;
import java.net.HttpURLConnection;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
@ -151,7 +150,7 @@ public class PortPairGroupResourceTest extends VtnResourceTest {
ServiceDirectory testDirectory = new TestServiceDirectory()
.add(PortPairGroupService.class, portPairGroupService)
.add(CodecService.class, context.codecManager());
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}

3
apps/vtn/vtnweb/src/test/java/org/onosproject/vtnweb/resources/PortPairResourceTest.java
View File

@ -22,7 +22,6 @@ import org.junit.Before;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.codec.CodecService;
import org.onosproject.vtnrsc.PortPair;
import org.onosproject.vtnrsc.PortPairId;
@ -135,7 +134,7 @@ public class PortPairResourceTest extends VtnResourceTest {
SfcCodecContext context = new SfcCodecContext();
ServiceDirectory testDirectory = new TestServiceDirectory().add(PortPairService.class, portPairService)
.add(CodecService.class, context.codecManager());
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}

7
incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkIntentManagerTest.java
View File

@ -25,7 +25,6 @@ import org.junit.Test;
import org.onlab.junit.TestUtils;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.TestApplicationId;
import org.onosproject.common.event.impl.TestEventDispatcher;
import org.onosproject.core.ApplicationId;
@ -76,7 +75,10 @@ import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
/**
* Junit tests for VirtualNetworkIntentService.
@ -149,7 +151,6 @@ public class VirtualNetworkIntentManagerTest extends TestDeviceParams {
.add(VirtualNetworkStore.class, virtualNetworkManagerStore)
.add(IntentService.class, intentService)
.add(WorkPartitionService.class, workPartitionService);
BaseResource.setServiceDirectory(testDirectory);
TestUtils.setField(manager, "serviceDirectory", testDirectory);
manager.activate();

6
incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkTopologyManagerTest.java
View File

@ -21,7 +21,6 @@ import org.junit.Before;
import org.junit.Test;
import org.onlab.junit.TestUtils;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.common.event.impl.TestEventDispatcher;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
@ -55,7 +54,9 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
import static junit.framework.TestCase.assertTrue;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
/**
* Junit tests for VirtualNetworkTopologyService.
@ -77,7 +78,6 @@ public class VirtualNetworkTopologyManagerTest extends TestDeviceParams {
TestUtils.setField(virtualNetworkManagerStore, "storageService", new TestStorageService());
virtualNetworkManagerStore.activate();
BaseResource.setServiceDirectory(testDirectory);
manager = new VirtualNetworkManager();
manager.store = virtualNetworkManagerStore;
manager.coreService = coreService;

12
utils/rest/src/main/java/org/onlab/rest/BaseResource.java
View File

@ -27,18 +27,6 @@ public abstract class BaseResource {
private static ServiceDirectory services = new DefaultServiceDirectory();
/**
* Sets alternate service directory to be used for lookups.
* <p>
* Intended to ease unit testing and not intended for use in production.
* </p>
*
* @param serviceDirectory alternate service directory
*/
public static void setServiceDirectory(ServiceDirectory serviceDirectory) {
services = serviceDirectory;
}
/**
* Returns reference to the specified service implementation.
*

3
web/api/src/test/java/org/onosproject/rest/resources/ApplicationsResourceTest.java
View File

@ -27,7 +27,6 @@ import org.junit.Before;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.app.ApplicationAdminService;
import org.onosproject.app.ApplicationService;
import org.onosproject.app.ApplicationState;
@ -295,7 +294,7 @@ public class ApplicationsResourceTest extends ResourceTest {
.add(CoreService.class, coreService)
.add(CodecService.class, codecService);
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}
/**

3
web/api/src/test/java/org/onosproject/rest/resources/ComponentConfigWebResourceTest.java
View File

@ -20,7 +20,6 @@ import org.junit.Before;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.cfg.ComponentConfigAdapter;
import org.onosproject.cfg.ComponentConfigService;
import org.onosproject.cfg.ConfigProperty;
@ -51,7 +50,7 @@ public class ComponentConfigWebResourceTest extends ResourceTest {
ServiceDirectory testDirectory =
new TestServiceDirectory()
.add(ComponentConfigService.class, service);
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}
@Test

3
web/api/src/test/java/org/onosproject/rest/resources/DeviceKeyWebResourceTest.java
View File

@ -26,7 +26,6 @@ import org.junit.Before;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.codec.CodecService;
import org.onosproject.codec.impl.CodecManager;
import org.onosproject.net.key.DeviceKey;
@ -109,7 +108,7 @@ public class DeviceKeyWebResourceTest extends ResourceTest {
.add(DeviceKeyAdminService.class, mockDeviceKeyAdminService)
.add(CodecService.class, codecService);
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}
/**

8
web/api/src/test/java/org/onosproject/rest/resources/DevicesResourceTest.java
View File

@ -27,7 +27,6 @@ import org.junit.Before;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.codec.CodecService;
import org.onosproject.codec.impl.CodecManager;
import org.onosproject.net.DefaultPort;
@ -36,16 +35,15 @@ import org.onosproject.net.DeviceId;
import org.onosproject.net.MastershipRole;
import org.onosproject.net.Port;
import org.onosproject.net.device.DeviceService;
import org.onosproject.net.driver.DriverService;
import org.onosproject.net.driver.DefaultDriver;
import org.onosproject.net.driver.TestBehaviourImpl;
import org.onosproject.net.driver.DriverService;
import org.onosproject.net.driver.TestBehaviour;
import org.onosproject.net.driver.TestBehaviourImpl;
import org.onosproject.net.driver.TestBehaviourTwo;
import org.onosproject.net.driver.TestBehaviourTwoImpl;
import javax.ws.rs.NotFoundException;
import javax.ws.rs.client.WebTarget;
import java.util.ArrayList;
import java.util.List;
@ -247,7 +245,7 @@ public class DevicesResourceTest extends ResourceTest {
.add(DriverService.class, mockDriverService)
.add(CodecService.class, codecService);
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}
/**

3
web/api/src/test/java/org/onosproject/rest/resources/FlowObjectiveResourceTest.java
View File

@ -23,7 +23,6 @@ import org.junit.Before;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.codec.CodecService;
import org.onosproject.codec.impl.CodecManager;
import org.onosproject.core.CoreService;
@ -79,7 +78,7 @@ public class FlowObjectiveResourceTest extends ResourceTest {
.add(CodecService.class, codecService)
.add(CoreService.class, mockCoreService);
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}
/**

35
web/api/src/test/java/org/onosproject/rest/resources/FlowsResourceTest.java
View File

@ -15,19 +15,10 @@
*/
package org.onosproject.rest.resources;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import javax.ws.rs.NotFoundException;
import javax.ws.rs.client.Entity;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import com.eclipsesource.json.Json;
import com.eclipsesource.json.JsonArray;
import com.eclipsesource.json.JsonObject;
import com.google.common.collect.ImmutableSet;
import org.hamcrest.Description;
import org.hamcrest.Matchers;
import org.hamcrest.TypeSafeMatcher;
@ -37,7 +28,6 @@ import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.packet.MacAddress;
import org.onlab.rest.BaseResource;
import org.onosproject.app.ApplicationService;
import org.onosproject.codec.CodecService;
import org.onosproject.codec.impl.CodecManager;
@ -61,10 +51,17 @@ import org.onosproject.net.flow.TrafficTreatment;
import org.onosproject.net.flow.criteria.Criterion;
import org.onosproject.net.flow.instructions.Instruction;
import com.eclipsesource.json.Json;
import com.eclipsesource.json.JsonArray;
import com.eclipsesource.json.JsonObject;
import com.google.common.collect.ImmutableSet;
import javax.ws.rs.NotFoundException;
import javax.ws.rs.client.Entity;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.easymock.EasyMock.anyObject;
@ -276,7 +273,7 @@ public class FlowsResourceTest extends ResourceTest {
.add(CoreService.class, mockCoreService)
.add(ApplicationService.class, mockApplicationService);
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}
/**

3
web/api/src/test/java/org/onosproject/rest/resources/GroupsResourceTest.java
View File

@ -28,7 +28,6 @@ import org.junit.Before;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.codec.CodecService;
import org.onosproject.codec.impl.CodecManager;
import org.onosproject.codec.impl.GroupCodec;
@ -241,7 +240,7 @@ public class GroupsResourceTest extends ResourceTest {
.add(CodecService.class, codecService)
.add(CoreService.class, mockCoreService);
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}
/**

3
web/api/src/test/java/org/onosproject/rest/resources/HostResourceTest.java
View File

@ -31,7 +31,6 @@ import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.packet.IpAddress;
import org.onlab.packet.MacAddress;
import org.onlab.rest.BaseResource;
import org.onosproject.codec.CodecService;
import org.onosproject.codec.impl.CodecManager;
import org.onosproject.net.DefaultHost;
@ -99,7 +98,7 @@ public class HostResourceTest extends ResourceTest {
.add(HostAdminService.class, mockHostService)
.add(CodecService.class, codecService)
.add(HostProviderRegistry.class, mockHostProviderRegistry);
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}
/**

3
web/api/src/test/java/org/onosproject/rest/resources/IntentsResourceTest.java
View File

@ -29,7 +29,6 @@ import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.packet.MacAddress;
import org.onlab.rest.BaseResource;
import org.onosproject.codec.CodecService;
import org.onosproject.codec.impl.CodecManager;
import org.onosproject.codec.impl.MockCodecContext;
@ -746,7 +745,7 @@ public class IntentsResourceTest extends ResourceTest {
.add(CodecService.class, codecService)
.add(CoreService.class, mockCoreService);
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
MockIdGenerator.cleanBind();
}

3
web/api/src/test/java/org/onosproject/rest/resources/LinksResourceTest.java
View File

@ -27,7 +27,6 @@ import org.junit.Before;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.codec.CodecService;
import org.onosproject.codec.impl.CodecManager;
import org.onosproject.net.ConnectPoint;
@ -162,7 +161,7 @@ public class LinksResourceTest extends ResourceTest {
.add(LinkService.class, mockLinkService)
.add(CodecService.class, codecService);
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}
/**

3
web/api/src/test/java/org/onosproject/rest/resources/MastershipResourceTest.java
View File

@ -28,7 +28,6 @@ import org.junit.Before;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.cluster.NodeId;
import org.onosproject.cluster.RoleInfo;
import org.onosproject.codec.CodecService;
@ -170,7 +169,7 @@ public final class MastershipResourceTest extends ResourceTest {
.add(DeviceService.class, mockDeviceService)
.add(CodecService.class, codecService);
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}
/**

3
web/api/src/test/java/org/onosproject/rest/resources/MetersResourceTest.java
View File

@ -28,7 +28,6 @@ import org.junit.Before;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.codec.CodecService;
import org.onosproject.codec.impl.CodecManager;
import org.onosproject.codec.impl.MeterCodec;
@ -239,7 +238,7 @@ public class MetersResourceTest extends ResourceTest {
.add(CodecService.class, codecService)
.add(CoreService.class, mockCoreService);
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}
/**

3
web/api/src/test/java/org/onosproject/rest/resources/MetricsResourceTest.java
View File

@ -31,7 +31,6 @@ import org.junit.Test;
import org.onlab.metrics.MetricsService;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.codec.CodecService;
import org.onosproject.codec.impl.CodecManager;
@ -68,7 +67,7 @@ public class MetricsResourceTest extends ResourceTest {
new TestServiceDirectory()
.add(MetricsService.class, mockMetricsService)
.add(CodecService.class, codecService);
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}
/**

3
web/api/src/test/java/org/onosproject/rest/resources/MulticastRouteResourceTest.java
View File

@ -27,7 +27,6 @@ import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.packet.IpAddress;
import org.onlab.rest.BaseResource;
import org.onosproject.codec.CodecService;
import org.onosproject.codec.impl.CodecManager;
import org.onosproject.net.mcast.McastRoute;
@ -85,7 +84,7 @@ public class MulticastRouteResourceTest extends ResourceTest {
new TestServiceDirectory()
.add(MulticastRouteService.class, mockMulticastRouteService)
.add(CodecService.class, codecService);
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}
/**

35
web/api/src/test/java/org/onosproject/rest/resources/NetworkConfigWebResourceTest.java
View File

@ -15,24 +15,18 @@
*/
package org.onosproject.rest.resources;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.util.HashSet;
import java.util.Set;
import javax.ws.rs.NotFoundException;
import javax.ws.rs.client.Entity;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import com.eclipsesource.json.Json;
import com.eclipsesource.json.JsonObject;
import com.eclipsesource.json.JsonValue;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableSet;
import org.eclipse.jetty.http.HttpStatus;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.net.DefaultDevice;
import org.onosproject.net.Device;
import org.onosproject.net.Link;
@ -41,12 +35,15 @@ import org.onosproject.net.config.NetworkConfigService;
import org.onosproject.net.config.NetworkConfigServiceAdapter;
import org.onosproject.net.config.SubjectFactory;
import com.eclipsesource.json.Json;
import com.eclipsesource.json.JsonObject;
import com.eclipsesource.json.JsonValue;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableSet;
import javax.ws.rs.NotFoundException;
import javax.ws.rs.client.Entity;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.util.HashSet;
import java.util.Set;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.replay;
@ -204,7 +201,7 @@ public class NetworkConfigWebResourceTest extends ResourceTest {
ServiceDirectory testDirectory =
new TestServiceDirectory()
.add(NetworkConfigService.class, mockNetworkConfigService);
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}
/**

3
web/api/src/test/java/org/onosproject/rest/resources/PathsResourceTest.java
View File

@ -26,7 +26,6 @@ import org.junit.Before;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.codec.CodecService;
import org.onosproject.codec.impl.CodecManager;
import org.onosproject.net.ElementId;
@ -143,7 +142,7 @@ public class PathsResourceTest extends ResourceTest {
.add(PathService.class, mockPathService)
.add(CodecService.class, codecService);
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}
/**

3
web/api/src/test/java/org/onosproject/rest/resources/RegionsResourceTest.java
View File

@ -28,7 +28,6 @@ import org.junit.Before;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.cluster.NodeId;
import org.onosproject.codec.CodecService;
import org.onosproject.codec.impl.CodecManager;
@ -142,7 +141,7 @@ public class RegionsResourceTest extends ResourceTest {
.add(RegionService.class, mockRegionService)
.add(RegionAdminService.class, mockRegionAdminService)
.add(CodecService.class, codecService);
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}
/**

12
web/api/src/test/java/org/onosproject/rest/resources/ResourceTest.java
View File

@ -21,6 +21,9 @@ import org.glassfish.jersey.test.TestProperties;
import org.glassfish.jersey.test.jetty.JettyTestContainerFactory;
import org.glassfish.jersey.test.spi.TestContainerException;
import org.glassfish.jersey.test.spi.TestContainerFactory;
import org.onlab.junit.TestUtils;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.rest.BaseResource;
/**
* Base class for REST API tests.
@ -58,4 +61,13 @@ public class ResourceTest extends JerseyTest {
protected TestContainerFactory getTestContainerFactory() throws TestContainerException {
return new JettyTestContainerFactory();
}
/**
* Sets up the test services directory in the base resource environment.
*
* @param testDirectory new test directory
*/
protected void setServiceDirectory(ServiceDirectory testDirectory) {
TestUtils.setField(BaseResource.class, "services", testDirectory);
}
}

3
web/api/src/test/java/org/onosproject/rest/resources/StatisticsResourceTest.java
View File

@ -24,7 +24,6 @@ import org.junit.Before;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.codec.CodecService;
import org.onosproject.codec.impl.CodecManager;
import org.onosproject.net.Link;
@ -92,7 +91,7 @@ public class StatisticsResourceTest extends ResourceTest {
.add(StatisticService.class, mockStatisticService)
.add(CodecService.class, codecService);
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}
/**

19
web/api/src/test/java/org/onosproject/rest/resources/TenantWebResourceTest.java
View File

@ -28,7 +28,6 @@ import org.junit.Before;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.codec.CodecService;
import org.onosproject.codec.impl.CodecManager;
import org.onosproject.incubator.net.virtual.TenantId;
@ -44,9 +43,19 @@ import java.io.InputStream;
import java.net.HttpURLConnection;
import java.util.HashSet;
import static org.easymock.EasyMock.*;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
/**
* Unit tests for tenant REST APIs.
@ -77,7 +86,7 @@ public class TenantWebResourceTest extends ResourceTest {
.add(VirtualNetworkAdminService.class, mockVnetAdminService)
.add(CodecService.class, codecService);
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}
/**

11
web/api/src/test/java/org/onosproject/rest/resources/TopologyResourceTest.java
View File

@ -23,16 +23,15 @@ import org.junit.Before;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.codec.CodecService;
import org.onosproject.codec.impl.CodecManager;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DefaultPort;
import org.onosproject.net.Device;
import org.onosproject.net.DeviceId;
import org.onosproject.net.Link;
import org.onosproject.net.Device;
import org.onosproject.net.PortNumber;
import org.onosproject.net.DefaultPort;
import org.onosproject.net.Port;
import org.onosproject.net.PortNumber;
import org.onosproject.net.device.DeviceService;
import org.onosproject.net.device.DeviceServiceAdapter;
import org.onosproject.net.provider.ProviderId;
@ -43,8 +42,10 @@ import org.onosproject.net.topology.Topology;
import org.onosproject.net.topology.TopologyCluster;
import org.onosproject.net.topology.TopologyService;
import org.onosproject.net.topology.TopologyServiceAdapter;
import javax.ws.rs.client.WebTarget;
import java.util.Set;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
@ -183,7 +184,7 @@ public class TopologyResourceTest extends ResourceTest {
.add(DeviceService.class, mockDeviceService)
.add(TopologyService.class, topologyService)
.add(CodecService.class, codecService);
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}
/**

15
web/api/src/test/java/org/onosproject/rest/resources/VirtualNetworkWebResourceTest.java
View File

@ -33,7 +33,6 @@ import org.onlab.osgi.TestServiceDirectory;
import org.onlab.packet.IpAddress;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
import org.onlab.rest.BaseResource;
import org.onosproject.codec.CodecService;
import org.onosproject.codec.impl.CodecManager;
import org.onosproject.incubator.net.virtual.DefaultVirtualDevice;
@ -75,8 +74,16 @@ import java.util.function.BiFunction;
import java.util.function.BiPredicate;
import java.util.function.Function;
import static org.easymock.EasyMock.*;
import static org.hamcrest.Matchers.*;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
@ -187,7 +194,7 @@ public class VirtualNetworkWebResourceTest extends ResourceTest {
.add(VirtualNetworkService.class, mockVnetService)
.add(CodecService.class, codecService);
BaseResource.setServiceDirectory(testDirectory);
setServiceDirectory(testDirectory);
}
/**