From 463a0c56dcdd6ae18944156231bb239cbd69fea4 Mon Sep 17 00:00:00 2001
From: Andrew Blakely <andrew.blakely@ymail.com>
Date: Mon, 3 Aug 2015 22:17:14 -0500
Subject: [PATCH] Fixed failing test. Changed generic type name.

For more info on change, why test failed and how to avoid it again see:
https://github.com/castleproject/Core/issues/106
---
 src/GladNet.Common/GladNet.Common.csproj       | 10 +++++++++-
 .../Network/Peer/ConcretePeers/ClientPeer.cs   | 18 +++++++++---------
 .../GladNet.Common.Tests.csproj                |  8 +++-----
 .../UnitTests/Peers/ClientPeerTests.cs         |  3 ++-
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/GladNet.Common/GladNet.Common.csproj b/src/GladNet.Common/GladNet.Common.csproj
index 9b20759..be757b8 100644
--- a/src/GladNet.Common/GladNet.Common.csproj
+++ b/src/GladNet.Common/GladNet.Common.csproj
@@ -11,6 +11,8 @@
     <AssemblyName>GladNet.Common</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,8 +70,14 @@
     <Compile Include="Packet\PacketPayload.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/GladNet.Common/Network/Peer/ConcretePeers/ClientPeer.cs b/src/GladNet.Common/Network/Peer/ConcretePeers/ClientPeer.cs
index 65d2a55..b5b087e 100644
--- a/src/GladNet.Common/Network/Peer/ConcretePeers/ClientPeer.cs
+++ b/src/GladNet.Common/Network/Peer/ConcretePeers/ClientPeer.cs
@@ -9,26 +9,26 @@ namespace GladNet.Common
 {
 	public abstract class ClientPeer : Peer, IClientMessageSender
 	{
-		public sealed override bool CanSend(NetworkMessage.OperationType opType)
+		public override bool CanSend(NetworkMessage.OperationType opType)
 		{
 			return opType == NetworkMessage.OperationType.Request;
 		}
 
 		#region Message Senders
 		[SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed")]
-		public NetworkMessage.SendResult SendRequest<TRequestPacketType>(TRequestPacketType payload, NetworkMessage.DeliveryMethod deliveryMethod, bool encrypt = false, byte channel = 0)
-			where TRequestPacketType : PacketPayload, IRequestPayload
+		public NetworkMessage.SendResult SendRequest<TRequestPacket>(TRequestPacket payload, NetworkMessage.DeliveryMethod deliveryMethod, bool encrypt = false, byte channel = 0)
+			where TRequestPacket : PacketPayload, IRequestPayload
 		{
 			throw new NotImplementedException();
 		}
 
-		[SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed")]
+		/*[SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed")]
 		public NetworkMessage.SendResult SendRequest(PacketPayload payload, IRequestPayload requestParameters, NetworkMessage.DeliveryMethod deliveryMethod, bool encrypt = false, byte channel = 0)
 		{
 			throw new NotImplementedException();
-		}
+		}*/
 
-		protected sealed override void OnReceiveRequest(IRequestMessage message, IMessageParameters parameters)
+		protected override void OnReceiveRequest(IRequestMessage message, IMessageParameters parameters)
 		{
 			//ClientPeers don't handle requests. They send them.
 			//If this is occuring in live production it is the result of likely packet forging.
@@ -45,14 +45,14 @@ protected virtual void OnInvalidOperationRecieved(Type packetType, IMessageParam
 
 		//We can override because we no this is invalid.
 		[SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed")]
-		public sealed override NetworkMessage.SendResult TrySendMessage(PacketPayload payload, IEventPayload eventParameters, NetworkMessage.DeliveryMethod deliveryMethod, bool encrypt = false, byte channel = 0)
+		public override NetworkMessage.SendResult TrySendMessage(PacketPayload payload, IEventPayload eventParameters, NetworkMessage.DeliveryMethod deliveryMethod, bool encrypt = false, byte channel = 0)
 		{
 			//TODO: Logging.
 			return NetworkMessage.SendResult.Invalid;
 		}
 
 		[SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed")]
-		public sealed override NetworkMessage.SendResult TrySendMessage(PacketPayload payload, IResponsePayload responseParameters, NetworkMessage.DeliveryMethod deliveryMethod, bool encrypt = false, byte channel = 0)
+		public override NetworkMessage.SendResult TrySendMessage(PacketPayload payload, IResponsePayload responseParameters, NetworkMessage.DeliveryMethod deliveryMethod, bool encrypt = false, byte channel = 0)
 		{
 			//TODO: Logging.
 			return NetworkMessage.SendResult.Invalid;
@@ -60,7 +60,7 @@ public sealed override NetworkMessage.SendResult TrySendMessage(PacketPayload pa
 
 		[SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed")]
 		//We can skip checks for efficiency and send directly.
-		public sealed override NetworkMessage.SendResult TrySendMessage(PacketPayload payload, IRequestPayload requestParameters, NetworkMessage.DeliveryMethod deliveryMethod, bool encrypt = false, byte channel = 0)
+		public override NetworkMessage.SendResult TrySendMessage(PacketPayload payload, IRequestPayload requestParameters, NetworkMessage.DeliveryMethod deliveryMethod, bool encrypt = false, byte channel = 0)
 		{
 			//TODO: Implement sending.
 			throw new NotImplementedException();
diff --git a/tests/GladNet.Common.Tests/GladNet.Common.Tests.csproj b/tests/GladNet.Common.Tests/GladNet.Common.Tests.csproj
index 57f20e4..2836f80 100644
--- a/tests/GladNet.Common.Tests/GladNet.Common.Tests.csproj
+++ b/tests/GladNet.Common.Tests/GladNet.Common.Tests.csproj
@@ -34,10 +34,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\moq4\Source\bin\Debug\Castle.Core.dll</HintPath>
-    </Reference>
     <Reference Include="Lidgren.Network">
       <HintPath>..\..\lib\Dependency Builds\Lidgren\DLLs\Lidgren.Network.dll</HintPath>
     </Reference>
@@ -67,7 +63,9 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\GladNet.Common\GladNet.Common.csproj">
       <Project>{9603bbaf-5f68-4176-a032-3e8beaf8f9e2}</Project>
diff --git a/tests/GladNet.Common.Tests/UnitTests/Peers/ClientPeerTests.cs b/tests/GladNet.Common.Tests/UnitTests/Peers/ClientPeerTests.cs
index 9327b8c..5c80157 100644
--- a/tests/GladNet.Common.Tests/UnitTests/Peers/ClientPeerTests.cs
+++ b/tests/GladNet.Common.Tests/UnitTests/Peers/ClientPeerTests.cs
@@ -17,9 +17,10 @@ public static void Test_CanSend_IsRequest()
 			//arrange
 			Mock<ClientPeer> peer = new Mock<ClientPeer>();
 			peer.CallBase = true;
+			//peer.Setup
 
 			//act
-			bool result = peer.Object.CanSend(NetworkMessage.OperationType.Request); //peer.As<INetPeer>().Object.CanSend(NetworkMessage.OperationType.Request);
+			bool result = peer.Object.CanSend(NetworkMessage.OperationType.Request);
 
 			//assert
 			Assert.IsTrue(result);