Seperated out stream and interface decls

Author: craigminihan

HttpWebClient.UnitTests/TestHttpWebClientRequestStream.cs

@@ -155,7 +155,7 @@ public void TestInnerRequestStreamWriteThrows()
  [Fact]
  public void TestInitializedChunkedRequestStream()
  {
- using (var stream = new HttpWebClientRequestStream.ChunkedRequestStream(new MemoryStream()))
+ using (var stream = new HttpWebClientChunkedRequestStream(new MemoryStream()))
  {
  Assert.False(stream.CanRead);
  Assert.True(stream.CanWrite);
@@ -178,7 +178,7 @@ public void TestChunkedRequestStreamSimpleWrite()
  var memStream = new NonDisposibleStream(new MemoryStream());
  var position = 0;
 
- using (var stream = new HttpWebClientRequestStream.ChunkedRequestStream(memStream))
+ using (var stream = new HttpWebClientChunkedRequestStream(memStream))
  {
  Assert.Equal(0, stream.Length);
  Assert.Equal(0, stream.Position);
@@ -216,7 +216,7 @@ public void TestChunkedRequestStreamWrite()
  var chunkInfo = CalculateChunkInfo(_buffer.Length);
  var memStream = new NonDisposibleStream(new MemoryStream());
 
- using (var stream = new HttpWebClientRequestStream.ChunkedRequestStream(memStream))
+ using (var stream = new HttpWebClientChunkedRequestStream(memStream))
  {
  Assert.Equal(0, stream.Length);
  Assert.Equal(0, stream.Position);
@@ -453,10 +453,10 @@ public void TestRequestStreamHeaderWriteThrows()
  #region Private methods
  private static ChunkedRequestInfo CalculateChunkInfo(int written)
  {
- var chunks = written / HttpWebClientRequestStream.ChunkedRequestStream.MaxRequestChunkSize;
- var padding = chunks * (HttpWebClientRequestStream.ChunkedRequestStream.MaxRequestChunkSize.ToString("X").Length + 4);
+ var chunks = written / HttpWebClientChunkedRequestStream.MaxRequestChunkSize;
+ var padding = chunks * (HttpWebClientChunkedRequestStream.MaxRequestChunkSize.ToString("X").Length + 4);
 
- var lastChunkSize = written % HttpWebClientRequestStream.ChunkedRequestStream.MaxRequestChunkSize;
+ var lastChunkSize = written % HttpWebClientChunkedRequestStream.MaxRequestChunkSize;
  chunks += lastChunkSize > 0 ? 1 : 0;
 
  padding += lastChunkSize > 0 ? lastChunkSize.ToString("X").Length + 2 : 0;

HttpWebClient/HttpWebClient.csproj

@@ -35,19 +35,26 @@
  <ItemGroup>
  <Compile Include="HttpWebClientBootstrap.cs" />
  <Compile Include="HttpWebClientContainer.cs" />
+ <Compile Include="Interfaces\IHttpWebClientResponseStream.cs" />
+ <Compile Include="Interfaces\IHttpWebClientSocket.cs" />
  <Compile Include="Properties\AssemblyInfo.cs" />
  <Compile Include="HttpWebClientException.cs" />
  <Compile Include="HttpWebClientHeaders.cs" />
  <Compile Include="HttpWebClientRequest.cs" />
- <Compile Include="HttpWebClientRequestStream.cs" />
+ <Compile Include="Streams\HttpWebClientChunkedRequestStream.cs" />
+ <Compile Include="Streams\HttpWebClientChunkedResponseStream.cs" />
+ <Compile Include="Streams\HttpWebClientDeflateResponseStream.cs" />
+ <Compile Include="Streams\HttpWebClientGZipResponseStream.cs" />
+ <Compile Include="Streams\HttpWebClientRequestStream.cs" />
  <Compile Include="HttpWebClientResponse.cs" />
- <Compile Include="HttpWebClientResponseStream.cs" />
+ <Compile Include="Streams\HttpWebClientResponseStream.cs" />
  <Compile Include="HttpWebClientSocket.cs" />
  <Compile Include="HttpWebClientSocketCache.cs" />
  <Compile Include="HttpWebClientStatusCode.cs" />
  </ItemGroup>
  <ItemGroup>
  <None Include="packages.config" />
  </ItemGroup>
+ <ItemGroup />
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>