commit 094a135ef58243bdb809c458f8e3a7ef26af019a
author Ray Milkey <ray@opennetworking.org> Mon Jan 22 14:03:54 2018 -0800
committer Thomas Vachuska <tom@opennetworking.org> Thu Jan 25 01:16:03 2018 +0000
tree 869dabb3a1a590de7ee975925c4db7b7426b27de
parent 96b2640b27be2feaf36eaeb0e963464b4cd7283f

Removed the setServiceDirectory() method from the base web resource

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

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

diff --git a/web/api/src/test/java/org/onosproject/rest/resources/TenantWebResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/TenantWebResourceTest.java
index 69bd45b..781cfae 100644
--- a/web/api/src/test/java/org/onosproject/rest/resources/TenantWebResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/TenantWebResourceTest.java
@@ -28,7 +28,6 @@
 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.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 @@
                         .add(VirtualNetworkAdminService.class, mockVnetAdminService)
                         .add(CodecService.class, codecService);
 
-        BaseResource.setServiceDirectory(testDirectory);
+        setServiceDirectory(testDirectory);
     }
 
     /**