Skip to content

Commit

Permalink
Version 2.04
Browse files Browse the repository at this point in the history
  • Loading branch information
Vitaly Sushilov committed May 10, 2018
1 parent 04afa6b commit 5375edc
Show file tree
Hide file tree
Showing 80 changed files with 4,514 additions and 2,015 deletions.
78 changes: 69 additions & 9 deletions Client/Client.sln
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.16
VisualStudioVersion = 15.0.27130.2010
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EveJima", "EvaJima\EveJima.csproj", "{B1FFBC3C-F71C-40B7-A04B-BE708AA024CC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EveJimaCore", "EvaJimaCore\EveJimaCore.csproj", "{C1410D27-425C-4C35-89E3-1281F95183E2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EveJimaBrowser", "EveJimaBrowser\EveJimaBrowser.csproj", "{FC30A198-4213-404F-8526-D7BE5D49E57D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EveJimaUniverse", "EveJimaUniverse\EveJimaUniverse.csproj", "{7CCC5A5F-14C3-4BA3-998B-D4177085BFEB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EJTests", "EJTests\EJTests.csproj", "{C50C772A-53FE-4677-9A27-38F4050F3D90}"
Expand All @@ -17,58 +15,120 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EveJimaServerMap", "..\Serv
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "EveJimaInstaller", "EveJimaInstaller\EveJimaInstaller.vdproj", "{5686FF51-8DC6-41C9-8802-55F01876BAD4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUI", "TestUI\TestUI.csproj", "{12D01BD2-E8B1-4F4A-8C24-63B06F7F413D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EveJimaBrowserInterceptor", "EveJimaBrowserInterceptor\EveJimaBrowserInterceptor.csproj", "{0B762BEC-03A3-4ACD-AB86-92C970B26722}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EveInternalBrowser", "..\..\EveJimaIGB\EveJimaIGB\EveInternalBrowser\EveInternalBrowser.csproj", "{C23FDED6-0D07-42C6-BA3A-F0E9B5C1D592}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B1FFBC3C-F71C-40B7-A04B-BE708AA024CC}.Debug|Any CPU.ActiveCfg = Debug|x86
{B1FFBC3C-F71C-40B7-A04B-BE708AA024CC}.Debug|Any CPU.Build.0 = Debug|x86
{B1FFBC3C-F71C-40B7-A04B-BE708AA024CC}.Debug|x64.ActiveCfg = Debug|Any CPU
{B1FFBC3C-F71C-40B7-A04B-BE708AA024CC}.Debug|x64.Build.0 = Debug|Any CPU
{B1FFBC3C-F71C-40B7-A04B-BE708AA024CC}.Debug|x86.ActiveCfg = Debug|x86
{B1FFBC3C-F71C-40B7-A04B-BE708AA024CC}.Release|Any CPU.ActiveCfg = Release|x86
{B1FFBC3C-F71C-40B7-A04B-BE708AA024CC}.Release|Any CPU.Build.0 = Release|x86
{B1FFBC3C-F71C-40B7-A04B-BE708AA024CC}.Release|x64.ActiveCfg = Release|Any CPU
{B1FFBC3C-F71C-40B7-A04B-BE708AA024CC}.Release|x64.Build.0 = Release|Any CPU
{B1FFBC3C-F71C-40B7-A04B-BE708AA024CC}.Release|x86.ActiveCfg = Release|Any CPU
{C1410D27-425C-4C35-89E3-1281F95183E2}.Debug|Any CPU.ActiveCfg = Debug|x86
{C1410D27-425C-4C35-89E3-1281F95183E2}.Debug|Any CPU.Build.0 = Debug|x86
{C1410D27-425C-4C35-89E3-1281F95183E2}.Debug|x64.ActiveCfg = Debug|Any CPU
{C1410D27-425C-4C35-89E3-1281F95183E2}.Debug|x64.Build.0 = Debug|Any CPU
{C1410D27-425C-4C35-89E3-1281F95183E2}.Debug|x86.ActiveCfg = Debug|x86
{C1410D27-425C-4C35-89E3-1281F95183E2}.Release|Any CPU.ActiveCfg = Release|x86
{C1410D27-425C-4C35-89E3-1281F95183E2}.Release|Any CPU.Build.0 = Release|x86
{C1410D27-425C-4C35-89E3-1281F95183E2}.Release|x64.ActiveCfg = Release|Any CPU
{C1410D27-425C-4C35-89E3-1281F95183E2}.Release|x64.Build.0 = Release|Any CPU
{C1410D27-425C-4C35-89E3-1281F95183E2}.Release|x86.ActiveCfg = Release|Any CPU
{FC30A198-4213-404F-8526-D7BE5D49E57D}.Debug|Any CPU.ActiveCfg = Debug|x86
{FC30A198-4213-404F-8526-D7BE5D49E57D}.Debug|Any CPU.Build.0 = Debug|x86
{FC30A198-4213-404F-8526-D7BE5D49E57D}.Debug|x86.ActiveCfg = Debug|Any CPU
{FC30A198-4213-404F-8526-D7BE5D49E57D}.Release|Any CPU.ActiveCfg = Release|x86
{FC30A198-4213-404F-8526-D7BE5D49E57D}.Release|Any CPU.Build.0 = Release|x86
{FC30A198-4213-404F-8526-D7BE5D49E57D}.Release|x86.ActiveCfg = Release|Any CPU
{7CCC5A5F-14C3-4BA3-998B-D4177085BFEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7CCC5A5F-14C3-4BA3-998B-D4177085BFEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7CCC5A5F-14C3-4BA3-998B-D4177085BFEB}.Debug|x64.ActiveCfg = Debug|Any CPU
{7CCC5A5F-14C3-4BA3-998B-D4177085BFEB}.Debug|x64.Build.0 = Debug|Any CPU
{7CCC5A5F-14C3-4BA3-998B-D4177085BFEB}.Debug|x86.ActiveCfg = Debug|Any CPU
{7CCC5A5F-14C3-4BA3-998B-D4177085BFEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7CCC5A5F-14C3-4BA3-998B-D4177085BFEB}.Release|Any CPU.Build.0 = Release|Any CPU
{7CCC5A5F-14C3-4BA3-998B-D4177085BFEB}.Release|x64.ActiveCfg = Release|Any CPU
{7CCC5A5F-14C3-4BA3-998B-D4177085BFEB}.Release|x64.Build.0 = Release|Any CPU
{7CCC5A5F-14C3-4BA3-998B-D4177085BFEB}.Release|x86.ActiveCfg = Release|Any CPU
{C50C772A-53FE-4677-9A27-38F4050F3D90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C50C772A-53FE-4677-9A27-38F4050F3D90}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C50C772A-53FE-4677-9A27-38F4050F3D90}.Debug|x64.ActiveCfg = Debug|Any CPU
{C50C772A-53FE-4677-9A27-38F4050F3D90}.Debug|x64.Build.0 = Debug|Any CPU
{C50C772A-53FE-4677-9A27-38F4050F3D90}.Debug|x86.ActiveCfg = Debug|Any CPU
{C50C772A-53FE-4677-9A27-38F4050F3D90}.Debug|x86.Build.0 = Debug|Any CPU
{C50C772A-53FE-4677-9A27-38F4050F3D90}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C50C772A-53FE-4677-9A27-38F4050F3D90}.Release|Any CPU.Build.0 = Release|Any CPU
{C50C772A-53FE-4677-9A27-38F4050F3D90}.Release|x64.ActiveCfg = Release|Any CPU
{C50C772A-53FE-4677-9A27-38F4050F3D90}.Release|x64.Build.0 = Release|Any CPU
{C50C772A-53FE-4677-9A27-38F4050F3D90}.Release|x86.ActiveCfg = Release|Any CPU
{C50C772A-53FE-4677-9A27-38F4050F3D90}.Release|x86.Build.0 = Release|Any CPU
{E67AC071-4E51-4CF3-BA0E-2796BAFA47A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E67AC071-4E51-4CF3-BA0E-2796BAFA47A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E67AC071-4E51-4CF3-BA0E-2796BAFA47A5}.Debug|x64.ActiveCfg = Debug|Any CPU
{E67AC071-4E51-4CF3-BA0E-2796BAFA47A5}.Debug|x64.Build.0 = Debug|Any CPU
{E67AC071-4E51-4CF3-BA0E-2796BAFA47A5}.Debug|x86.ActiveCfg = Debug|Any CPU
{E67AC071-4E51-4CF3-BA0E-2796BAFA47A5}.Debug|x86.Build.0 = Debug|Any CPU
{E67AC071-4E51-4CF3-BA0E-2796BAFA47A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E67AC071-4E51-4CF3-BA0E-2796BAFA47A5}.Release|Any CPU.Build.0 = Release|Any CPU
{E67AC071-4E51-4CF3-BA0E-2796BAFA47A5}.Release|x64.ActiveCfg = Release|Any CPU
{E67AC071-4E51-4CF3-BA0E-2796BAFA47A5}.Release|x64.Build.0 = Release|Any CPU
{E67AC071-4E51-4CF3-BA0E-2796BAFA47A5}.Release|x86.ActiveCfg = Release|Any CPU
{E67AC071-4E51-4CF3-BA0E-2796BAFA47A5}.Release|x86.Build.0 = Release|Any CPU
{5686FF51-8DC6-41C9-8802-55F01876BAD4}.Debug|Any CPU.ActiveCfg = Debug
{5686FF51-8DC6-41C9-8802-55F01876BAD4}.Debug|x64.ActiveCfg = Debug
{5686FF51-8DC6-41C9-8802-55F01876BAD4}.Debug|x64.Build.0 = Debug
{5686FF51-8DC6-41C9-8802-55F01876BAD4}.Debug|x86.ActiveCfg = Debug
{5686FF51-8DC6-41C9-8802-55F01876BAD4}.Release|Any CPU.ActiveCfg = Release
{5686FF51-8DC6-41C9-8802-55F01876BAD4}.Release|x64.ActiveCfg = Release
{5686FF51-8DC6-41C9-8802-55F01876BAD4}.Release|x64.Build.0 = Release
{5686FF51-8DC6-41C9-8802-55F01876BAD4}.Release|x86.ActiveCfg = Release
{12D01BD2-E8B1-4F4A-8C24-63B06F7F413D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{12D01BD2-E8B1-4F4A-8C24-63B06F7F413D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{12D01BD2-E8B1-4F4A-8C24-63B06F7F413D}.Debug|x64.ActiveCfg = Debug|Any CPU
{12D01BD2-E8B1-4F4A-8C24-63B06F7F413D}.Debug|x64.Build.0 = Debug|Any CPU
{12D01BD2-E8B1-4F4A-8C24-63B06F7F413D}.Debug|x86.ActiveCfg = Debug|Any CPU
{12D01BD2-E8B1-4F4A-8C24-63B06F7F413D}.Debug|x86.Build.0 = Debug|Any CPU
{12D01BD2-E8B1-4F4A-8C24-63B06F7F413D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{12D01BD2-E8B1-4F4A-8C24-63B06F7F413D}.Release|Any CPU.Build.0 = Release|Any CPU
{12D01BD2-E8B1-4F4A-8C24-63B06F7F413D}.Release|x64.ActiveCfg = Release|Any CPU
{12D01BD2-E8B1-4F4A-8C24-63B06F7F413D}.Release|x64.Build.0 = Release|Any CPU
{12D01BD2-E8B1-4F4A-8C24-63B06F7F413D}.Release|x86.ActiveCfg = Release|Any CPU
{12D01BD2-E8B1-4F4A-8C24-63B06F7F413D}.Release|x86.Build.0 = Release|Any CPU
{0B762BEC-03A3-4ACD-AB86-92C970B26722}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0B762BEC-03A3-4ACD-AB86-92C970B26722}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0B762BEC-03A3-4ACD-AB86-92C970B26722}.Debug|x64.ActiveCfg = Debug|Any CPU
{0B762BEC-03A3-4ACD-AB86-92C970B26722}.Debug|x64.Build.0 = Debug|Any CPU
{0B762BEC-03A3-4ACD-AB86-92C970B26722}.Debug|x86.ActiveCfg = Debug|Any CPU
{0B762BEC-03A3-4ACD-AB86-92C970B26722}.Debug|x86.Build.0 = Debug|Any CPU
{0B762BEC-03A3-4ACD-AB86-92C970B26722}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0B762BEC-03A3-4ACD-AB86-92C970B26722}.Release|Any CPU.Build.0 = Release|Any CPU
{0B762BEC-03A3-4ACD-AB86-92C970B26722}.Release|x64.ActiveCfg = Release|Any CPU
{0B762BEC-03A3-4ACD-AB86-92C970B26722}.Release|x64.Build.0 = Release|Any CPU
{0B762BEC-03A3-4ACD-AB86-92C970B26722}.Release|x86.ActiveCfg = Release|Any CPU
{0B762BEC-03A3-4ACD-AB86-92C970B26722}.Release|x86.Build.0 = Release|Any CPU
{C23FDED6-0D07-42C6-BA3A-F0E9B5C1D592}.Debug|Any CPU.ActiveCfg = Debug|x86
{C23FDED6-0D07-42C6-BA3A-F0E9B5C1D592}.Debug|Any CPU.Build.0 = Debug|x86
{C23FDED6-0D07-42C6-BA3A-F0E9B5C1D592}.Debug|x64.ActiveCfg = Debug|x64
{C23FDED6-0D07-42C6-BA3A-F0E9B5C1D592}.Debug|x64.Build.0 = Debug|x64
{C23FDED6-0D07-42C6-BA3A-F0E9B5C1D592}.Debug|x86.ActiveCfg = Debug|x86
{C23FDED6-0D07-42C6-BA3A-F0E9B5C1D592}.Debug|x86.Build.0 = Debug|x86
{C23FDED6-0D07-42C6-BA3A-F0E9B5C1D592}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C23FDED6-0D07-42C6-BA3A-F0E9B5C1D592}.Release|Any CPU.Build.0 = Release|Any CPU
{C23FDED6-0D07-42C6-BA3A-F0E9B5C1D592}.Release|x64.ActiveCfg = Release|x64
{C23FDED6-0D07-42C6-BA3A-F0E9B5C1D592}.Release|x64.Build.0 = Release|x64
{C23FDED6-0D07-42C6-BA3A-F0E9B5C1D592}.Release|x86.ActiveCfg = Release|x86
{C23FDED6-0D07-42C6-BA3A-F0E9B5C1D592}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
4 changes: 3 additions & 1 deletion Client/EJTests/ApiESITests.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using System;
using EveJimaCore;
using EveJimaIGB;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace EJTests
Expand All @@ -9,7 +11,7 @@ public class ApiESITests
[TestMethod]
public void TestMethod1()
{

var a = Zkillboard.GetZkillboardUrlByName("Nix Axer");
}
}
}
50 changes: 50 additions & 0 deletions Client/EJTests/ApiZKillboardTests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
using EveJimaCore;
using log4net;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace EJTests
{
[TestClass]
public class ApiZKillboardTests
{
private ILog logger = LogManager.GetLogger(typeof(ApiZKillboardTests));

[TestMethod]
public void TestMethod1()
{
log4net.Config.XmlConfigurator.Configure();

var pilotExist = ZKillboardApi.IsCharacter("2112098220", logger);

Assert.IsTrue(pilotExist);

var pilotNotExist = ZKillboardApi.IsCharacter("21120982209121312312", logger);

Assert.IsFalse(pilotNotExist);

var corporationExist = ZKillboardApi.IsCorporation("98459743", logger);

Assert.IsTrue(corporationExist);

var corporationNotExist = ZKillboardApi.IsCorporation("98459743500352", logger);

Assert.IsFalse(corporationNotExist);

var solarSystemExist = ZKillboardApi.IsSolarSystem("30002187", logger);

Assert.IsTrue(solarSystemExist);

var solarSystemNotExist = ZKillboardApi.IsSolarSystem("3000218712312312", logger);

Assert.IsFalse(solarSystemNotExist);

var allianceExist = ZKillboardApi.IsAlliance("1354830081", logger);

Assert.IsTrue(allianceExist);

var allianceNotExist = ZKillboardApi.IsAlliance("1354830081313213123", logger);

Assert.IsFalse(allianceNotExist);
}
}
}
8 changes: 8 additions & 0 deletions Client/EJTests/EJTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,17 @@
</Choose>
<ItemGroup>
<Compile Include="ApiServerTests.cs" />
<Compile Include="EjEnvironment\Clipboard_Tests.cs" />
<Compile Include="InfrastructureTests.cs" />
<Compile Include="MapTests.cs" />
<Compile Include="MapViewTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ToolsTests.cs" />
<Compile Include="ApiESITests.cs" />
<Compile Include="PathFinderTests.cs" />
<Compile Include="ApiZKillboardTests.cs" />
<Compile Include="InterceptorTests.cs" />
<Compile Include="InternalBrowserTests.cs" />
<Compile Include="ZeroHunterTests.cs" />
<Compile Include="UniverseTests.cs" />
</ItemGroup>
Expand All @@ -86,6 +90,10 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\EveJimaIGB\EveJimaIGB\EveInternalBrowser\EveInternalBrowser.csproj">
<Project>{C23FDED6-0D07-42C6-BA3A-F0E9B5C1D592}</Project>
<Name>EveInternalBrowser</Name>
</ProjectReference>
<ProjectReference Include="..\EvaJimaCore\EveJimaCore.csproj">
<Project>{c1410d27-425c-4c35-89e3-1281f95183e2}</Project>
<Name>EveJimaCore</Name>
Expand Down
40 changes: 40 additions & 0 deletions Client/EJTests/EjEnvironment/Clipboard_Tests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
using System.Windows.Forms;
using EveJimaCore.EjEnvironment;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace EJTests.EjEnvironment
{
[TestClass]
public class ClipboardTests
{
[TestMethod]
public void Test_SetValue()
{
var clipboard = new ClipboardEntity();

Clipboard.SetText("Test1");

var clipboardString = clipboard.GetValue();

Assert.AreEqual("Test1", clipboardString);
}

[TestMethod]
public void Test_GetPreviousValue()
{
var clipboard = new ClipboardEntity();

Clipboard.SetText("Test1");

clipboard.GetValue();

Clipboard.SetText("Test2");

clipboard.GetValue();

var clipboardString = clipboard.GetPreviousValue();

Assert.AreEqual("Test1", clipboardString);
}
}
}
19 changes: 19 additions & 0 deletions Client/EJTests/InterceptorTests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using System;
using EveJimaCore.BLL.Browser;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace EJTests
{
[TestClass]
public class InterceptorTests
{
[TestMethod]
public void FullFlow()
{
var interceptor = new Interceptor(true);

interceptor.StartIntercepting();
interceptor.StopIntercepting();
}
}
}
19 changes: 19 additions & 0 deletions Client/EJTests/InternalBrowserTests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using System;
using EveJimaCore;

