Updated Branches: refs/heads/master bf72a36ea -> 3cbbe2bb0
RAT check broken by d6ed8d7cb. Fix Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3cbbe2bb Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3cbbe2bb Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3cbbe2bb Branch: refs/heads/master Commit: 3cbbe2bb04da75147b8060955cbfb32e222f6780 Parents: bf72a36 Author: Chiradeep Vittal <chirad...@apache.org> Authored: Mon Apr 8 16:51:10 2013 -0700 Committer: Chiradeep Vittal <chirad...@apache.org> Committed: Mon Apr 8 16:51:10 2013 -0700 ---------------------------------------------------------------------- .../configuration/ConfigurationManagerTest.java | 37 +++++++++++--- 1 files changed, 29 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3cbbe2bb/server/test/com/cloud/configuration/ConfigurationManagerTest.java ---------------------------------------------------------------------- diff --git a/server/test/com/cloud/configuration/ConfigurationManagerTest.java b/server/test/com/cloud/configuration/ConfigurationManagerTest.java index eeb1073..321f605 100644 --- a/server/test/com/cloud/configuration/ConfigurationManagerTest.java +++ b/server/test/com/cloud/configuration/ConfigurationManagerTest.java @@ -1,9 +1,36 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + package com.cloud.configuration; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyBoolean; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Matchers.anyLong; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.when; + +import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import java.lang.reflect.Field; + +import junit.framework.Assert; import org.apache.cloudstack.api.command.admin.vlan.DedicatePublicIpRangeCmd; import org.apache.cloudstack.api.command.admin.vlan.ReleasePublicIpRangeCmd; @@ -15,10 +42,10 @@ import org.mockito.MockitoAnnotations; import com.cloud.configuration.Resource.ResourceType; import com.cloud.dc.AccountVlanMapVO; +import com.cloud.dc.DataCenter.NetworkType; import com.cloud.dc.DataCenterVO; import com.cloud.dc.Vlan; import com.cloud.dc.VlanVO; -import com.cloud.dc.DataCenter.NetworkType; import com.cloud.dc.dao.AccountVlanMapDao; import com.cloud.dc.dao.DataCenterDao; import com.cloud.dc.dao.VlanDao; @@ -36,12 +63,6 @@ import com.cloud.user.dao.AccountDao; import com.cloud.utils.db.Transaction; import com.cloud.utils.net.Ip; -import junit.framework.Assert; - -import static org.mockito.Matchers.*; -import static org.mockito.Mockito.when; -import static org.mockito.Mockito.doNothing; - public class ConfigurationManagerTest { private static final Logger s_logger = Logger.getLogger(ConfigurationManagerTest.class);
