Merge pull request #4 from GhostwareDev/development

New release
kevingoos · Feb 13, 2017 · e932991 · e932991
2 parents dd56df2 + 21c7441
commit e932991
Show file tree

Hide file tree

Showing 14 changed files with 209 additions and 145 deletions.
diff --git a/GPS.NET/GPS.NET.Console/App.config b/GPS.NET/GPS.NET.Console/App.config
diff --git a/GPS.NET/GPS.NET.Console/GPS.NET.Console.csproj b/GPS.NET/GPS.NET.Console/GPS.NET.Console.csproj
diff --git a/GPS.NET/GPS.NET.Console/Program.cs b/GPS.NET/GPS.NET.Console/Program.cs
diff --git a/GPS.NET/GPS.NET.Console/Properties/AssemblyInfo.cs b/GPS.NET/GPS.NET.Console/Properties/AssemblyInfo.cs
diff --git a/GPS.NET/GPS.NET.sln b/GPS.NET/GPS.NET.sln
@@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ghostware.GPS.NET.GPSDWpfAp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ghostware.GPS.NET.WindowsAPI.Console", "Ghostware.GPS.NET.WindowsAPI.Console\Ghostware.GPS.NET.WindowsAPI.Console.csproj", "{B676527F-B0E6-4758-8498-AB37A8CE97C7}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ghostware.GPS.NET.UnitTests", "Ghostware.GPS.NET.UnitTests\Ghostware.GPS.NET.UnitTests.csproj", "{53670C74-EF59-43EC-8521-219EF5A95D1D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -42,6 +44,12 @@ Global
 		{B676527F-B0E6-4758-8498-AB37A8CE97C7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B676527F-B0E6-4758-8498-AB37A8CE97C7}.RemoteDebug|Any CPU.ActiveCfg = RemoteDebug|Any CPU
 		{B676527F-B0E6-4758-8498-AB37A8CE97C7}.RemoteDebug|Any CPU.Build.0 = RemoteDebug|Any CPU
+		{53670C74-EF59-43EC-8521-219EF5A95D1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53670C74-EF59-43EC-8521-219EF5A95D1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53670C74-EF59-43EC-8521-219EF5A95D1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{53670C74-EF59-43EC-8521-219EF5A95D1D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{53670C74-EF59-43EC-8521-219EF5A95D1D}.RemoteDebug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53670C74-EF59-43EC-8521-219EF5A95D1D}.RemoteDebug|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/GPS.NET/Ghostware.GPS.NET.GPSDConsole/Program.cs b/GPS.NET/Ghostware.GPS.NET.GPSDConsole/Program.cs
@@ -21,15 +21,14 @@ static void Main(string[] args)
 
             var info = new GpsdInfo()
             {
-                Address = "***.* **.* **.***",
-                //Default
-                //Port = 2947,
-                //IsProxyEnabled = true,
-                //ProxyAddress = "proxy",
-                //ProxyPort = 80,
-                //IsProxyAuthManual = true,
-                //ProxyUsername = "*****",
-                //ProxyPassword = "*****"
+                Address = "178.50.250.33",
+                Port = 2947,
+                IsProxyEnabled = true,
+                ProxyAddress = "proxy",
+                ProxyPort = 80,
+                IsProxyAuthManual = true,
+                ProxyUsername = "EXJ508",
+                ProxyPassword = "Xlssx534"
             };
             _gpsService = new GpsService(info);
 

diff --git a/GPS.NET/Ghostware.GPS.NET.UnitTests/Factories/GpsClientFactoryTests.cs b/GPS.NET/Ghostware.GPS.NET.UnitTests/Factories/GpsClientFactoryTests.cs
@@ -0,0 +1,92 @@
+using System;
+using Ghostware.GPS.NET.Enums;
+using Ghostware.GPS.NET.Exceptions;
+using Ghostware.GPS.NET.Factories;
+using Ghostware.GPS.NET.GpsClients;
+using Ghostware.GPS.NET.Models.ConnectionInfo;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Ghostware.GPS.NET.UnitTests.Factories
+{
+    [TestClass]
+    public class GpsClientFactoryTests
+    {
+        #region Create by GpsType Tests
+
+        [TestMethod]
+        public void CreateComPortGpsTypeTest()
+        {
+            var result = GpsClientFactory.Create(GpsType.ComPort);
+            Assert.IsInstanceOfType(result, typeof(ComPortGpsClient));
+        }
+
+        [TestMethod]
+        public void CreateGpsdGpsTypeTest()
+        {
+            var result = GpsClientFactory.Create(GpsType.Gpsd);
+            Assert.IsInstanceOfType(result, typeof(GpsdGpsClient));
+        }
+
+        [TestMethod]
+        public void CreateFileGpsTypeTest()
+        {
+            var result = GpsClientFactory.Create(GpsType.File);
+            Assert.IsInstanceOfType(result, typeof(FileGpsClient));
+        }
+
+        [TestMethod]
+        public void CreateWindowsLocationApiGpsTypeTest()
+        {
+            var result = GpsClientFactory.Create(GpsType.WindowsLocationApi);
+            Assert.IsInstanceOfType(result, typeof(WindowsLocationApiGpsClient));
+        }
+
+        #endregion
+
+        #region Create by GpsInfo Tests
+
+        [TestMethod]
+        public void CreateComPortGpsInfoTest()
+        {
+            var result = GpsClientFactory.Create(new ComPortInfo());
+            Assert.IsInstanceOfType(result, typeof(ComPortGpsClient));
+        }
+
+        [TestMethod]
+        public void CreateGpsdGpsInfoTest()
+        {
+            var result = GpsClientFactory.Create(new GpsdInfo());
+            Assert.IsInstanceOfType(result, typeof(GpsdGpsClient));
+        }
+
+        [TestMethod]
+        public void CreateFileGpsInfoTest()
+        {
+            var result = GpsClientFactory.Create(new FileGpsInfo());
+            Assert.IsInstanceOfType(result, typeof(FileGpsClient));
+        }
+
+        [TestMethod]
+        public void CreateWindowsLocationApiGpsInfoTest()
+        {
+            var result = GpsClientFactory.Create(new WindowsLocationApiInfo());
+            Assert.IsInstanceOfType(result, typeof(WindowsLocationApiGpsClient));
+        }
+
+        [TestMethod]
+        [ExpectedException(typeof(UnknownTypeException))]
+        public void CreateUnkownGpsInfoTest()
+        {
+            GpsClientFactory.Create(new UnkownGpsInfo());
+        }
+
+        #endregion
+
+        [TestMethod]
+        [ExpectedException(typeof(NullReferenceException))]
+        public void CreateNullGpsTest()
+        {
+            GpsClientFactory.Create(null);
+        }
+    }
+}
diff --git a/GPS.NET/Ghostware.GPS.NET.UnitTests/Factories/GpsDataFactoryTests.cs b/GPS.NET/Ghostware.GPS.NET.UnitTests/Factories/GpsDataFactoryTests.cs
@@ -0,0 +1,75 @@
+using Ghostware.GPS.NET.Enums;
+using Ghostware.GPS.NET.Factories;
+using Ghostware.GPS.NET.Models.ConnectionInfo;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Ghostware.GPS.NET.UnitTests.Factories
+{
+    [TestClass]
+    public class GpsDataFactoryTests
+    {
+        #region Create GpsInfo Tests
+
+        [TestMethod]
+        public void CreateComPortGpsInfoTest()
+        {
+            var result = GpsDataFactory.Create(GpsType.ComPort);
+            Assert.IsInstanceOfType(result, typeof(ComPortInfo));
+        }
+
+        [TestMethod]
+        public void CreateGpsdGpsInfoTest()
+        {
+            var result = GpsDataFactory.Create(GpsType.Gpsd);
+            Assert.IsInstanceOfType(result, typeof(GpsdInfo));
+        }
+
+        [TestMethod]
+        public void CreateFileGpsInfoTest()
+        {
+            var result = GpsDataFactory.Create(GpsType.File);
+            Assert.IsInstanceOfType(result, typeof(FileGpsInfo));
+        }
+
+        [TestMethod]
+        public void CreateWindowsLocationApiGpsInfoTest()
+        {
+            var result = GpsDataFactory.Create(GpsType.WindowsLocationApi);
+            Assert.IsInstanceOfType(result, typeof(WindowsLocationApiInfo));
+        }
+
+        #endregion
+
+        #region GetDataType Tests
+
+        [TestMethod]
+        public void CreateComPortGpsInfoTypeTest()
+        {
+            var result = GpsDataFactory.GetDataType(GpsType.ComPort);
+            Assert.AreEqual(result, typeof(ComPortInfo));
+        }
+
+        [TestMethod]
+        public void CreateGpsdGpsInfoTypeTest()
+        {
+            var result = GpsDataFactory.GetDataType(GpsType.Gpsd);
+            Assert.AreEqual(result, typeof(GpsdInfo));
+        }
+
+        [TestMethod]
+        public void CreateFileGpsInfoTypeTest()
+        {
+            var result = GpsDataFactory.GetDataType(GpsType.File);
+            Assert.AreEqual(result, typeof(FileGpsInfo));
+        }
+
+        [TestMethod]
+        public void CreateWindowsLocationApiGpsInfoTypeTest()
+        {
+            var result = GpsDataFactory.GetDataType(GpsType.WindowsLocationApi);
+            Assert.AreEqual(result, typeof(WindowsLocationApiInfo));
+        }
+
+        #endregion
+    }
+}
diff --git a/GPS.NET/Ghostware.GPS.NET.UnitTests/Factories/UnkownGpsInfo.cs b/GPS.NET/Ghostware.GPS.NET.UnitTests/Factories/UnkownGpsInfo.cs
@@ -0,0 +1,8 @@
+using Ghostware.GPS.NET.Models.ConnectionInfo;
+
+namespace Ghostware.GPS.NET.UnitTests.Factories
+{
+    public class UnkownGpsInfo : BaseGpsInfo
+    {
+    }
+}
diff --git a/GPS.NET/Ghostware.GPS.NET.UnitTests/Ghostware.GPS.NET.UnitTests.csproj b/GPS.NET/Ghostware.GPS.NET.UnitTests/Ghostware.GPS.NET.UnitTests.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{687F1BB3-0D9A-424D-B1FB-776C2157601E}</ProjectGuid>
+    <ProjectGuid>{53670C74-EF59-43EC-8521-219EF5A95D1D}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Ghostware.GPS.NET.UnitTests</RootNamespace>
@@ -50,9 +50,17 @@
     </Otherwise>
   </Choose>
   <ItemGroup>
-    <Compile Include="UnitTest1.cs" />
+    <Compile Include="Factories\GpsClientFactoryTests.cs" />
+    <Compile Include="Factories\GpsDataFactoryTests.cs" />
+    <Compile Include="Factories\UnkownGpsInfo.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Ghostware.GPS.NET\Ghostware.GPS.NET.csproj">
+      <Project>{CFBDB710-C75D-4DDF-94D2-8855FA6F9F07}</Project>
+      <Name>Ghostware.GPS.NET</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>

diff --git a/GPS.NET/Ghostware.GPS.NET.UnitTests/Properties/AssemblyInfo.cs b/GPS.NET/Ghostware.GPS.NET.UnitTests/Properties/AssemblyInfo.cs
@@ -20,7 +20,7 @@
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("687f1bb3-0d9a-424d-b1fb-776c2157601e")]
+[assembly: Guid("53670c74-ef59-43ec-8521-219ef5a95d1d")]
 
 // Version information for an assembly consists of the following four values:
 //

diff --git a/GPS.NET/Ghostware.GPS.NET.UnitTests/UnitTest1.cs b/GPS.NET/Ghostware.GPS.NET.UnitTests/UnitTest1.cs