From 154f54213d298ff78f0df23db89993f9dc344910 Mon Sep 17 00:00:00 2001 From: Subrahmanyam Mandavilli Date: Mon, 21 Dec 2015 11:57:53 +0530 Subject: [PATCH] Fixing the folder hierarchy issue --- .../vmOpsTool/{vmOpsTool => }/ConnectionData.java | 2 +- src/Tools/vmOpsTool/{vmOpsTool => }/IVMWare.java | 2 +- src/Tools/vmOpsTool/{vmOpsTool => }/VMWareImpl.java | 2 +- src/Tools/vmOpsTool/{vmOpsTool => }/VmOpsTool.java | 2 +- tests/Tools/vmOpsTool/InMemoryVMWareImpl.java | 3 --- .../vmOpsTool/InMemoryVMWareImplPlatformTests.java | 2 -- tests/Tools/vmOpsTool/VMWareImplPlatformTests.java | 3 --- tests/Tools/vmOpsTool/VMWarePlatformTests.java | 11 +---------- tests/Tools/vmOpsTool/VmOpsToolUnitTests.java | 6 ++---- 9 files changed, 7 insertions(+), 26 deletions(-) rename src/Tools/vmOpsTool/{vmOpsTool => }/ConnectionData.java (90%) rename src/Tools/vmOpsTool/{vmOpsTool => }/IVMWare.java (95%) rename src/Tools/vmOpsTool/{vmOpsTool => }/VMWareImpl.java (97%) rename src/Tools/vmOpsTool/{vmOpsTool => }/VmOpsTool.java (96%) diff --git a/src/Tools/vmOpsTool/vmOpsTool/ConnectionData.java b/src/Tools/vmOpsTool/ConnectionData.java similarity index 90% rename from src/Tools/vmOpsTool/vmOpsTool/ConnectionData.java rename to src/Tools/vmOpsTool/ConnectionData.java index 6577bff..8c5787b 100644 --- a/src/Tools/vmOpsTool/vmOpsTool/ConnectionData.java +++ b/src/Tools/vmOpsTool/ConnectionData.java @@ -1,4 +1,4 @@ -package vmOpsTool; + public class ConnectionData { diff --git a/src/Tools/vmOpsTool/vmOpsTool/IVMWare.java b/src/Tools/vmOpsTool/IVMWare.java similarity index 95% rename from src/Tools/vmOpsTool/vmOpsTool/IVMWare.java rename to src/Tools/vmOpsTool/IVMWare.java index cba6f93..c6bb901 100644 --- a/src/Tools/vmOpsTool/vmOpsTool/IVMWare.java +++ b/src/Tools/vmOpsTool/IVMWare.java @@ -1,4 +1,4 @@ -package vmOpsTool; + public interface IVMWare { diff --git a/src/Tools/vmOpsTool/vmOpsTool/VMWareImpl.java b/src/Tools/vmOpsTool/VMWareImpl.java similarity index 97% rename from src/Tools/vmOpsTool/vmOpsTool/VMWareImpl.java rename to src/Tools/vmOpsTool/VMWareImpl.java index b1f55aa..bc52dd4 100644 --- a/src/Tools/vmOpsTool/vmOpsTool/VMWareImpl.java +++ b/src/Tools/vmOpsTool/VMWareImpl.java @@ -1,4 +1,4 @@ -package vmOpsTool; + import java.util.*; import javax.xml.ws.BindingProvider; diff --git a/src/Tools/vmOpsTool/vmOpsTool/VmOpsTool.java b/src/Tools/vmOpsTool/VmOpsTool.java similarity index 96% rename from src/Tools/vmOpsTool/vmOpsTool/VmOpsTool.java rename to src/Tools/vmOpsTool/VmOpsTool.java index d424fb1..1593ba7 100644 --- a/src/Tools/vmOpsTool/vmOpsTool/VmOpsTool.java +++ b/src/Tools/vmOpsTool/VmOpsTool.java @@ -1,4 +1,4 @@ -package vmOpsTool; + import java.util.*; diff --git a/tests/Tools/vmOpsTool/InMemoryVMWareImpl.java b/tests/Tools/vmOpsTool/InMemoryVMWareImpl.java index 3ce3703..80ccc97 100644 --- a/tests/Tools/vmOpsTool/InMemoryVMWareImpl.java +++ b/tests/Tools/vmOpsTool/InMemoryVMWareImpl.java @@ -1,9 +1,6 @@ import java.util.HashMap; import java.util.Map; -import vmOpsTool.ConnectionData; -import vmOpsTool.IVMWare; - public class InMemoryVMWareImpl implements IVMWare { private Map> vmSnapshotInfo = new HashMap>(); diff --git a/tests/Tools/vmOpsTool/InMemoryVMWareImplPlatformTests.java b/tests/Tools/vmOpsTool/InMemoryVMWareImplPlatformTests.java index 8da9574..babfd39 100644 --- a/tests/Tools/vmOpsTool/InMemoryVMWareImplPlatformTests.java +++ b/tests/Tools/vmOpsTool/InMemoryVMWareImplPlatformTests.java @@ -1,5 +1,3 @@ -import vmOpsTool.IVMWare; - public class InMemoryVMWareImplPlatformTests extends VMWarePlatformTests{ @Override diff --git a/tests/Tools/vmOpsTool/VMWareImplPlatformTests.java b/tests/Tools/vmOpsTool/VMWareImplPlatformTests.java index 125ee42..ff453df 100644 --- a/tests/Tools/vmOpsTool/VMWareImplPlatformTests.java +++ b/tests/Tools/vmOpsTool/VMWareImplPlatformTests.java @@ -1,6 +1,3 @@ -import vmOpsTool.IVMWare; -import vmOpsTool.VMWareImpl; - public class VMWareImplPlatformTests extends VMWarePlatformTests { @Override diff --git a/tests/Tools/vmOpsTool/VMWarePlatformTests.java b/tests/Tools/vmOpsTool/VMWarePlatformTests.java index 48017a8..96c44fc 100644 --- a/tests/Tools/vmOpsTool/VMWarePlatformTests.java +++ b/tests/Tools/vmOpsTool/VMWarePlatformTests.java @@ -1,16 +1,7 @@ -import java.security.KeyManagementException; -import java.security.NoSuchAlgorithmException; +import static org.assertj.core.api.Assertions.assertThat; -import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.SSLSession; import org.junit.Test; -import vmOpsTool.ConnectionData; -import vmOpsTool.IVMWare; - -import static org.assertj.core.api.Assertions.*; - public abstract class VMWarePlatformTests { private String vCenterUserName = "Administrator@vsphere.local"; private String vCenterPassword = "Password~1"; diff --git a/tests/Tools/vmOpsTool/VmOpsToolUnitTests.java b/tests/Tools/vmOpsTool/VmOpsToolUnitTests.java index 14873d3..905874a 100644 --- a/tests/Tools/vmOpsTool/VmOpsToolUnitTests.java +++ b/tests/Tools/vmOpsTool/VmOpsToolUnitTests.java @@ -1,11 +1,9 @@ -import org.junit.Test; -import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; import java.util.Map; -import vmOpsTool.ConnectionData; -import vmOpsTool.VmOpsTool; +import org.junit.Test; public class VmOpsToolUnitTests {