using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace EJTests
{
[TestClass]
public class InternalBrowserTests
{
[TestMethod]
public void CreateInternalBrowserTest()
{
//var internalBrowser = new InternalWebBrowser();

//Assert.IsTrue(internalBrowser.U);
}
}
}
6 changes: 3 additions & 3 deletions Client/EJTests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
// [assembly: AssemblyVersion("4.3.*")]
[assembly: AssemblyVersion("4.3.*")]
[assembly: AssemblyFileVersion("4.3.*")]
13 changes: 13 additions & 0 deletions Client/EvaJima/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,23 @@
<appSettings>
<add key="SolarSystemTTL" value="24" />
<add key="ClientSettingsProvider.ServiceUri" value="" />

<!--
# Set the internal browser type
# [chromiumWebBrowser] => default rich browser from "The CefSharp Authors" https://raw.githubusercontent.com/cefsharp/CefSharp/master/LICENSE
# [netWebBrowser] => Net web browser control. Select if have crash om start application
-->
<add key="BrowserType" value="chromiumWebBrowser" />
<!--
# Production: EVE -
# Tests: Form1
-->
<add key="EveOnlineTitle" value="EVE -" />
</appSettings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
</startup>

<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
Expand Down
Loading

0 comments on commit 5375edc

Please sign in to comment.