Merge pull request rpetz#6 from totpero/master

code refactory, fix tests...

SharpNetSH.Test/HTTP/AddActionTests.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using Ignite.SharpNetSH.Test.Spike;
 using Ignite.SharpNetSH.HTTP;
+using Ignite.SharpNetSH.HTTP.Enums;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Ignite.SharpNetSH.Test.HTTP

SharpNetSH.Test/HTTP/DeleteActionTests.cs

@@ -1,5 +1,5 @@
 using Ignite.SharpNetSH.Test.Spike;
-using Ignite.SharpNetSH.HTTP;
+using Ignite.SharpNetSH.HTTP.Enums;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Ignite.SharpNetSH.Test.HTTP

SharpNetSH.Test/Spike/StringHarness.cs

@@ -7,9 +7,9 @@ public class StringHarness : IExecutionHarness
 	{
 		private String _value;
 
-		public String Value { get { return _value; } }
+		public String Value => _value;
 
-		public IEnumerable<String> Execute(string action, out int exitCode)
+	    public IEnumerable<String> Execute(string action, out int exitCode)
 		{
 			_value = action;
 			exitCode = 0;

SharpNetSH.Test/WLAN/ShowActionTests.cs

@@ -1,5 +1,5 @@
 using Ignite.SharpNetSH.Test.Spike;
-using Ignite.SharpNetSH.WLAN;
+using Ignite.SharpNetSH.WLAN.Enums;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Ignite.SharpNetSH.Test.WLAN

SharpNetSH.Test/wlan/AddActionTests.cs

@@ -1,5 +1,5 @@
-using Ignite.SharpNetSH.WLAN;
-using Ignite.SharpNetSH.Test.Spike;
+using Ignite.SharpNetSH.Test.Spike;
+using Ignite.SharpNetSH.WLAN.Enums;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Ignite.SharpNetSH.Test.wlan

SharpNetSH.Test/wlan/DeleteActionTests.cs

@@ -1,7 +1,6 @@
-using System;
-using Ignite.SharpNetSH.Test.Spike;
+using Ignite.SharpNetSH.Test.Spike;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Ignite.SharpNetSH.WLAN;
+using Ignite.SharpNetSH.WLAN.Enums;
 
 namespace Ignite.SharpNetSH.Test.wlan
 {

SharpNetSH.Test/wlan/SetActionTests.cs

@@ -1,6 +1,5 @@
-using System;
-using Ignite.SharpNetSH.WLAN;
-using Ignite.SharpNetSH.Test.Spike;
+using Ignite.SharpNetSH.Test.Spike;
+using Ignite.SharpNetSH.WLAN.Enums;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Ignite.SharpNetSH.Test.wlan
@@ -35,10 +34,10 @@ public void VerifyBlockedNetworkOutput()
 		{
 			var harness = new StringHarness();
 			new NetSH(harness).Wlan.Set.BlockedNetwork(Display.Show);
-			Assert.AreEqual("netsh wlan set blockednetworks display=show", harness.Value);
+			Assert.AreEqual("netsh wlan set blockednetwork display=show", harness.Value);
 
 			new NetSH(harness).Wlan.Set.BlockedNetwork(Display.Hide);
-			Assert.AreEqual("netsh wlan set blockednetworks display=hide", harness.Value);
+			Assert.AreEqual("netsh wlan set blockednetwork display=hide", harness.Value);
 		}
 
 		[TestMethod]
@@ -85,23 +84,23 @@ public void VerifyProfileOrderOutput()
 		{
 			var harness = new StringHarness();
 			new NetSH(harness).Wlan.Set.ProfileOrder("\"profile1\"", "\"Wireless Network Connection\"", 1);
-			Assert.AreEqual("set profileorder name=\"profile1\" interface=\"Wireless Network Connection\" priority=1", harness.Value);
+			Assert.AreEqual("netsh wlan set profileorder name=\"profile1\" interface=\"Wireless Network Connection\" priority=1", harness.Value);
 
-			new NetSH(harness).Wlan.Set.ProfileOrder("\"profile1\"", "\"Wireless Network Connection\"", 5);
-			Assert.AreEqual("set profileorder name=\"profile two\" interface=\"Wireless Network Connection\" priority=5", harness.Value);
+			new NetSH(harness).Wlan.Set.ProfileOrder("\"profile2\"", "\"Wireless Network Connection\"", 5);
+			Assert.AreEqual("netsh wlan set profileorder name=\"profile2\" interface=\"Wireless Network Connection\" priority=5", harness.Value);
 		}
 
 		[TestMethod]
 		public void VerifyProfileParameterOutput()
 		{
 			var harness = new StringHarness();
-		   
+
 			/*
 			var tests = new[]
 			{
 				new object[] {"Profile1", "interfacename",  "ssid1",    ConnectionType.Ibss,    null,   null,                   false,  Authentication.Wpa2,    Encryption.Wep, KeyType.Passphrase, null,   null,           false,  null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null},
 				new object[] {"Profile1", null,             "ssid1",    ConnectionType.Ess,     true,   ConnectionMode.Auto,    false,  null,                   null,           null,               null,   null,           null,   null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null},
-				new object[] {"Profile1", null,             null,       null,                   true,   null,                   null,   Authentication.Wpa,     null,           KeyType.NetworkKey, 1,      "keymaterial",  null,   null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null},  
+				new object[] {"Profile1", null,             null,       null,                   true,   null,                   null,   Authentication.Wpa,     null,           KeyType.NetworkKey, 1,      "keymaterial",  null,   null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null},
 				new object[] {"Profile1", null,             null,       null,                   true,   ConnectionMode.Manual,  null,   Authentication.Open,    null,           null,               null,   null,           true,   null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null},
 				new object[] {"Profile1", null,             "ssid1",    null,                   null,   null,                   null,   Authentication.Open,    null,           null,               null,   null,           null,   null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null},
 				new object[] {"Profile1", null,             "ssid1",    null,                   null,   null,                   true,   Authentication.Open,    null,           null,               null,   null,           null,   null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null},

SharpNetSH/Actions/HTTP/Timeout.cs → SharpNetSH/Actions/HTTP/Enums/Timeout.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Ignite.SharpNetSH.HTTP
+namespace Ignite.SharpNetSH.HTTP.Enums
 {
 	public enum Timeout
 	{

SharpNetSH/Actions/HTTP/IAddAction.cs

@@ -1,4 +1,5 @@
 using System;
+using Ignite.SharpNetSH.HTTP.Enums;
 
 namespace Ignite.SharpNetSH.HTTP
 {

SharpNetSH/Actions/HTTP/IDeleteAction.cs

@@ -1,4 +1,5 @@
 using System;
+using Ignite.SharpNetSH.HTTP.Enums;
 
 namespace Ignite.SharpNetSH.HTTP
 {

SharpNetSH/Actions/NetSh.cs

@@ -15,10 +15,10 @@ public NetSH(IExecutionHarness harness)
 		/// <summary>
 		/// Instantiates a new instance of NetSH with a CommandLineHarness
 		/// </summary>
-		public static NetSH CMD { get {  return new NetSH(new CommandLineHarness()); } }
+		public static NetSH CMD => new NetSH(new CommandLineHarness());
 
-		public IHttpAction Http { get { return HttpAction.CreateAction("netsh", _harness); } }
+	    public IHttpAction Http => HttpAction.CreateAction("netsh", _harness);
 
-	    public IWlanAction Wlan { get { return WlanAction.CreateAction("netsh", _harness); } }
+	    public IWlanAction Wlan => WlanAction.CreateAction("netsh", _harness);
 	}
 }

SharpNetSH/Actions/WLAN/AuthMode.cs → SharpNetSH/Actions/WLAN/Enums/AuthMode.cs

@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.ComponentModel;
 
-namespace Ignite.SharpNetSH.WLAN
+namespace Ignite.SharpNetSH.WLAN.Enums
 {
     public enum AuthMode
     {

SharpNetSH/Actions/WLAN/Authentication.cs → SharpNetSH/Actions/WLAN/Enums/Authentication.cs

@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.ComponentModel;
 
-namespace Ignite.SharpNetSH.WLAN
+namespace Ignite.SharpNetSH.WLAN.Enums
 {
     public enum Authentication
     {

SharpNetSH/Actions/WLAN/ConnectionMode.cs → SharpNetSH/Actions/WLAN/Enums/ConnectionMode.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Ignite.SharpNetSH.WLAN
+namespace Ignite.SharpNetSH.WLAN.Enums
 {
     public enum ConnectionMode
     {

SharpNetSH/Actions/WLAN/ConnectionType.cs → SharpNetSH/Actions/WLAN/Enums/ConnectionType.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Ignite.SharpNetSH.WLAN
+namespace Ignite.SharpNetSH.WLAN.Enums
 {
     public enum ConnectionType
     {

SharpNetSH/Actions/WLAN/Cost.cs → SharpNetSH/Actions/WLAN/Enums/Cost.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Ignite.SharpNetSH.WLAN
+namespace Ignite.SharpNetSH.WLAN.Enums
 {
     public enum Cost
     {

SharpNetSH/Actions/WLAN/Display.cs → SharpNetSH/Actions/WLAN/Enums/Display.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Ignite.SharpNetSH.WLAN
+namespace Ignite.SharpNetSH.WLAN.Enums
 {
     public enum Display
     {

SharpNetSH/Actions/WLAN/Encryption.cs → SharpNetSH/Actions/WLAN/Enums/Encryption.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Ignite.SharpNetSH.WLAN
+namespace Ignite.SharpNetSH.WLAN.Enums
 {
     public enum Encryption
     {

SharpNetSH/Actions/WLAN/KeyType.cs → SharpNetSH/Actions/WLAN/Enums/KeyType.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Ignite.SharpNetSH.WLAN
+namespace Ignite.SharpNetSH.WLAN.Enums
 {
     public enum KeyType
     {

SharpNetSH/Actions/WLAN/KeyUsage.cs → SharpNetSH/Actions/WLAN/Enums/KeyUsage.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Ignite.SharpNetSH.WLAN
+namespace Ignite.SharpNetSH.WLAN.Enums
 {
     public enum KeyUsage
     {

SharpNetSH/Actions/WLAN/Mode.cs → SharpNetSH/Actions/WLAN/Enums/Mode.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Ignite.SharpNetSH.WLAN
+namespace Ignite.SharpNetSH.WLAN.Enums
 {
     public enum Mode
     {

SharpNetSH/Actions/WLAN/NetworkMode.cs → SharpNetSH/Actions/WLAN/Enums/NetworkMode.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Ignite.SharpNetSH.WLAN
+namespace Ignite.SharpNetSH.WLAN.Enums
 {
     public enum NetworkMode
     {

SharpNetSH/Actions/WLAN/NetworkType.cs → SharpNetSH/Actions/WLAN/Enums/NetworkType.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Ignite.SharpNetSH.WLAN
+namespace Ignite.SharpNetSH.WLAN.Enums
 {
     public enum NetworkType
     {

SharpNetSH/Actions/WLAN/Permission.cs → SharpNetSH/Actions/WLAN/Enums/Permission.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Ignite.SharpNetSH.WLAN
+namespace Ignite.SharpNetSH.WLAN.Enums
 {
     public enum Permission
     {

SharpNetSH/Actions/WLAN/ProfileType.cs → SharpNetSH/Actions/WLAN/Enums/ProfileType.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Ignite.SharpNetSH.WLAN
+namespace Ignite.SharpNetSH.WLAN.Enums
 {
     public enum ProfileType
     {

SharpNetSH/Actions/WLAN/SsoMode.cs → SharpNetSH/Actions/WLAN/Enums/SsoMode.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Ignite.SharpNetSH.WLAN
+namespace Ignite.SharpNetSH.WLAN.Enums
 {
     public enum SsoMode
     {

SharpNetSH/Actions/WLAN/TracingMode.cs → SharpNetSH/Actions/WLAN/Enums/TracingMode.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Ignite.SharpNetSH.WLAN
+namespace Ignite.SharpNetSH.WLAN.Enums
 {
     public enum TracingMode
     {

SharpNetSH/Actions/WLAN/User.cs → SharpNetSH/Actions/WLAN/Enums/User.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Ignite.SharpNetSH.WLAN
+namespace Ignite.SharpNetSH.WLAN.Enums
 {
     public enum User
     {

SharpNetSH/Actions/WLAN/IAddAction.cs

@@ -1,4 +1,5 @@
 using System;
+using Ignite.SharpNetSH.WLAN.Enums;
 
 namespace Ignite.SharpNetSH.WLAN
 {

SharpNetSH/Actions/WLAN/IDeleteAction.cs

@@ -1,4 +1,5 @@
 using System;
+using Ignite.SharpNetSH.WLAN.Enums;
 
 namespace Ignite.SharpNetSH.WLAN
 {

SharpNetSH/Actions/WLAN/ISetAction.cs

@@ -1,4 +1,5 @@
 using System;
+using Ignite.SharpNetSH.WLAN.Enums;
 
 namespace Ignite.SharpNetSH.WLAN
 {

SharpNetSH/Actions/WLAN/IShowAction.cs

@@ -1,4 +1,5 @@
 using System;
+using Ignite.SharpNetSH.WLAN.Enums;
 
 namespace Ignite.SharpNetSH.WLAN
 {

SharpNetSH/Actions/WLAN/WlanAction.cs

@@ -13,7 +13,7 @@ private WlanAction()
 
         }
 
-        public string ActionName { get { return "wlan"; } }
+        public string ActionName => "wlan";
 
         public void Initialize(string priorText, IExecutionHarness harness)
         {

SharpNetSH/Attributes/BooleanValueAttribute.cs

@@ -5,8 +5,8 @@ namespace Ignite.SharpNetSH
 	[AttributeUsage(AttributeTargets.Field)]
 	internal class BooleanValueAttribute : Attribute
 	{
-		public String TrueValue { get; private set; }
-		public String FalseValue { get; private set; }
+		public String TrueValue { get; }
+		public String FalseValue { get; }
 
 		public BooleanValueAttribute(string trueValue, string falseValue)
 		{

SharpNetSH/Attributes/MethodNameAttribute.cs

@@ -8,6 +8,6 @@ internal class MethodNameAttribute : Attribute
 		public MethodNameAttribute(string methodName)
 		{ MethodName = methodName; }
 
-		public String MethodName { get; private set; }
+		public String MethodName { get; }
 	}
 }

SharpNetSH/Attributes/ParameterNameAttribute.cs

@@ -15,7 +15,7 @@ public ParameterNameAttribute(string parameterName, BooleanType booleanType)
 			BooleanType = booleanType;
 		}
 
-		public String ParameterName { get; private set; }
-		public BooleanType BooleanType { get; private set; }
+		public String ParameterName { get; }
+		public BooleanType BooleanType { get; }
 	}
 }

SharpNetSH/Attributes/ResponseProcessorAttribute.cs

@@ -6,8 +6,8 @@ namespace Ignite.SharpNetSH
 	[AttributeUsage(AttributeTargets.Method)]
 	internal class ResponseProcessorAttribute : Attribute
 	{
-		public Type ResponseProcessorType { get; private set; }
-		public String SplitRegEx { get; private set; }
+		public Type ResponseProcessorType { get; }
+		public String SplitRegEx { get; }
 
 		public ResponseProcessorAttribute(Type responseProcessorType, String splitRegEx = null)
 		{

SharpNetSH/Harnesses/CommandLineHarness.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Diagnostics;
 
 namespace Ignite.SharpNetSH
@@ -9,7 +8,7 @@ namespace Ignite.SharpNetSH
 	/// </summary>
 	public class CommandLineHarness : IExecutionHarness
 	{
-		public IEnumerable<String> Execute(string action, out int exitCode)
+		public IEnumerable<string> Execute(string action, out int exitCode)
 		{
 			var process = new Process
 			{
@@ -26,7 +25,7 @@ public IEnumerable<String> Execute(string action, out int exitCode)
 
 			process.Start();
 
-			var lines = new List<String>();
+			var lines = new List<string>();
 			while (!process.StandardOutput.EndOfStream)
 				lines.Add(process.StandardOutput.ReadLine());