홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ray Milkey
6c1bac3c 1 parent 914c7ad3

Rename unit tests to be in the same package as the class under test. 

Change-Id: Ia7b46e1739a25767637399ba077deca4f0ffc90b
Inline Side-by-side
Showing 23 changed files with 126 additions and 181 deletions
...@@ -14,20 +14,19 @@ ...@@ -14,20 +14,19 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -package org.onosproject.vtnrsc.virtualport; 17 +package org.onosproject.vtnrsc;
18 -
19 -import static org.hamcrest.MatcherAssert.assertThat;
20 -import static org.hamcrest.Matchers.is;
21 -import static org.hamcrest.Matchers.notNullValue;
22 -import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
23 18
24 import org.junit.Test; 19 import org.junit.Test;
25 import org.onlab.packet.IpAddress; 20 import org.onlab.packet.IpAddress;
26 import org.onlab.packet.MacAddress; 21 import org.onlab.packet.MacAddress;
27 -import org.onosproject.vtnrsc.AllowedAddressPair;
28 22
29 import com.google.common.testing.EqualsTester; 23 import com.google.common.testing.EqualsTester;
30 24
25 +import static org.hamcrest.MatcherAssert.assertThat;
26 +import static org.hamcrest.Matchers.is;
27 +import static org.hamcrest.Matchers.notNullValue;
28 +import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
29 +
31 /** 30 /**
32 * Unit tests for AllowedAddressPair class. 31 * Unit tests for AllowedAddressPair class.
33 */ 32 */
......
...@@ -13,19 +13,17 @@ ...@@ -13,19 +13,17 @@
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.vtnrsc.subnet; 16 +package org.onosproject.vtnrsc;
17 -
18 -import static org.hamcrest.MatcherAssert.assertThat;
19 -import static org.hamcrest.Matchers.is;
20 -import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
21 17
22 import org.junit.Test; 18 import org.junit.Test;
23 import org.onlab.packet.IpAddress; 19 import org.onlab.packet.IpAddress;
24 -import org.onosproject.vtnrsc.AllocationPool;
25 -import org.onosproject.vtnrsc.DefaultAllocationPool;
26 20
27 import com.google.common.testing.EqualsTester; 21 import com.google.common.testing.EqualsTester;
28 22
23 +import static org.hamcrest.MatcherAssert.assertThat;
24 +import static org.hamcrest.Matchers.is;
25 +import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
26 +
29 /** 27 /**
30 * Unit tests for DefaultAllocationPool class. 28 * Unit tests for DefaultAllocationPool class.
31 */ 29 */
......
...@@ -13,22 +13,17 @@ ...@@ -13,22 +13,17 @@
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.vtnrsc.flowclassifier; 16 +package org.onosproject.vtnrsc;
17 -
18 -import static org.hamcrest.MatcherAssert.assertThat;
19 -import static org.hamcrest.Matchers.is;
20 -import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
21 17
22 import org.junit.Test; 18 import org.junit.Test;
23 import org.onlab.packet.IpPrefix; 19 import org.onlab.packet.IpPrefix;
24 -import org.onosproject.vtnrsc.TenantId;
25 -import org.onosproject.vtnrsc.DefaultFlowClassifier;
26 -import org.onosproject.vtnrsc.FlowClassifierId;
27 -import org.onosproject.vtnrsc.VirtualPortId;
28 -import org.onosproject.vtnrsc.FlowClassifier;
29 20
30 import com.google.common.testing.EqualsTester; 21 import com.google.common.testing.EqualsTester;
31 22
23 +import static org.hamcrest.MatcherAssert.assertThat;
24 +import static org.hamcrest.Matchers.is;
25 +import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
26 +
32 /** 27 /**
33 * Unit tests for DefaultFlowClassifier class. 28 * Unit tests for DefaultFlowClassifier class.
34 */ 29 */
......
...@@ -13,20 +13,18 @@ ...@@ -13,20 +13,18 @@
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.vtnrsc.subnet; 16 +package org.onosproject.vtnrsc;
17 -
18 -import static org.hamcrest.MatcherAssert.assertThat;
19 -import static org.hamcrest.Matchers.is;
20 -import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
21 17
22 import org.junit.Test; 18 import org.junit.Test;
23 import org.onlab.packet.IpAddress; 19 import org.onlab.packet.IpAddress;
24 import org.onlab.packet.IpPrefix; 20 import org.onlab.packet.IpPrefix;
25 -import org.onosproject.vtnrsc.DefaultHostRoute;
26 -import org.onosproject.vtnrsc.HostRoute;
27 21
28 import com.google.common.testing.EqualsTester; 22 import com.google.common.testing.EqualsTester;
29 23
24 +import static org.hamcrest.MatcherAssert.assertThat;
25 +import static org.hamcrest.Matchers.is;
26 +import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
27 +
30 /** 28 /**
31 * Unit tests for DefaultHostRoute class. 29 * Unit tests for DefaultHostRoute class.
32 */ 30 */
......
...@@ -13,20 +13,14 @@ ...@@ -13,20 +13,14 @@
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.vtnrsc.tenantnetwork; 16 +package org.onosproject.vtnrsc;
17 -
18 -import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
19 17
20 import org.junit.Test; 18 import org.junit.Test;
21 -import org.onosproject.vtnrsc.DefaultTenantNetwork;
22 -import org.onosproject.vtnrsc.PhysicalNetwork;
23 -import org.onosproject.vtnrsc.SegmentationId;
24 -import org.onosproject.vtnrsc.TenantId;
25 -import org.onosproject.vtnrsc.TenantNetwork;
26 -import org.onosproject.vtnrsc.TenantNetworkId;
27 19
28 import com.google.common.testing.EqualsTester; 20 import com.google.common.testing.EqualsTester;
29 21
22 +import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
23 +
30 /** 24 /**
31 * Unit tests for DefaultNeutronNetwork class. 25 * Unit tests for DefaultNeutronNetwork class.
32 */ 26 */
......
...@@ -13,25 +13,19 @@ ...@@ -13,25 +13,19 @@
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.vtnrsc.flowclassifier; 16 +package org.onosproject.vtnrsc;
17 17
18 -import static org.hamcrest.MatcherAssert.assertThat;
19 -import static org.hamcrest.Matchers.is;
20 -import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
21 -
22 -import org.junit.Test;
23 -import java.util.List;
24 import java.util.LinkedList; 18 import java.util.LinkedList;
19 +import java.util.List;
25 20
26 -import org.onosproject.vtnrsc.PortChainId; 21 +import org.junit.Test;
27 -import org.onosproject.vtnrsc.PortPairGroupId;
28 -import org.onosproject.vtnrsc.TenantId;
29 -import org.onosproject.vtnrsc.FlowClassifierId;
30 -import org.onosproject.vtnrsc.PortChain;
31 -import org.onosproject.vtnrsc.DefaultPortChain;
32 22
33 import com.google.common.testing.EqualsTester; 23 import com.google.common.testing.EqualsTester;
34 24
25 +import static org.hamcrest.MatcherAssert.assertThat;
26 +import static org.hamcrest.Matchers.is;
27 +import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
28 +
35 /** 29 /**
36 * Unit tests for DefaultPortChain class. 30 * Unit tests for DefaultPortChain class.
37 */ 31 */
......
...@@ -13,24 +13,19 @@ ...@@ -13,24 +13,19 @@
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.vtnrsc.flowclassifier; 16 +package org.onosproject.vtnrsc;
17 17
18 -import static org.hamcrest.MatcherAssert.assertThat;
19 -import static org.hamcrest.Matchers.is;
20 -import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
21 -
22 -import org.junit.Test;
23 -import java.util.List;
24 import java.util.LinkedList; 18 import java.util.LinkedList;
19 +import java.util.List;
25 20
26 -import org.onosproject.vtnrsc.PortPairGroupId; 21 +import org.junit.Test;
27 -import org.onosproject.vtnrsc.PortPairId;
28 -import org.onosproject.vtnrsc.TenantId;
29 -import org.onosproject.vtnrsc.PortPairGroup;
30 -import org.onosproject.vtnrsc.DefaultPortPairGroup;
31 22
32 import com.google.common.testing.EqualsTester; 23 import com.google.common.testing.EqualsTester;
33 24
25 +import static org.hamcrest.MatcherAssert.assertThat;
26 +import static org.hamcrest.Matchers.is;
27 +import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
28 +
34 /** 29 /**
35 * Unit tests for DefaultPortPairGroup class. 30 * Unit tests for DefaultPortPairGroup class.
36 */ 31 */
......
...@@ -13,21 +13,16 @@ ...@@ -13,21 +13,16 @@
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.vtnrsc.flowclassifier; 16 +package org.onosproject.vtnrsc;
17 -
18 -import static org.hamcrest.MatcherAssert.assertThat;
19 -import static org.hamcrest.Matchers.is;
20 -import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
21 17
22 import org.junit.Test; 18 import org.junit.Test;
23 19
24 -import org.onosproject.vtnrsc.PortPairId;
25 -import org.onosproject.vtnrsc.TenantId;
26 -import org.onosproject.vtnrsc.PortPair;
27 -import org.onosproject.vtnrsc.DefaultPortPair;
28 -
29 import com.google.common.testing.EqualsTester; 20 import com.google.common.testing.EqualsTester;
30 21
22 +import static org.hamcrest.MatcherAssert.assertThat;
23 +import static org.hamcrest.Matchers.is;
24 +import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
25 +
31 /** 26 /**
32 * Unit tests for DefaultPortPair class. 27 * Unit tests for DefaultPortPair class.
33 */ 28 */
......
...@@ -14,9 +14,7 @@ ...@@ -14,9 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -package org.onosproject.vtnrsc.virtualport; 17 +package org.onosproject.vtnrsc;
18 -
19 -import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
20 18
21 import java.util.Map; 19 import java.util.Map;
22 import java.util.Set; 20 import java.util.Set;
...@@ -25,21 +23,13 @@ import org.junit.Test; ...@@ -25,21 +23,13 @@ import org.junit.Test;
25 import org.onlab.packet.IpAddress; 23 import org.onlab.packet.IpAddress;
26 import org.onlab.packet.MacAddress; 24 import org.onlab.packet.MacAddress;
27 import org.onosproject.net.DeviceId; 25 import org.onosproject.net.DeviceId;
28 -import org.onosproject.vtnrsc.AllowedAddressPair;
29 -import org.onosproject.vtnrsc.BindingHostId;
30 -import org.onosproject.vtnrsc.DefaultVirtualPort;
31 -import org.onosproject.vtnrsc.FixedIp;
32 -import org.onosproject.vtnrsc.SecurityGroup;
33 -import org.onosproject.vtnrsc.SubnetId;
34 -import org.onosproject.vtnrsc.TenantId;
35 -import org.onosproject.vtnrsc.TenantNetworkId;
36 -import org.onosproject.vtnrsc.VirtualPort;
37 -import org.onosproject.vtnrsc.VirtualPortId;
38 26
39 import com.google.common.collect.Maps; 27 import com.google.common.collect.Maps;
40 import com.google.common.collect.Sets; 28 import com.google.common.collect.Sets;
41 import com.google.common.testing.EqualsTester; 29 import com.google.common.testing.EqualsTester;
42 30
31 +import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
32 +
43 /** 33 /**
44 * Unit tests for DefaultVirtualPort class. 34 * Unit tests for DefaultVirtualPort class.
45 */ 35 */
......
...@@ -14,20 +14,18 @@ ...@@ -14,20 +14,18 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -package org.onosproject.vtnrsc.virtualport; 17 +package org.onosproject.vtnrsc;
18 -
19 -import static org.hamcrest.MatcherAssert.assertThat;
20 -import static org.hamcrest.Matchers.is;
21 -import static org.hamcrest.Matchers.notNullValue;
22 -import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
23 18
24 import org.junit.Test; 19 import org.junit.Test;
25 import org.onlab.packet.IpAddress; 20 import org.onlab.packet.IpAddress;
26 -import org.onosproject.vtnrsc.FixedIp;
27 -import org.onosproject.vtnrsc.SubnetId;
28 21
29 import com.google.common.testing.EqualsTester; 22 import com.google.common.testing.EqualsTester;
30 23
24 +import static org.hamcrest.MatcherAssert.assertThat;
25 +import static org.hamcrest.Matchers.is;
26 +import static org.hamcrest.Matchers.notNullValue;
27 +import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
28 +
31 /** 29 /**
32 * Unit tests for FixedIp class. 30 * Unit tests for FixedIp class.
33 */ 31 */
......
...@@ -13,18 +13,18 @@ ...@@ -13,18 +13,18 @@
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.vtnrsc.flowclassifier; 16 +package org.onosproject.vtnrsc;
17 17
18 -import static org.hamcrest.MatcherAssert.assertThat; 18 +import java.util.UUID;
19 -import static org.hamcrest.Matchers.is;
20 -import static org.hamcrest.Matchers.notNullValue;
21 -import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
22 19
23 import org.junit.Test; 20 import org.junit.Test;
24 -import org.onosproject.vtnrsc.FlowClassifierId;
25 21
26 import com.google.common.testing.EqualsTester; 22 import com.google.common.testing.EqualsTester;
27 -import java.util.UUID; 23 +
24 +import static org.hamcrest.MatcherAssert.assertThat;
25 +import static org.hamcrest.Matchers.is;
26 +import static org.hamcrest.Matchers.notNullValue;
27 +import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
28 28
29 /** 29 /**
30 * Unit tests for FlowClassifierId class. 30 * Unit tests for FlowClassifierId class.
......
...@@ -13,18 +13,17 @@ ...@@ -13,18 +13,17 @@
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.vtnrsc.tenantnetwork; 16 +package org.onosproject.vtnrsc;
17 +
18 +import org.junit.Test;
19 +
20 +import com.google.common.testing.EqualsTester;
17 21
18 import static org.hamcrest.MatcherAssert.assertThat; 22 import static org.hamcrest.MatcherAssert.assertThat;
19 import static org.hamcrest.Matchers.is; 23 import static org.hamcrest.Matchers.is;
20 import static org.hamcrest.Matchers.notNullValue; 24 import static org.hamcrest.Matchers.notNullValue;
21 import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable; 25 import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
22 26
23 -import org.junit.Test;
24 -import org.onosproject.vtnrsc.PhysicalNetwork;
25 -
26 -import com.google.common.testing.EqualsTester;
27 -
28 /** 27 /**
29 * Unit tests for PhysicalNetwork class. 28 * Unit tests for PhysicalNetwork class.
30 */ 29 */
......
...@@ -13,18 +13,18 @@ ...@@ -13,18 +13,18 @@
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.vtnrsc.portchain; 16 +package org.onosproject.vtnrsc;
17 17
18 -import static org.hamcrest.MatcherAssert.assertThat; 18 +import java.util.UUID;
19 -import static org.hamcrest.Matchers.is;
20 -import static org.hamcrest.Matchers.notNullValue;
21 -import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
22 19
23 import org.junit.Test; 20 import org.junit.Test;
24 -import org.onosproject.vtnrsc.PortChainId;
25 21
26 import com.google.common.testing.EqualsTester; 22 import com.google.common.testing.EqualsTester;
27 -import java.util.UUID; 23 +
24 +import static org.hamcrest.MatcherAssert.assertThat;
25 +import static org.hamcrest.Matchers.is;
26 +import static org.hamcrest.Matchers.notNullValue;
27 +import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
28 28
29 /** 29 /**
30 * Unit tests for PortChainId class. 30 * Unit tests for PortChainId class.
......
...@@ -13,18 +13,18 @@ ...@@ -13,18 +13,18 @@
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.vtnrsc.portpairgroup; 16 +package org.onosproject.vtnrsc;
17 17
18 -import static org.hamcrest.MatcherAssert.assertThat; 18 +import java.util.UUID;
19 -import static org.hamcrest.Matchers.is;
20 -import static org.hamcrest.Matchers.notNullValue;
21 -import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
22 19
23 import org.junit.Test; 20 import org.junit.Test;
24 -import org.onosproject.vtnrsc.PortPairGroupId;
25 21
26 import com.google.common.testing.EqualsTester; 22 import com.google.common.testing.EqualsTester;
27 -import java.util.UUID; 23 +
24 +import static org.hamcrest.MatcherAssert.assertThat;
25 +import static org.hamcrest.Matchers.is;
26 +import static org.hamcrest.Matchers.notNullValue;
27 +import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
28 28
29 /** 29 /**
30 * Unit tests for PortPairGroupId class. 30 * Unit tests for PortPairGroupId class.
......
...@@ -13,18 +13,18 @@ ...@@ -13,18 +13,18 @@
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.vtnrsc.portpair; 16 +package org.onosproject.vtnrsc;
17 17
18 -import static org.hamcrest.MatcherAssert.assertThat; 18 +import java.util.UUID;
19 -import static org.hamcrest.Matchers.is;
20 -import static org.hamcrest.Matchers.notNullValue;
21 -import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
22 19
23 import org.junit.Test; 20 import org.junit.Test;
24 -import org.onosproject.vtnrsc.PortPairId;
25 21
26 import com.google.common.testing.EqualsTester; 22 import com.google.common.testing.EqualsTester;
27 -import java.util.UUID; 23 +
24 +import static org.hamcrest.MatcherAssert.assertThat;
25 +import static org.hamcrest.Matchers.is;
26 +import static org.hamcrest.Matchers.notNullValue;
27 +import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
28 28
29 /** 29 /**
30 * Unit tests for PortPairId class. 30 * Unit tests for PortPairId class.
......
...@@ -13,23 +13,20 @@ ...@@ -13,23 +13,20 @@
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.vtnrsc.router; 16 +package org.onosproject.vtnrsc;
17 -
18 -import static org.hamcrest.MatcherAssert.assertThat;
19 -import static org.hamcrest.Matchers.is;
20 -import static org.hamcrest.Matchers.notNullValue;
21 -import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
22 17
23 import java.util.HashSet; 18 import java.util.HashSet;
24 import java.util.Set; 19 import java.util.Set;
25 20
26 import org.junit.Test; 21 import org.junit.Test;
27 -import org.onosproject.vtnrsc.RouterGateway;
28 -import org.onosproject.vtnrsc.TenantNetworkId;
29 -import org.onosproject.vtnrsc.FixedIp;
30 22
31 import com.google.common.testing.EqualsTester; 23 import com.google.common.testing.EqualsTester;
32 24
25 +import static org.hamcrest.MatcherAssert.assertThat;
26 +import static org.hamcrest.Matchers.is;
27 +import static org.hamcrest.Matchers.notNullValue;
28 +import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
29 +
33 /** 30 /**
34 * Unit tests for RouterGateway class. 31 * Unit tests for RouterGateway class.
35 */ 32 */
......
...@@ -13,18 +13,17 @@ ...@@ -13,18 +13,17 @@
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.vtnrsc.router; 16 +package org.onosproject.vtnrsc;
17 +
18 +import org.junit.Test;
19 +
20 +import com.google.common.testing.EqualsTester;
17 21
18 import static org.hamcrest.MatcherAssert.assertThat; 22 import static org.hamcrest.MatcherAssert.assertThat;
19 import static org.hamcrest.Matchers.is; 23 import static org.hamcrest.Matchers.is;
20 import static org.hamcrest.Matchers.notNullValue; 24 import static org.hamcrest.Matchers.notNullValue;
21 import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable; 25 import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
22 26
23 -import org.junit.Test;
24 -import org.onosproject.vtnrsc.RouterId;
25 -
26 -import com.google.common.testing.EqualsTester;
27 -
28 /** 27 /**
29 * Unit tests for RouterId class. 28 * Unit tests for RouterId class.
30 */ 29 */
......
...@@ -14,18 +14,17 @@ ...@@ -14,18 +14,17 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -package org.onosproject.vtnrsc.virtualport; 17 +package org.onosproject.vtnrsc;
18 +
19 +import org.junit.Test;
20 +
21 +import com.google.common.testing.EqualsTester;
18 22
19 import static org.hamcrest.MatcherAssert.assertThat; 23 import static org.hamcrest.MatcherAssert.assertThat;
20 import static org.hamcrest.Matchers.is; 24 import static org.hamcrest.Matchers.is;
21 import static org.hamcrest.Matchers.notNullValue; 25 import static org.hamcrest.Matchers.notNullValue;
22 import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable; 26 import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
23 27
24 -import org.junit.Test;
25 -import org.onosproject.vtnrsc.SecurityGroup;
26 -
27 -import com.google.common.testing.EqualsTester;
28 -
29 /** 28 /**
30 * Unit tests for SecurityGroup class. 29 * Unit tests for SecurityGroup class.
31 */ 30 */
......
...@@ -13,18 +13,17 @@ ...@@ -13,18 +13,17 @@
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.vtnrsc.tenantnetwork; 16 +package org.onosproject.vtnrsc;
17 +
18 +import org.junit.Test;
19 +
20 +import com.google.common.testing.EqualsTester;
17 21
18 import static org.hamcrest.MatcherAssert.assertThat; 22 import static org.hamcrest.MatcherAssert.assertThat;
19 import static org.hamcrest.Matchers.is; 23 import static org.hamcrest.Matchers.is;
20 import static org.hamcrest.Matchers.notNullValue; 24 import static org.hamcrest.Matchers.notNullValue;
21 import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable; 25 import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
22 26
23 -import org.junit.Test;
24 -import org.onosproject.vtnrsc.SegmentationId;
25 -
26 -import com.google.common.testing.EqualsTester;
27 -
28 /** 27 /**
29 * Unit tests for SegmentationId class. 28 * Unit tests for SegmentationId class.
30 */ 29 */
......
...@@ -13,18 +13,17 @@ ...@@ -13,18 +13,17 @@
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.vtnrsc.subnet; 16 +package org.onosproject.vtnrsc;
17 +
18 +import org.junit.Test;
19 +
20 +import com.google.common.testing.EqualsTester;
17 21
18 import static org.hamcrest.MatcherAssert.assertThat; 22 import static org.hamcrest.MatcherAssert.assertThat;
19 import static org.hamcrest.Matchers.is; 23 import static org.hamcrest.Matchers.is;
20 import static org.hamcrest.Matchers.notNullValue; 24 import static org.hamcrest.Matchers.notNullValue;
21 import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable; 25 import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
22 26
23 -import org.junit.Test;
24 -import org.onosproject.vtnrsc.SubnetId;
25 -
26 -import com.google.common.testing.EqualsTester;
27 -
28 /** 27 /**
29 * Unit tests for SubnetId class. 28 * Unit tests for SubnetId class.
30 */ 29 */
......
...@@ -13,18 +13,17 @@ ...@@ -13,18 +13,17 @@
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.vtnrsc.tenantnetwork; 16 +package org.onosproject.vtnrsc;
17 +
18 +import org.junit.Test;
19 +
20 +import com.google.common.testing.EqualsTester;
17 21
18 import static org.hamcrest.MatcherAssert.assertThat; 22 import static org.hamcrest.MatcherAssert.assertThat;
19 import static org.hamcrest.Matchers.is; 23 import static org.hamcrest.Matchers.is;
20 import static org.hamcrest.Matchers.notNullValue; 24 import static org.hamcrest.Matchers.notNullValue;
21 import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable; 25 import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
22 26
23 -import org.junit.Test;
24 -import org.onosproject.vtnrsc.TenantId;
25 -
26 -import com.google.common.testing.EqualsTester;
27 -
28 /** 27 /**
29 * Unit tests for TenantId class. 28 * Unit tests for TenantId class.
30 */ 29 */
......
...@@ -13,18 +13,17 @@ ...@@ -13,18 +13,17 @@
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.vtnrsc.tenantnetwork; 16 +package org.onosproject.vtnrsc;
17 +
18 +import org.junit.Test;
19 +
20 +import com.google.common.testing.EqualsTester;
17 21
18 import static org.hamcrest.MatcherAssert.assertThat; 22 import static org.hamcrest.MatcherAssert.assertThat;
19 import static org.hamcrest.Matchers.is; 23 import static org.hamcrest.Matchers.is;
20 import static org.hamcrest.Matchers.notNullValue; 24 import static org.hamcrest.Matchers.notNullValue;
21 import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable; 25 import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
22 26
23 -import org.junit.Test;
24 -import org.onosproject.vtnrsc.TenantNetworkId;
25 -
26 -import com.google.common.testing.EqualsTester;
27 -
28 /** 27 /**
29 * Unit tests for TenantNetworkId class. 28 * Unit tests for TenantNetworkId class.
30 */ 29 */
......
...@@ -14,18 +14,17 @@ ...@@ -14,18 +14,17 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -package org.onosproject.vtnrsc.virtualport; 17 +package org.onosproject.vtnrsc;
18 +
19 +import org.junit.Test;
20 +
21 +import com.google.common.testing.EqualsTester;
18 22
19 import static org.hamcrest.MatcherAssert.assertThat; 23 import static org.hamcrest.MatcherAssert.assertThat;
20 import static org.hamcrest.Matchers.is; 24 import static org.hamcrest.Matchers.is;
21 import static org.hamcrest.Matchers.notNullValue; 25 import static org.hamcrest.Matchers.notNullValue;
22 import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable; 26 import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
23 27
24 -import org.junit.Test;
25 -import org.onosproject.vtnrsc.VirtualPortId;
26 -
27 -import com.google.common.testing.EqualsTester;
28 -
29 /** 28 /**
30 * Unit tests for VirtualPortId class. 29 * Unit tests for VirtualPortId class.
31 */ 30 */
......