Jian Li
Committed by Gerrit Code Review

Move all REST test related files into org.onosproject.rest.resources

Move all REST test case classes under org.onosproject.rest.resources
package in a way to improve naming consistency.

Change-Id: I0a154fe492b90aa426e6af38a3c08d7c1ee8d031
Showing 34 changed files with 20 additions and 22 deletions
...@@ -23,7 +23,7 @@ import org.onlab.osgi.TestServiceDirectory; ...@@ -23,7 +23,7 @@ import org.onlab.osgi.TestServiceDirectory;
23 import org.onlab.rest.BaseResource; 23 import org.onlab.rest.BaseResource;
24 import org.onosproject.codec.CodecService; 24 import org.onosproject.codec.CodecService;
25 import org.onosproject.codec.impl.CodecManager; 25 import org.onosproject.codec.impl.CodecManager;
26 -import org.onosproject.rest.ResourceTest; 26 +import org.onosproject.rest.resources.ResourceTest;
27 27
28 import javax.ws.rs.client.WebTarget; 28 import javax.ws.rs.client.WebTarget;
29 29
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.rest; 16 +package org.onosproject.rest.resources;
17 17
18 import com.eclipsesource.json.Json; 18 import com.eclipsesource.json.Json;
19 import com.eclipsesource.json.JsonArray; 19 import com.eclipsesource.json.JsonArray;
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.rest; 16 +package org.onosproject.rest.resources;
17 17
18 import org.junit.Test; 18 import org.junit.Test;
19 19
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.rest; 16 +package org.onosproject.rest.resources;
17 17
18 import com.google.common.collect.ImmutableSet; 18 import com.google.common.collect.ImmutableSet;
19 import org.junit.Before; 19 import org.junit.Before;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -package org.onosproject.rest; 17 +package org.onosproject.rest.resources;
18 18
19 import com.eclipsesource.json.Json; 19 import com.eclipsesource.json.Json;
20 import com.eclipsesource.json.JsonArray; 20 import com.eclipsesource.json.JsonArray;
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.rest; 16 +package org.onosproject.rest.resources;
17 17
18 import com.eclipsesource.json.Json; 18 import com.eclipsesource.json.Json;
19 import com.eclipsesource.json.JsonArray; 19 import com.eclipsesource.json.JsonArray;
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.rest; 16 +package org.onosproject.rest.resources;
17 17
18 import com.eclipsesource.json.Json; 18 import com.eclipsesource.json.Json;
19 import com.eclipsesource.json.JsonObject; 19 import com.eclipsesource.json.JsonObject;
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.rest; 16 +package org.onosproject.rest.resources;
17 17
18 import com.eclipsesource.json.Json; 18 import com.eclipsesource.json.Json;
19 import com.eclipsesource.json.JsonArray; 19 import com.eclipsesource.json.JsonArray;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -package org.onosproject.rest; 17 +package org.onosproject.rest.resources;
18 18
19 import com.eclipsesource.json.Json; 19 import com.eclipsesource.json.Json;
20 import com.eclipsesource.json.JsonArray; 20 import com.eclipsesource.json.JsonArray;
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.rest; 16 +package org.onosproject.rest.resources;
17 17
18 18
19 import com.eclipsesource.json.Json; 19 import com.eclipsesource.json.Json;
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.rest; 16 +package org.onosproject.rest.resources;
17 17
18 import com.eclipsesource.json.Json; 18 import com.eclipsesource.json.Json;
19 import com.eclipsesource.json.JsonArray; 19 import com.eclipsesource.json.JsonArray;
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.rest; 16 +package org.onosproject.rest.resources;
17 17
18 import com.eclipsesource.json.Json; 18 import com.eclipsesource.json.Json;
19 import com.eclipsesource.json.JsonArray; 19 import com.eclipsesource.json.JsonArray;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -package org.onosproject.rest; 17 +package org.onosproject.rest.resources;
18 18
19 import com.eclipsesource.json.Json; 19 import com.eclipsesource.json.Json;
20 import com.eclipsesource.json.JsonArray; 20 import com.eclipsesource.json.JsonArray;
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.rest; 16 +package org.onosproject.rest.resources;
17 17
18 import com.codahale.metrics.Counter; 18 import com.codahale.metrics.Counter;
19 import com.codahale.metrics.Meter; 19 import com.codahale.metrics.Meter;
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.rest; 16 +package org.onosproject.rest.resources;
17 17
18 import com.eclipsesource.json.Json; 18 import com.eclipsesource.json.Json;
19 import com.eclipsesource.json.JsonArray; 19 import com.eclipsesource.json.JsonArray;
......
...@@ -34,7 +34,6 @@ import org.onosproject.net.config.Config; ...@@ -34,7 +34,6 @@ import org.onosproject.net.config.Config;
34 import org.onosproject.net.config.NetworkConfigService; 34 import org.onosproject.net.config.NetworkConfigService;
35 import org.onosproject.net.config.NetworkConfigServiceAdapter; 35 import org.onosproject.net.config.NetworkConfigServiceAdapter;
36 import org.onosproject.net.config.SubjectFactory; 36 import org.onosproject.net.config.SubjectFactory;
37 -import org.onosproject.rest.ResourceTest;
38 37
39 import javax.ws.rs.NotFoundException; 38 import javax.ws.rs.NotFoundException;
40 import javax.ws.rs.client.WebTarget; 39 import javax.ws.rs.client.WebTarget;
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.rest; 16 +package org.onosproject.rest.resources;
17 17
18 import com.eclipsesource.json.Json; 18 import com.eclipsesource.json.Json;
19 import com.eclipsesource.json.JsonArray; 19 import com.eclipsesource.json.JsonArray;
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.rest; 16 +package org.onosproject.rest.resources;
17 17
18 import com.eclipsesource.json.Json; 18 import com.eclipsesource.json.Json;
19 import com.eclipsesource.json.JsonArray; 19 import com.eclipsesource.json.JsonArray;
......
...@@ -13,11 +13,10 @@ ...@@ -13,11 +13,10 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.rest; 16 +package org.onosproject.rest.resources;
17 17
18 import org.glassfish.jersey.server.ResourceConfig; 18 import org.glassfish.jersey.server.ResourceConfig;
19 import org.glassfish.jersey.test.JerseyTest; 19 import org.glassfish.jersey.test.JerseyTest;
20 -import org.onosproject.rest.resources.CoreWebApplication;
21 20
22 /** 21 /**
23 * Base class for REST API tests. Performs common configuration operations. 22 * Base class for REST API tests. Performs common configuration operations.
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.rest; 16 +package org.onosproject.rest.resources;
17 17
18 import com.eclipsesource.json.Json; 18 import com.eclipsesource.json.Json;
19 import com.eclipsesource.json.JsonArray; 19 import com.eclipsesource.json.JsonArray;
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.rest; 16 +package org.onosproject.rest.resources;
17 17
18 import com.eclipsesource.json.Json; 18 import com.eclipsesource.json.Json;
19 import com.eclipsesource.json.JsonArray; 19 import com.eclipsesource.json.JsonArray;
......