You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by je...@apache.org on 2015/09/30 23:38:35 UTC
[1/2] thrift git commit: THRIFT-3361 Improve C# library Client: C#
Patch: Nobuaki Sukegawa
Repository: thrift
Updated Branches:
refs/heads/master 60aa640c3 -> 96409d9df
THRIFT-3361 Improve C# library
Client: C#
Patch: Nobuaki Sukegawa <ns...@gmail.com>
This closes #630
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/178b813a
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/178b813a
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/178b813a
Branch: refs/heads/master
Commit: 178b813acd6dd3e334b88386be938415d9f3bf97
Parents: 60aa640
Author: Jens Geyer <je...@apache.org>
Authored: Wed Sep 30 23:16:45 2015 +0200
Committer: Jens Geyer <je...@apache.org>
Committed: Wed Sep 30 23:16:45 2015 +0200
----------------------------------------------------------------------
compiler/cpp/src/generate/t_csharp_generator.cc | 67 ++-
lib/csharp/Makefile.am | 2 +-
lib/csharp/src/Transport/TBufferedTransport.cs | 157 +++---
lib/csharp/src/Transport/TFramedTransport.cs | 86 ++--
lib/csharp/src/Transport/TTLSSocket.cs | 25 +-
lib/csharp/src/Transport/TTransport.cs | 15 +-
lib/csharp/test/ThriftTest/Makefile.am | 2 +-
lib/csharp/test/ThriftTest/Program.cs | 2 +-
lib/csharp/test/ThriftTest/TestClient.cs | 487 ++++++++++++++-----
lib/csharp/test/ThriftTest/TestServer.cs | 26 +-
test/known_failures_Linux.json | 89 ----
test/tests.json | 6 +-
12 files changed, 613 insertions(+), 351 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/178b813a/compiler/cpp/src/generate/t_csharp_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_csharp_generator.cc b/compiler/cpp/src/generate/t_csharp_generator.cc
index 6a21801..41d0ffd 100644
--- a/compiler/cpp/src/generate/t_csharp_generator.cc
+++ b/compiler/cpp/src/generate/t_csharp_generator.cc
@@ -1943,8 +1943,9 @@ void t_csharp_generator::generate_process_function(t_service* tservice, t_functi
string argsname = tfunction->get_name() + "_args";
string resultname = tfunction->get_name() + "_result";
- f_service_ << indent() << argsname << " args = new " << argsname << "();" << endl << indent()
- << "args.Read(iprot);" << endl << indent() << "iprot.ReadMessageEnd();" << endl;
+ f_service_ << indent() << argsname << " args = new " << argsname << "();" << endl
+ << indent() << "args.Read(iprot);" << endl
+ << indent() << "iprot.ReadMessageEnd();" << endl;
t_struct* xs = tfunction->get_xceptions();
const std::vector<t_field*>& xceptions = xs->get_members();
@@ -1954,8 +1955,13 @@ void t_csharp_generator::generate_process_function(t_service* tservice, t_functi
f_service_ << indent() << resultname << " result = new " << resultname << "();" << endl;
}
+ f_service_ << indent() << "try" << endl
+ << indent() << "{" << endl;
+ indent_up();
+
if (xceptions.size() > 0) {
- f_service_ << indent() << "try {" << endl;
+ f_service_ << indent() << "try" << endl
+ << indent() << "{" << endl;
indent_up();
}
@@ -1984,38 +1990,55 @@ void t_csharp_generator::generate_process_function(t_service* tservice, t_functi
cleanup_member_name_mapping(arg_struct);
f_service_ << ");" << endl;
- if (!tfunction->is_oneway() && xceptions.size() > 0) {
+ prepare_member_name_mapping(xs, xs->get_members(), resultname);
+ if (xceptions.size() > 0) {
indent_down();
- f_service_ << indent() << "}";
- prepare_member_name_mapping(xs, xs->get_members(), resultname);
+ f_service_ << indent() << "}" << endl;
for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
- f_service_ << " catch (" << type_name((*x_iter)->get_type(), false, false) << " "
- << (*x_iter)->get_name() << ") {" << endl;
+ f_service_ << indent() << "catch (" << type_name((*x_iter)->get_type(), false, false) << " "
+ << (*x_iter)->get_name() << ")" << endl
+ << indent() << "{" << endl;
if (!tfunction->is_oneway()) {
indent_up();
f_service_ << indent() << "result." << prop_name(*x_iter) << " = " << (*x_iter)->get_name()
<< ";" << endl;
indent_down();
- f_service_ << indent() << "}";
- } else {
- f_service_ << "}";
}
+ f_service_ << indent() << "}" << endl;
}
- cleanup_member_name_mapping(xs);
- f_service_ << endl;
}
+ if (!tfunction->is_oneway()) {
+ f_service_ << indent() << "oprot.WriteMessageBegin(new TMessage(\"" << tfunction->get_name()
+ << "\", TMessageType.Reply, seqid)); " << endl;
+ f_service_ << indent() << "result.Write(oprot);" << endl;
+ }
+ indent_down();
- if (tfunction->is_oneway()) {
- f_service_ << indent() << "return;" << endl;
- scope_down(f_service_);
+ cleanup_member_name_mapping(xs);
- return;
- }
+ f_service_ << indent() << "}" << endl
+ << indent() << "catch (TTransportException)" << endl
+ << indent() << "{" << endl
+ << indent() << " throw;" << endl
+ << indent() << "}" << endl
+ << indent() << "catch (Exception ex)" << endl
+ << indent() << "{" << endl
+ << indent() << " Console.Error.WriteLine(\"Error occurred in processor:\");" << endl
+ << indent() << " Console.Error.WriteLine(ex.ToString());" << endl;
- f_service_ << indent() << "oprot.WriteMessageBegin(new TMessage(\"" << tfunction->get_name()
- << "\", TMessageType.Reply, seqid)); " << endl << indent() << "result.Write(oprot);"
- << endl << indent() << "oprot.WriteMessageEnd();" << endl << indent()
- << "oprot.Transport.Flush();" << endl;
+ if (tfunction->is_oneway()) {
+ f_service_ << indent() << "}" << endl;
+ } else {
+ f_service_ << indent() << " TApplicationException x = new TApplicationException" << indent()
+ << "(TApplicationException.ExceptionType.InternalError,\" Internal error.\");"
+ << endl
+ << indent() << " oprot.WriteMessageBegin(new TMessage(\"" << tfunction->get_name()
+ << "\", TMessageType.Exception, seqid));" << endl
+ << indent() << " x.Write(oprot);" << endl
+ << indent() << "}" << endl;
+ f_service_ << indent() << "oprot.WriteMessageEnd();" << endl
+ << indent() << "oprot.Transport.Flush();" << endl;
+ }
scope_down(f_service_);
http://git-wip-us.apache.org/repos/asf/thrift/blob/178b813a/lib/csharp/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/csharp/Makefile.am b/lib/csharp/Makefile.am
index 611405d..a8b275e 100644
--- a/lib/csharp/Makefile.am
+++ b/lib/csharp/Makefile.am
@@ -87,7 +87,7 @@ Thrift.dll: $(THRIFTCODE)
clean-local:
$(RM) Thrift.dll
-precross:
+precross: all-local
$(MAKE) -C test/ThriftTest precross
# run csharp tests?
http://git-wip-us.apache.org/repos/asf/thrift/blob/178b813a/lib/csharp/src/Transport/TBufferedTransport.cs
----------------------------------------------------------------------
diff --git a/lib/csharp/src/Transport/TBufferedTransport.cs b/lib/csharp/src/Transport/TBufferedTransport.cs
index 89b9ca7..e88800f 100644
--- a/lib/csharp/src/Transport/TBufferedTransport.cs
+++ b/lib/csharp/src/Transport/TBufferedTransport.cs
@@ -22,105 +22,144 @@ using System.IO;
namespace Thrift.Transport
{
- public class TBufferedTransport : TTransport, IDisposable
+ public class TBufferedTransport : TTransport, IDisposable
{
- private BufferedStream inputBuffer;
- private BufferedStream outputBuffer;
- private int bufSize;
- private TStreamTransport transport;
+ private readonly int bufSize;
+ private readonly MemoryStream inputBuffer = new MemoryStream(0);
+ private readonly MemoryStream outputBuffer = new MemoryStream(0);
+ private readonly TTransport transport;
- public TBufferedTransport(TStreamTransport transport)
- :this(transport, 1024)
+ public TBufferedTransport(TTransport transport, int bufSize = 1024)
{
-
- }
-
- public TBufferedTransport(TStreamTransport transport, int bufSize)
- {
- this.bufSize = bufSize;
+ if (transport == null)
+ throw new ArgumentNullException("transport");
+ if (bufSize <= 0)
+ throw new ArgumentException("bufSize", "Buffer size must be a positive number.");
this.transport = transport;
- InitBuffers();
+ this.bufSize = bufSize;
}
- private void InitBuffers()
+ public TTransport UnderlyingTransport
{
- if (transport.InputStream != null)
- {
- inputBuffer = new BufferedStream(transport.InputStream, bufSize);
- }
- if (transport.OutputStream != null)
+ get
{
- outputBuffer = new BufferedStream(transport.OutputStream, bufSize);
+ CheckNotDisposed();
+ return transport;
}
}
- private void CloseBuffers()
+ public override bool IsOpen
{
- if (inputBuffer != null && inputBuffer.CanRead)
- {
- inputBuffer.Close();
- }
- if (outputBuffer != null && outputBuffer.CanWrite)
+ get
{
- outputBuffer.Close();
+ // We can legitimately throw here but be nice a bit.
+ // CheckNotDisposed();
+ return !_IsDisposed && transport.IsOpen;
}
}
- public TTransport UnderlyingTransport
- {
- get { return transport; }
- }
-
- public override bool IsOpen
- {
- get { return transport.IsOpen; }
- }
-
public override void Open()
{
+ CheckNotDisposed();
transport.Open();
- InitBuffers();
}
public override void Close()
{
- CloseBuffers();
+ CheckNotDisposed();
transport.Close();
}
public override int Read(byte[] buf, int off, int len)
{
- return inputBuffer.Read(buf, off, len);
+ CheckNotDisposed();
+ ValidateBufferArgs(buf, off, len);
+ if (!IsOpen)
+ throw new InvalidOperationException("Transport is not open.");
+ if (inputBuffer.Capacity < bufSize)
+ inputBuffer.Capacity = bufSize;
+ int got = inputBuffer.Read(buf, off, len);
+ if (got > 0)
+ return got;
+
+ inputBuffer.Seek(0, SeekOrigin.Begin);
+ inputBuffer.SetLength(inputBuffer.Capacity);
+ int filled = transport.Read(inputBuffer.GetBuffer(), 0, (int)inputBuffer.Length);
+ inputBuffer.SetLength(filled);
+ if (filled == 0)
+ return 0;
+ return Read(buf, off, len);
}
public override void Write(byte[] buf, int off, int len)
{
- outputBuffer.Write(buf, off, len);
+ CheckNotDisposed();
+ ValidateBufferArgs(buf, off, len);
+ if (!IsOpen)
+ throw new InvalidOperationException("Transport is not open.");
+ // Relative offset from "off" argument
+ int offset = 0;
+ if (outputBuffer.Length > 0)
+ {
+ int capa = (int)(outputBuffer.Capacity - outputBuffer.Length);
+ int writeSize = capa <= len ? capa : len;
+ outputBuffer.Write(buf, off, writeSize);
+ offset += writeSize;
+ if (writeSize == capa)
+ {
+ transport.Write(outputBuffer.GetBuffer(), 0, (int)outputBuffer.Length);
+ outputBuffer.SetLength(0);
+ }
+ }
+ while (len - offset >= bufSize)
+ {
+ transport.Write(buf, off + offset, bufSize);
+ offset += bufSize;
+ }
+ int remain = len - offset;
+ if (remain > 0)
+ {
+ if (outputBuffer.Capacity < bufSize)
+ outputBuffer.Capacity = bufSize;
+ outputBuffer.Write(buf, off + offset, remain);
+ }
}
public override void Flush()
{
- outputBuffer.Flush();
+ CheckNotDisposed();
+ if (!IsOpen)
+ throw new InvalidOperationException("Transport is not open.");
+ if (outputBuffer.Length > 0)
+ {
+ transport.Write(outputBuffer.GetBuffer(), 0, (int)outputBuffer.Length);
+ outputBuffer.SetLength(0);
+ }
+ transport.Flush();
+ }
+
+ private void CheckNotDisposed()
+ {
+ if (_IsDisposed)
+ throw new ObjectDisposedException("TBufferedTransport");
}
- #region " IDisposable Support "
- private bool _IsDisposed;
+ #region " IDisposable Support "
+ private bool _IsDisposed;
- // IDisposable
- protected override void Dispose(bool disposing)
- {
- if (!_IsDisposed)
- {
- if (disposing)
+ // IDisposable
+ protected override void Dispose(bool disposing)
{
- if (inputBuffer != null)
- inputBuffer.Dispose();
- if (outputBuffer != null)
- outputBuffer.Dispose();
+ if (!_IsDisposed)
+ {
+ if (disposing)
+ {
+ inputBuffer.Dispose();
+ outputBuffer.Dispose();
+ }
+ }
+ _IsDisposed = true;
}
- }
- _IsDisposed = true;
+ #endregion
}
- #endregion
- }
}
http://git-wip-us.apache.org/repos/asf/thrift/blob/178b813a/lib/csharp/src/Transport/TFramedTransport.cs
----------------------------------------------------------------------
diff --git a/lib/csharp/src/Transport/TFramedTransport.cs b/lib/csharp/src/Transport/TFramedTransport.cs
index 8af227f..9c6a794 100644
--- a/lib/csharp/src/Transport/TFramedTransport.cs
+++ b/lib/csharp/src/Transport/TFramedTransport.cs
@@ -21,14 +21,14 @@ using System.IO;
namespace Thrift.Transport
{
- public class TFramedTransport : TTransport, IDisposable
+ public class TFramedTransport : TTransport, IDisposable
{
- protected TTransport transport = null;
- protected MemoryStream writeBuffer;
- protected MemoryStream readBuffer = null;
+ private readonly TTransport transport;
+ private readonly MemoryStream writeBuffer = new MemoryStream(1024);
+ private readonly MemoryStream readBuffer = new MemoryStream(1024);
- private const int header_size = 4;
- private static byte[] header_dummy = new byte[header_size]; // used as header placeholder while initilizing new write buffer
+ private const int HeaderSize = 4;
+ private readonly byte[] headerBuf = new byte[HeaderSize];
public class Factory : TTransportFactory
{
@@ -38,18 +38,17 @@ namespace Thrift.Transport
}
}
- protected TFramedTransport()
- {
- InitWriteBuffer();
- }
-
- public TFramedTransport(TTransport transport) : this()
+ public TFramedTransport(TTransport transport)
{
+ if (transport == null)
+ throw new ArgumentNullException("transport");
this.transport = transport;
+ InitWriteBuffer();
}
public override void Open()
{
+ CheckNotDisposed();
transport.Open();
}
@@ -57,24 +56,28 @@ namespace Thrift.Transport
{
get
{
- return transport.IsOpen;
+ // We can legitimately throw here but be nice a bit.
+ // CheckNotDisposed();
+ return !_IsDisposed && transport.IsOpen;
}
}
public override void Close()
{
+ CheckNotDisposed();
transport.Close();
}
public override int Read(byte[] buf, int off, int len)
{
- if (readBuffer != null)
+ CheckNotDisposed();
+ ValidateBufferArgs(buf, off, len);
+ if (!IsOpen)
+ throw new InvalidOperationException("Transport is not open.");
+ int got = readBuffer.Read(buf, off, len);
+ if (got > 0)
{
- int got = readBuffer.Read(buf, off, len);
- if (got > 0)
- {
- return got;
- }
+ return got;
}
// Read another frame of data
@@ -85,49 +88,56 @@ namespace Thrift.Transport
private void ReadFrame()
{
- byte[] i32rd = new byte[header_size];
- transport.ReadAll(i32rd, 0, header_size);
- int size = DecodeFrameSize(i32rd);
+ transport.ReadAll(headerBuf, 0, HeaderSize);
+ int size = DecodeFrameSize(headerBuf);
- byte[] buff = new byte[size];
+ readBuffer.SetLength(size);
+ readBuffer.Seek(0, SeekOrigin.Begin);
+ byte[] buff = readBuffer.GetBuffer();
transport.ReadAll(buff, 0, size);
- readBuffer = new MemoryStream(buff);
}
public override void Write(byte[] buf, int off, int len)
{
+ CheckNotDisposed();
+ ValidateBufferArgs(buf, off, len);
+ if (!IsOpen)
+ throw new InvalidOperationException("Transport is not open.");
+ if (writeBuffer.Length + (long)len > (long)int.MaxValue)
+ Flush();
writeBuffer.Write(buf, off, len);
}
public override void Flush()
{
+ CheckNotDisposed();
+ if (!IsOpen)
+ throw new InvalidOperationException("Transport is not open.");
byte[] buf = writeBuffer.GetBuffer();
int len = (int)writeBuffer.Length;
- int data_len = len - header_size;
+ int data_len = len - HeaderSize;
if ( data_len < 0 )
throw new System.InvalidOperationException (); // logic error actually
- InitWriteBuffer();
-
// Inject message header into the reserved buffer space
- EncodeFrameSize(data_len,ref buf);
+ EncodeFrameSize(data_len, buf);
// Send the entire message at once
transport.Write(buf, 0, len);
+ InitWriteBuffer();
+
transport.Flush();
}
private void InitWriteBuffer ()
{
- // Create new buffer instance
- writeBuffer = new MemoryStream(1024);
-
// Reserve space for message header to be put right before sending it out
- writeBuffer.Write ( header_dummy, 0, header_size );
+ writeBuffer.SetLength(HeaderSize);
+ writeBuffer.Seek(0, SeekOrigin.End);
}
- private static void EncodeFrameSize(int frameSize, ref byte[] buf)
+ private static void EncodeFrameSize(int frameSize, byte[] buf)
{
buf[0] = (byte)(0xff & (frameSize >> 24));
buf[1] = (byte)(0xff & (frameSize >> 16));
@@ -145,6 +155,12 @@ namespace Thrift.Transport
}
+ private void CheckNotDisposed()
+ {
+ if (_IsDisposed)
+ throw new ObjectDisposedException("TFramedTransport");
+ }
+
#region " IDisposable Support "
private bool _IsDisposed;
@@ -155,8 +171,8 @@ namespace Thrift.Transport
{
if (disposing)
{
- if (readBuffer != null)
- readBuffer.Dispose();
+ readBuffer.Dispose();
+ writeBuffer.Dispose();
}
}
_IsDisposed = true;
http://git-wip-us.apache.org/repos/asf/thrift/blob/178b813a/lib/csharp/src/Transport/TTLSSocket.cs
----------------------------------------------------------------------
diff --git a/lib/csharp/src/Transport/TTLSSocket.cs b/lib/csharp/src/Transport/TTLSSocket.cs
index 5652556..833b792 100644
--- a/lib/csharp/src/Transport/TTLSSocket.cs
+++ b/lib/csharp/src/Transport/TTLSSocket.cs
@@ -33,43 +33,43 @@ namespace Thrift.Transport
/// <summary>
/// Internal TCP Client
/// </summary>
- private TcpClient client = null;
+ private TcpClient client;
/// <summary>
/// The host
/// </summary>
- private string host = null;
+ private string host;
/// <summary>
/// The port
/// </summary>
- private int port = 0;
+ private int port;
/// <summary>
/// The timeout for the connection
/// </summary>
- private int timeout = 0;
+ private int timeout;
/// <summary>
/// Internal SSL Stream for IO
/// </summary>
- private SslStream secureStream = null;
+ private SslStream secureStream;
/// <summary>
/// Defines wheter or not this socket is a server socket<br/>
/// This is used for the TLS-authentication
/// </summary>
- private bool isServer = false;
+ private bool isServer;
/// <summary>
/// The certificate
/// </summary>
- private X509Certificate certificate = null;
+ private X509Certificate certificate;
/// <summary>
/// User defined certificate validator.
/// </summary>
- private RemoteCertificateValidationCallback certValidator = null;
+ private RemoteCertificateValidationCallback certValidator;
/// <summary>
/// The function to determine which certificate to use.
@@ -96,6 +96,10 @@ namespace Thrift.Transport
this.certValidator = certValidator;
this.localCertificateSelectionCallback = localCertificateSelectionCallback;
this.isServer = isServer;
+ if (isServer && certificate == null)
+ {
+ throw new ArgumentException("TTLSSocket needs certificate to be used for server", "certificate");
+ }
if (IsOpen)
{
@@ -133,7 +137,7 @@ namespace Thrift.Transport
public TTLSSocket(
string host,
int port,
- X509Certificate certificate,
+ X509Certificate certificate = null,
RemoteCertificateValidationCallback certValidator = null,
LocalCertificateSelectionCallback localCertificateSelectionCallback = null)
: this(host, port, 0, certificate, certValidator, localCertificateSelectionCallback)
@@ -315,7 +319,8 @@ namespace Thrift.Transport
else
{
// Client authentication
- this.secureStream.AuthenticateAsClient(host, new X509CertificateCollection { certificate }, SslProtocols.Tls, true);
+ X509CertificateCollection certs = certificate != null ? new X509CertificateCollection { certificate } : new X509CertificateCollection();
+ this.secureStream.AuthenticateAsClient(host, certs, SslProtocols.Tls, true);
}
}
catch (Exception)
http://git-wip-us.apache.org/repos/asf/thrift/blob/178b813a/lib/csharp/src/Transport/TTransport.cs
----------------------------------------------------------------------
diff --git a/lib/csharp/src/Transport/TTransport.cs b/lib/csharp/src/Transport/TTransport.cs
index 2811399..a3639d2 100644
--- a/lib/csharp/src/Transport/TTransport.cs
+++ b/lib/csharp/src/Transport/TTransport.cs
@@ -34,7 +34,7 @@ namespace Thrift.Transport
}
private byte[] _peekBuffer = new byte[1];
- private bool _hasPeekByte = false;
+ private bool _hasPeekByte;
public bool Peek()
{
@@ -66,10 +66,23 @@ namespace Thrift.Transport
public abstract void Close();
+ protected static void ValidateBufferArgs(byte[] buf, int off, int len)
+ {
+ if (buf == null)
+ throw new ArgumentNullException("buf");
+ if (off < 0)
+ throw new ArgumentOutOfRangeException("Buffer offset is smaller than zero.");
+ if (len < 0)
+ throw new ArgumentOutOfRangeException("Buffer length is smaller than zero.");
+ if (off + len > buf.Length)
+ throw new ArgumentOutOfRangeException("Not enough data.");
+ }
+
public abstract int Read(byte[] buf, int off, int len);
public int ReadAll(byte[] buf, int off, int len)
{
+ ValidateBufferArgs(buf, off, len);
int got = 0;
//If we previously peeked a byte, we need to use that first.
http://git-wip-us.apache.org/repos/asf/thrift/blob/178b813a/lib/csharp/test/ThriftTest/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/csharp/test/ThriftTest/Makefile.am b/lib/csharp/test/ThriftTest/Makefile.am
index 7125c90..c0014e6 100644
--- a/lib/csharp/test/ThriftTest/Makefile.am
+++ b/lib/csharp/test/ThriftTest/Makefile.am
@@ -30,7 +30,7 @@ stubs: $(top_srcdir)/test/ThriftTest.thrift
precross: TestClientServer.exe
ThriftImpl.dll: stubs
- $(CSC) /t:library /out:./ThriftImpl.dll /recurse:./gen-csharp/* /reference:../../Thrift.dll
+ $(CSC) /t:library /out:./ThriftImpl.dll /recurse:./gen-csharp/Thrift/Test/*.cs /reference:../../Thrift.dll
TestClientServer.exe: TestClient.cs TestServer.cs Program.cs ThriftImpl.dll
$(CSC) /out:TestClientServer.exe /reference:../../Thrift.dll /reference:ThriftImpl.dll TestClient.cs TestServer.cs Program.cs
http://git-wip-us.apache.org/repos/asf/thrift/blob/178b813a/lib/csharp/test/ThriftTest/Program.cs
----------------------------------------------------------------------
diff --git a/lib/csharp/test/ThriftTest/Program.cs b/lib/csharp/test/ThriftTest/Program.cs
index 5a4245b..2bfc73e 100644
--- a/lib/csharp/test/ThriftTest/Program.cs
+++ b/lib/csharp/test/ThriftTest/Program.cs
@@ -46,7 +46,7 @@ namespace Test
}
if (args[0] == "client")
{
- return TestClient.Execute(subArgs) ? 0 : 1;
+ return TestClient.Execute(subArgs);
}
else if (args[0] == "server")
{
http://git-wip-us.apache.org/repos/asf/thrift/blob/178b813a/lib/csharp/test/ThriftTest/TestClient.cs
----------------------------------------------------------------------
diff --git a/lib/csharp/test/ThriftTest/TestClient.cs b/lib/csharp/test/ThriftTest/TestClient.cs
index 68949ac..c09a801 100644
--- a/lib/csharp/test/ThriftTest/TestClient.cs
+++ b/lib/csharp/test/ThriftTest/TestClient.cs
@@ -18,8 +18,11 @@
*/
using System;
+using System.Linq;
+using System.Diagnostics;
using System.Collections.Generic;
using System.Threading;
+using System.Security.Cryptography.X509Certificates;
using Thrift.Collections;
using Thrift.Protocol;
using Thrift.Transport;
@@ -29,53 +32,176 @@ namespace Test
{
public class TestClient
{
- private static int numIterations = 1;
- private static string protocol = "";
+ private class TestParams
+ {
+ public int numIterations = 1;
+ public string host = "localhost";
+ public int port = 9090;
+ public string url;
+ public string pipe;
+ public bool buffered;
+ public bool framed;
+ public string protocol;
+ public bool encrypted = false;
+
+ public TTransport CreateTransport()
+ {
+ if (url == null)
+ {
+ // endpoint transport
+ TTransport trans = null;
+ if (pipe != null)
+ trans = new TNamedPipeClientTransport(pipe);
+ else
+ {
+ if (encrypted)
+ {
+ string certPath = "../../../../test/keys/client.p12";
+ X509Certificate cert = new X509Certificate2(certPath, "thrift");
+ trans = new TTLSSocket(host, port, cert, (o, c, chain, errors) => true);
+ }
+ else
+ {
+ trans = new TSocket(host, port);
+ }
+ }
+
+ // layered transport
+ if (buffered)
+ trans = new TBufferedTransport(trans);
+ if (framed)
+ trans = new TFramedTransport(trans);
+
+ //ensure proper open/close of transport
+ trans.Open();
+ trans.Close();
+ return trans;
+ }
+ else
+ {
+ return new THttpClient(new Uri(url));
+ }
+ }
+
+ public TProtocol CreateProtocol(TTransport transport)
+ {
+ if (protocol == "compact")
+ return new TCompactProtocol(transport);
+ else if (protocol == "json")
+ return new TJSONProtocol(transport);
+ else
+ return new TBinaryProtocol(transport);
+ }
+ };
+
+ private const int ErrorBaseTypes = 1;
+ private const int ErrorStructs = 2;
+ private const int ErrorContainers = 4;
+ private const int ErrorExceptions = 8;
+ private const int ErrorUnknown = 64;
- public static bool Execute(string[] args)
+ private class ClientTest
+ {
+ private readonly TTransport transport;
+ private readonly ThriftTest.Client client;
+ private readonly int numIterations;
+ private bool done;
+
+ public int ReturnCode { get; set; }
+
+ public ClientTest(TestParams param)
+ {
+ transport = param.CreateTransport();
+ client = new ThriftTest.Client(param.CreateProtocol(transport));
+ numIterations = param.numIterations;
+ }
+ public void Execute()
+ {
+ if (done)
+ {
+ Console.WriteLine("Execute called more than once");
+ throw new InvalidOperationException();
+ }
+
+ for (int i = 0; i < numIterations; i++)
+ {
+ try
+ {
+ if (!transport.IsOpen)
+ transport.Open();
+ }
+ catch (TTransportException ex)
+ {
+ Console.WriteLine("*** FAILED ***");
+ Console.WriteLine("Connect failed: " + ex.Message);
+ ReturnCode |= ErrorUnknown;
+ Console.WriteLine(ex.Message + " ST: " + ex.StackTrace);
+ continue;
+ }
+
+ try
+ {
+ ReturnCode |= ExecuteClientTest(client);
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine("*** FAILED ***");
+ Console.WriteLine(ex.Message + " ST: " + ex.StackTrace);
+ ReturnCode |= ErrorUnknown;
+ }
+ }
+ try
+ {
+ transport.Close();
+ }
+ catch(Exception ex)
+ {
+ Console.WriteLine("Error while closing transport");
+ Console.WriteLine(ex.Message + " ST: " + ex.StackTrace);
+ }
+ done = true;
+ }
+ }
+
+ public static int Execute(string[] args)
{
try
{
- string host = "localhost";
- int port = 9090;
- string url = null, pipe = null;
+ TestParams param = new TestParams();
int numThreads = 1;
- bool buffered = false, framed = false, encrypted = false;
- string certPath = "../../../../../keys/server.pem";
-
try
{
for (int i = 0; i < args.Length; i++)
{
if (args[i] == "-u")
{
- url = args[++i];
+ param.url = args[++i];
}
else if (args[i] == "-n")
{
- numIterations = Convert.ToInt32(args[++i]);
+ param.numIterations = Convert.ToInt32(args[++i]);
}
else if (args[i] == "-pipe") // -pipe <name>
{
- pipe = args[++i];
+ param.pipe = args[++i];
Console.WriteLine("Using named pipes transport");
}
else if (args[i].Contains("--host="))
{
- host = args[i].Substring(args[i].IndexOf("=") + 1);
+ param.host = args[i].Substring(args[i].IndexOf("=") + 1);
}
else if (args[i].Contains("--port="))
{
- port = int.Parse(args[i].Substring(args[i].IndexOf("=")+1));
+ param.port = int.Parse(args[i].Substring(args[i].IndexOf("=")+1));
}
else if (args[i] == "-b" || args[i] == "--buffered" || args[i] == "--transport=buffered")
{
- buffered = true;
+ param.buffered = true;
Console.WriteLine("Using buffered sockets");
}
else if (args[i] == "-f" || args[i] == "--framed" || args[i] == "--transport=framed")
{
- framed = true;
+ param.framed = true;
Console.WriteLine("Using framed transport");
}
else if (args[i] == "-t")
@@ -84,94 +210,48 @@ namespace Test
}
else if (args[i] == "--compact" || args[i] == "--protocol=compact")
{
- protocol = "compact";
+ param.protocol = "compact";
Console.WriteLine("Using compact protocol");
}
else if (args[i] == "--json" || args[i] == "--protocol=json")
{
- protocol = "json";
+ param.protocol = "json";
Console.WriteLine("Using JSON protocol");
}
else if (args[i] == "--ssl")
{
- encrypted = true;
+ param.encrypted = true;
Console.WriteLine("Using encrypted transport");
}
- else if (args[i].StartsWith("--cert="))
- {
- certPath = args[i].Substring("--cert=".Length);
- }
}
}
- catch (Exception e)
+ catch (Exception ex)
{
- Console.WriteLine(e.StackTrace);
+ Console.WriteLine("*** FAILED ***");
+ Console.WriteLine("Error while parsing arguments");
+ Console.WriteLine(ex.Message + " ST: " + ex.StackTrace);
+ return ErrorUnknown;
}
+ var tests = Enumerable.Range(0, numThreads).Select(_ => new ClientTest(param)).ToArray();
//issue tests on separate threads simultaneously
- Thread[] threads = new Thread[numThreads];
+ var threads = tests.Select(test => new Thread(test.Execute)).ToArray();
DateTime start = DateTime.Now;
- for (int test = 0; test < numThreads; test++)
- {
- Thread t = new Thread(new ParameterizedThreadStart(ClientThread));
- threads[test] = t;
- if (url == null)
- {
- // endpoint transport
- TTransport trans = null;
- if (pipe != null)
- trans = new TNamedPipeClientTransport(pipe);
- else
- {
- if (encrypted)
- trans = new TTLSSocket(host, port, certPath);
- else
- trans = new TSocket(host, port);
- }
-
- // layered transport
- if (buffered)
- trans = new TBufferedTransport(trans as TStreamTransport);
- if (framed)
- trans = new TFramedTransport(trans);
-
- //ensure proper open/close of transport
- trans.Open();
- trans.Close();
- t.Start(trans);
- }
- else
- {
- THttpClient http = new THttpClient(new Uri(url));
- t.Start(http);
- }
- }
-
- for (int test = 0; test < numThreads; test++)
- {
- threads[test].Join();
- }
- Console.Write("Total time: " + (DateTime.Now - start));
+ foreach (var t in threads)
+ t.Start();
+ foreach (var t in threads)
+ t.Join();
+ Console.WriteLine("Total time: " + (DateTime.Now - start));
+ Console.WriteLine();
+ return tests.Select(t => t.ReturnCode).Aggregate((r1, r2) => r1 | r2);
}
catch (Exception outerEx)
{
+ Console.WriteLine("*** FAILED ***");
+ Console.WriteLine("Unexpected error");
Console.WriteLine(outerEx.Message + " ST: " + outerEx.StackTrace);
- return false;
- }
-
- Console.WriteLine();
- Console.WriteLine();
- return true;
- }
-
- public static void ClientThread(object obj)
- {
- TTransport transport = (TTransport)obj;
- for (int i = 0; i < numIterations; i++)
- {
- ClientTest(transport);
+ return ErrorUnknown;
}
- transport.Close();
}
public static string BytesToHex(byte[] data) {
@@ -185,14 +265,14 @@ namespace Test
// linear distribution, unless random is requested
if (!randomDist) {
- for (var i = 0; i < initLen; ++i) {
+ for (var i = 0; i < initLen; ++i) {
retval[i] = (byte)i;
}
return retval;
}
// random distribution
- for (var i = 0; i < initLen; ++i) {
+ for (var i = 0; i < initLen; ++i) {
retval[i] = (byte)0;
}
var rnd = new Random();
@@ -208,31 +288,9 @@ namespace Test
return retval;
}
- public static void ClientTest(TTransport transport)
+ public static int ExecuteClientTest(ThriftTest.Client client)
{
- TProtocol proto;
- if (protocol == "compact")
- proto = new TCompactProtocol(transport);
- else if (protocol == "json")
- proto = new TJSONProtocol(transport);
- else
- proto = new TBinaryProtocol(transport);
-
- ThriftTest.Client client = new ThriftTest.Client(proto);
- try
- {
- if (!transport.IsOpen)
- {
- transport.Open();
- }
- }
- catch (TTransportException ttx)
- {
- Console.WriteLine("Connect failed: " + ttx.Message);
- return;
- }
-
- long start = DateTime.Now.ToFileTime();
+ int returnCode = 0;
Console.Write("testVoid()");
client.testVoid();
@@ -241,29 +299,65 @@ namespace Test
Console.Write("testString(\"Test\")");
string s = client.testString("Test");
Console.WriteLine(" = \"" + s + "\"");
+ if ("Test" != s)
+ {
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorBaseTypes;
+ }
Console.Write("testBool(true)");
bool t = client.testBool((bool)true);
Console.WriteLine(" = " + t);
+ if (!t)
+ {
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorBaseTypes;
+ }
Console.Write("testBool(false)");
bool f = client.testBool((bool)false);
Console.WriteLine(" = " + f);
+ if (f)
+ {
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorBaseTypes;
+ }
Console.Write("testByte(1)");
sbyte i8 = client.testByte((sbyte)1);
Console.WriteLine(" = " + i8);
+ if (1 != i8)
+ {
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorBaseTypes;
+ }
Console.Write("testI32(-1)");
int i32 = client.testI32(-1);
Console.WriteLine(" = " + i32);
+ if (-1 != i32)
+ {
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorBaseTypes;
+ }
Console.Write("testI64(-34359738368)");
long i64 = client.testI64(-34359738368);
Console.WriteLine(" = " + i64);
+ if (-34359738368 != i64)
+ {
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorBaseTypes;
+ }
+ // TODO: Validate received message
Console.Write("testDouble(5.325098235)");
double dub = client.testDouble(5.325098235);
Console.WriteLine(" = " + dub);
+ if (5.325098235 != dub)
+ {
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorBaseTypes;
+ }
byte[] binOut = PrepareTestData(true);
Console.Write("testBinary(" + BytesToHex(binOut) + ")");
@@ -272,18 +366,27 @@ namespace Test
byte[] binIn = client.testBinary(binOut);
Console.WriteLine(" = " + BytesToHex(binIn));
if (binIn.Length != binOut.Length)
- throw new Exception("testBinary: length mismatch");
+ {
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorBaseTypes;
+ }
for (int ofs = 0; ofs < Math.Min(binIn.Length, binOut.Length); ++ofs)
if (binIn[ofs] != binOut[ofs])
- throw new Exception("testBinary: content mismatch at offset " + ofs.ToString());
+ {
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorBaseTypes;
+ }
}
- catch (Thrift.TApplicationException e)
+ catch (Thrift.TApplicationException ex)
{
- Console.Write("testBinary(" + BytesToHex(binOut) + "): "+e.Message);
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorBaseTypes;
+ Console.WriteLine(ex.Message + " ST: " + ex.StackTrace);
}
// binary equals? only with hashcode option enabled ...
- if( typeof(CrazyNesting).GetMethod("Equals").DeclaringType == typeof(CrazyNesting))
+ Console.WriteLine("Test CrazyNesting");
+ if( typeof(CrazyNesting).GetMethod("Equals").DeclaringType == typeof(CrazyNesting))
{
CrazyNesting one = new CrazyNesting();
CrazyNesting two = new CrazyNesting();
@@ -292,9 +395,14 @@ namespace Test
one.Binary_field = new byte[10] { 0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0xFF };
two.Binary_field = new byte[10] { 0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0xFF };
if (!one.Equals(two))
+ {
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorContainers;
throw new Exception("CrazyNesting.Equals failed");
+ }
}
+ // TODO: Validate received message
Console.Write("testStruct({\"Zero\", 1, -3, -5})");
Xtruct o = new Xtruct();
o.String_thing = "Zero";
@@ -304,6 +412,7 @@ namespace Test
Xtruct i = client.testStruct(o);
Console.WriteLine(" = {\"" + i.String_thing + "\", " + i.Byte_thing + ", " + i.I32_thing + ", " + i.I64_thing + "}");
+ // TODO: Validate received message
Console.Write("testNest({1, {\"Zero\", 1, -3, -5}, 5})");
Xtruct2 o2 = new Xtruct2();
o2.Byte_thing = (sbyte)1;
@@ -352,6 +461,7 @@ namespace Test
}
Console.WriteLine("}");
+ // TODO: Validate received message
List<int> listout = new List<int>();
for (int j = -2; j < 3; j++)
{
@@ -392,6 +502,7 @@ namespace Test
Console.WriteLine("}");
//set
+ // TODO: Validate received message
THashSet<int> setout = new THashSet<int>();
for (int j = -2; j < 3; j++)
{
@@ -435,27 +546,58 @@ namespace Test
Console.Write("testEnum(ONE)");
Numberz ret = client.testEnum(Numberz.ONE);
Console.WriteLine(" = " + ret);
+ if (Numberz.ONE != ret)
+ {
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorStructs;
+ }
Console.Write("testEnum(TWO)");
ret = client.testEnum(Numberz.TWO);
Console.WriteLine(" = " + ret);
+ if (Numberz.TWO != ret)
+ {
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorStructs;
+ }
Console.Write("testEnum(THREE)");
ret = client.testEnum(Numberz.THREE);
Console.WriteLine(" = " + ret);
+ if (Numberz.THREE != ret)
+ {
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorStructs;
+ }
Console.Write("testEnum(FIVE)");
ret = client.testEnum(Numberz.FIVE);
Console.WriteLine(" = " + ret);
+ if (Numberz.FIVE != ret)
+ {
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorStructs;
+ }
Console.Write("testEnum(EIGHT)");
ret = client.testEnum(Numberz.EIGHT);
Console.WriteLine(" = " + ret);
+ if (Numberz.EIGHT != ret)
+ {
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorStructs;
+ }
Console.Write("testTypedef(309858235082523)");
long uid = client.testTypedef(309858235082523L);
Console.WriteLine(" = " + uid);
+ if (309858235082523L != uid)
+ {
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorStructs;
+ }
+ // TODO: Validate received message
Console.Write("testMapMap(1)");
Dictionary<int, Dictionary<int, int>> mm = client.testMapMap(1);
Console.Write(" = {");
@@ -471,6 +613,7 @@ namespace Test
}
Console.WriteLine("}");
+ // TODO: Validate received message
Insanity insane = new Insanity();
insane.UserMap = new Dictionary<Numberz, long>();
insane.UserMap[Numberz.FIVE] = 5000L;
@@ -544,14 +687,132 @@ namespace Test
Console.Write(" = Xtruct(byte_thing:" + multiResponse.Byte_thing + ",String_thing:" + multiResponse.String_thing
+ ",i32_thing:" + multiResponse.I32_thing + ",i64_thing:" + multiResponse.I64_thing + ")\n");
+ try
+ {
+ Console.WriteLine("testException(\"Xception\")");
+ client.testException("Xception");
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorExceptions;
+ }
+ catch (Xception ex)
+ {
+ if (ex.ErrorCode != 1001 || ex.Message != "Xception")
+ {
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorExceptions;
+ }
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorExceptions;
+ Console.WriteLine(ex.Message + " ST: " + ex.StackTrace);
+ }
+ try
+ {
+ Console.WriteLine("testException(\"TException\")");
+ client.testException("TException");
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorExceptions;
+ }
+ catch (Thrift.TException)
+ {
+ // OK
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorExceptions;
+ Console.WriteLine(ex.Message + " ST: " + ex.StackTrace);
+ }
+ try
+ {
+ Console.WriteLine("testException(\"ok\")");
+ client.testException("ok");
+ // OK
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorExceptions;
+ Console.WriteLine(ex.Message + " ST: " + ex.StackTrace);
+ }
+
+ try
+ {
+ Console.WriteLine("testMultiException(\"Xception\", ...)");
+ client.testMultiException("Xception", "ignore");
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorExceptions;
+ }
+ catch (Xception ex)
+ {
+ if (ex.ErrorCode != 1001 || ex.Message != "This is an Xception")
+ {
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorExceptions;
+ }
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorExceptions;
+ Console.WriteLine(ex.Message + " ST: " + ex.StackTrace);
+ }
+ try
+ {
+ Console.WriteLine("testMultiException(\"Xception2\", ...)");
+ client.testMultiException("Xception2", "ignore");
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorExceptions;
+ }
+ catch (Xception2 ex)
+ {
+ if (ex.ErrorCode != 2002 || ex.Struct_thing.String_thing != "This is an Xception2")
+ {
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorExceptions;
+ }
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorExceptions;
+ Console.WriteLine(ex.Message + " ST: " + ex.StackTrace);
+ }
+ try
+ {
+ Console.WriteLine("testMultiException(\"success\", \"OK\")");
+ if ("OK" != client.testMultiException("success", "OK").String_thing)
+ {
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorExceptions;
+ }
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorExceptions;
+ Console.WriteLine(ex.Message + " ST: " + ex.StackTrace);
+ }
+
+ Stopwatch sw = new Stopwatch();
+ sw.Start();
Console.WriteLine("Test Oneway(1)");
client.testOneway(1);
+ sw.Stop();
+ if (sw.ElapsedMilliseconds > 1000)
+ {
+ Console.WriteLine("*** FAILED ***");
+ returnCode |= ErrorBaseTypes;
+ }
Console.Write("Test Calltime()");
var startt = DateTime.UtcNow;
for ( int k=0; k<1000; ++k )
client.testVoid();
Console.WriteLine(" = " + (DateTime.UtcNow - startt).TotalSeconds.ToString() + " ms a testVoid() call" );
+ return returnCode;
}
}
}
http://git-wip-us.apache.org/repos/asf/thrift/blob/178b813a/lib/csharp/test/ThriftTest/TestServer.cs
----------------------------------------------------------------------
diff --git a/lib/csharp/test/ThriftTest/TestServer.cs b/lib/csharp/test/ThriftTest/TestServer.cs
index b5cc73c..b3a8e42 100644
--- a/lib/csharp/test/ThriftTest/TestServer.cs
+++ b/lib/csharp/test/ThriftTest/TestServer.cs
@@ -69,7 +69,7 @@ namespace Test
public string testString(string thing)
{
- Console.WriteLine("teststring(\"" + thing + "\")");
+ Console.WriteLine("testString(\"" + thing + "\")");
return thing;
}
@@ -145,9 +145,9 @@ namespace Test
}
else
{
- Console.WriteLine(", ");
+ Console.Write(", ");
}
- Console.WriteLine(key + " => " + thing[key]);
+ Console.Write(key + " => " + thing[key]);
}
Console.WriteLine("})");
return thing;
@@ -165,9 +165,9 @@ namespace Test
}
else
{
- Console.WriteLine(", ");
+ Console.Write(", ");
}
- Console.WriteLine(key + " => " + thing[key]);
+ Console.Write(key + " => " + thing[key]);
}
Console.WriteLine("})");
return thing;
@@ -185,9 +185,9 @@ namespace Test
}
else
{
- Console.WriteLine(", ");
+ Console.Write(", ");
}
- Console.WriteLine(elem);
+ Console.Write(elem);
}
Console.WriteLine("})");
return thing;
@@ -205,9 +205,9 @@ namespace Test
}
else
{
- Console.WriteLine(", ");
+ Console.Write(", ");
}
- Console.WriteLine(elem);
+ Console.Write(elem);
}
Console.WriteLine("})");
return thing;
@@ -371,7 +371,6 @@ namespace Test
bool useBufferedSockets = false, useFramed = false, useEncryption = false, compact = false, json = false;
int port = 9090;
string pipe = null;
- string certPath = "../../../../../keys/server.pem";
for (int i = 0; i < args.Length; i++)
{
if (args[i] == "-pipe") // -pipe name
@@ -402,10 +401,6 @@ namespace Test
{
useEncryption = true;
}
- else if (args[i].StartsWith("--cert="))
- {
- certPath = args[i].Substring("--cert=".Length);
- }
}
// Processor
@@ -422,7 +417,8 @@ namespace Test
{
if (useEncryption)
{
- trans = new TTLSServerSocket(port, 0, useBufferedSockets, new X509Certificate2(certPath));
+ string certPath = "../../../../test/keys/server.p12";
+ trans = new TTLSServerSocket(port, 0, useBufferedSockets, new X509Certificate2(certPath, "thrift"));
}
else
{
http://git-wip-us.apache.org/repos/asf/thrift/blob/178b813a/test/known_failures_Linux.json
----------------------------------------------------------------------
diff --git a/test/known_failures_Linux.json b/test/known_failures_Linux.json
index 9c56751..5685efe 100644
--- a/test/known_failures_Linux.json
+++ b/test/known_failures_Linux.json
@@ -21,12 +21,6 @@
"cpp-cpp_binary_http-ip",
"cpp-cpp_compact_http-domain",
"cpp-cpp_json_http-ip",
- "cpp-csharp_binary_buffered-ip-ssl",
- "cpp-csharp_binary_framed-ip-ssl",
- "cpp-csharp_compact_buffered-ip-ssl",
- "cpp-csharp_compact_framed-ip-ssl",
- "cpp-csharp_json_buffered-ip-ssl",
- "cpp-csharp_json_framed-ip-ssl",
"cpp-hs_json_buffered-ip",
"cpp-hs_json_framed-ip",
"cpp-hs_json_http-ip",
@@ -44,90 +38,30 @@
"cpp-rb_compact_framed-ip",
"cpp-rb_json_buffered-ip",
"cpp-rb_json_framed-ip",
- "csharp-c_glib_binary_buffered-ip",
- "csharp-c_glib_binary_framed-ip",
- "csharp-cpp_binary_buffered-ip",
"csharp-cpp_binary_buffered-ip-ssl",
- "csharp-cpp_binary_framed-ip",
"csharp-cpp_binary_framed-ip-ssl",
- "csharp-cpp_compact_buffered-ip",
"csharp-cpp_compact_buffered-ip-ssl",
- "csharp-cpp_compact_framed-ip",
"csharp-cpp_compact_framed-ip-ssl",
- "csharp-cpp_json_buffered-ip",
"csharp-cpp_json_buffered-ip-ssl",
- "csharp-cpp_json_framed-ip",
"csharp-cpp_json_framed-ip-ssl",
- "csharp-csharp_binary_buffered-ip-ssl",
- "csharp-csharp_binary_framed-ip-ssl",
- "csharp-csharp_compact_buffered-ip-ssl",
- "csharp-csharp_compact_framed-ip-ssl",
- "csharp-csharp_json_buffered-ip-ssl",
- "csharp-csharp_json_framed-ip-ssl",
- "csharp-go_binary_buffered-ip",
"csharp-go_binary_buffered-ip-ssl",
- "csharp-go_binary_framed-ip",
"csharp-go_binary_framed-ip-ssl",
- "csharp-go_compact_buffered-ip",
"csharp-go_compact_buffered-ip-ssl",
- "csharp-go_compact_framed-ip",
"csharp-go_compact_framed-ip-ssl",
- "csharp-go_json_buffered-ip",
"csharp-go_json_buffered-ip-ssl",
- "csharp-go_json_framed-ip",
"csharp-go_json_framed-ip-ssl",
- "csharp-hs_binary_buffered-ip",
- "csharp-hs_binary_framed-ip",
- "csharp-hs_compact_buffered-ip",
- "csharp-hs_compact_framed-ip",
"csharp-hs_json_buffered-ip",
"csharp-hs_json_framed-ip",
- "csharp-java_binary_buffered-ip",
- "csharp-java_binary_buffered-ip-ssl",
- "csharp-java_binary_framed-fastframed-ip",
- "csharp-java_binary_framed-fastframed-ip-ssl",
- "csharp-java_binary_framed-ip",
- "csharp-java_binary_framed-ip-ssl",
- "csharp-java_compact_buffered-ip",
- "csharp-java_compact_buffered-ip-ssl",
- "csharp-java_compact_framed-fastframed-ip",
- "csharp-java_compact_framed-fastframed-ip-ssl",
- "csharp-java_compact_framed-ip",
- "csharp-java_compact_framed-ip-ssl",
- "csharp-java_json_buffered-ip",
- "csharp-java_json_buffered-ip-ssl",
- "csharp-java_json_framed-fastframed-ip",
- "csharp-java_json_framed-fastframed-ip-ssl",
- "csharp-java_json_framed-ip",
- "csharp-java_json_framed-ip-ssl",
"csharp-nodejs_binary_buffered-ip",
"csharp-nodejs_binary_buffered-ip-ssl",
- "csharp-nodejs_binary_framed-ip",
"csharp-nodejs_binary_framed-ip-ssl",
"csharp-nodejs_compact_buffered-ip",
"csharp-nodejs_compact_buffered-ip-ssl",
- "csharp-nodejs_compact_framed-ip",
"csharp-nodejs_compact_framed-ip-ssl",
"csharp-nodejs_json_buffered-ip",
"csharp-nodejs_json_buffered-ip-ssl",
"csharp-nodejs_json_framed-ip",
"csharp-nodejs_json_framed-ip-ssl",
- "csharp-py_binary-accel_buffered-ip",
- "csharp-py_binary-accel_buffered-ip-ssl",
- "csharp-py_binary-accel_framed-ip",
- "csharp-py_binary-accel_framed-ip-ssl",
- "csharp-py_binary_buffered-ip",
- "csharp-py_binary_buffered-ip-ssl",
- "csharp-py_binary_framed-ip",
- "csharp-py_binary_framed-ip-ssl",
- "csharp-py_compact_buffered-ip",
- "csharp-py_compact_buffered-ip-ssl",
- "csharp-py_compact_framed-ip",
- "csharp-py_compact_framed-ip-ssl",
- "csharp-py_json_buffered-ip",
- "csharp-py_json_buffered-ip-ssl",
- "csharp-py_json_framed-ip",
- "csharp-py_json_framed-ip-ssl",
"csharp-rb_binary-accel_buffered-ip",
"csharp-rb_binary-accel_framed-ip",
"csharp-rb_binary_buffered-ip",
@@ -140,12 +74,6 @@
"go-cpp_json_buffered-ip-ssl",
"go-cpp_json_framed-ip",
"go-cpp_json_framed-ip-ssl",
- "go-csharp_binary_buffered-ip-ssl",
- "go-csharp_binary_framed-ip-ssl",
- "go-csharp_compact_buffered-ip-ssl",
- "go-csharp_compact_framed-ip-ssl",
- "go-csharp_json_buffered-ip-ssl",
- "go-csharp_json_framed-ip-ssl",
"go-hs_json_buffered-ip",
"go-hs_json_framed-ip",
"go-java_json_buffered-ip",
@@ -191,15 +119,6 @@
"hs-py_json_framed-ip",
"hs-rb_json_buffered-ip",
"hs-rb_json_framed-ip",
- "java-csharp_binary_buffered-ip-ssl",
- "java-csharp_binary_fastframed-framed-ip-ssl",
- "java-csharp_binary_framed-ip-ssl",
- "java-csharp_compact_buffered-ip-ssl",
- "java-csharp_compact_fastframed-framed-ip-ssl",
- "java-csharp_compact_framed-ip-ssl",
- "java-csharp_json_buffered-ip-ssl",
- "java-csharp_json_fastframed-framed-ip-ssl",
- "java-csharp_json_framed-ip-ssl",
"java-hs_json_buffered-ip",
"java-hs_json_fastframed-framed-ip",
"java-hs_json_framed-ip",
@@ -281,14 +200,6 @@
"nodejs-rb_json_buffered-ip",
"nodejs-rb_json_framed-ip",
"perl-php_binary_framed-ip",
- "py-csharp_accel-binary_buffered-ip-ssl",
- "py-csharp_accel-binary_framed-ip-ssl",
- "py-csharp_binary_buffered-ip-ssl",
- "py-csharp_binary_framed-ip-ssl",
- "py-csharp_compact_buffered-ip-ssl",
- "py-csharp_compact_framed-ip-ssl",
- "py-csharp_json_buffered-ip-ssl",
- "py-csharp_json_framed-ip-ssl",
"py-hs_json_buffered-ip",
"py-hs_json_framed-ip",
"py-nodejs_json_buffered-ip",
http://git-wip-us.apache.org/repos/asf/thrift/blob/178b813a/test/tests.json
----------------------------------------------------------------------
diff --git a/test/tests.json b/test/tests.json
index cb2f0e2..c902cd4 100644
--- a/test/tests.json
+++ b/test/tests.json
@@ -286,16 +286,14 @@
"delay": 3,
"command": [
"TestClientServer.exe",
- "server",
- "--cert=../../../../test/keys/server.pem"
+ "server"
]
},
"client": {
"timeout": 9,
"command": [
"TestClientServer.exe",
- "client",
- "--cert=../../../../test/keys/client.pem"
+ "client"
]
},
"workdir": "../lib/csharp/test/ThriftTest"
[2/2] thrift git commit: THRIFT-3361 Improve C# library Client: C#
Patch: Jens Geyer
Posted by je...@apache.org.
THRIFT-3361 Improve C# library
Client: C#
Patch: Jens Geyer <je...@apache.org>
Replaced a bunch of C# exceptions with TTransportException.
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/96409d9d
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/96409d9d
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/96409d9d
Branch: refs/heads/master
Commit: 96409d9dfecd8213726ee83ff1ac40695f8eeeec
Parents: 178b813
Author: Jens Geyer <je...@apache.org>
Authored: Wed Sep 30 23:30:35 2015 +0200
Committer: Jens Geyer <je...@apache.org>
Committed: Wed Sep 30 23:30:35 2015 +0200
----------------------------------------------------------------------
lib/csharp/src/Transport/TBufferedTransport.cs | 6 +++---
lib/csharp/src/Transport/TFramedTransport.cs | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/96409d9d/lib/csharp/src/Transport/TBufferedTransport.cs
----------------------------------------------------------------------
diff --git a/lib/csharp/src/Transport/TBufferedTransport.cs b/lib/csharp/src/Transport/TBufferedTransport.cs
index e88800f..caedd87 100644
--- a/lib/csharp/src/Transport/TBufferedTransport.cs
+++ b/lib/csharp/src/Transport/TBufferedTransport.cs
@@ -75,7 +75,7 @@ namespace Thrift.Transport
CheckNotDisposed();
ValidateBufferArgs(buf, off, len);
if (!IsOpen)
- throw new InvalidOperationException("Transport is not open.");
+ throw new TTransportException(TTransportException.ExceptionType.NotOpen);
if (inputBuffer.Capacity < bufSize)
inputBuffer.Capacity = bufSize;
int got = inputBuffer.Read(buf, off, len);
@@ -96,7 +96,7 @@ namespace Thrift.Transport
CheckNotDisposed();
ValidateBufferArgs(buf, off, len);
if (!IsOpen)
- throw new InvalidOperationException("Transport is not open.");
+ throw new TTransportException(TTransportException.ExceptionType.NotOpen);
// Relative offset from "off" argument
int offset = 0;
if (outputBuffer.Length > 0)
@@ -129,7 +129,7 @@ namespace Thrift.Transport
{
CheckNotDisposed();
if (!IsOpen)
- throw new InvalidOperationException("Transport is not open.");
+ throw new TTransportException(TTransportException.ExceptionType.NotOpen);
if (outputBuffer.Length > 0)
{
transport.Write(outputBuffer.GetBuffer(), 0, (int)outputBuffer.Length);
http://git-wip-us.apache.org/repos/asf/thrift/blob/96409d9d/lib/csharp/src/Transport/TFramedTransport.cs
----------------------------------------------------------------------
diff --git a/lib/csharp/src/Transport/TFramedTransport.cs b/lib/csharp/src/Transport/TFramedTransport.cs
index 9c6a794..a369e8e 100644
--- a/lib/csharp/src/Transport/TFramedTransport.cs
+++ b/lib/csharp/src/Transport/TFramedTransport.cs
@@ -73,7 +73,7 @@ namespace Thrift.Transport
CheckNotDisposed();
ValidateBufferArgs(buf, off, len);
if (!IsOpen)
- throw new InvalidOperationException("Transport is not open.");
+ throw new TTransportException(TTransportException.ExceptionType.NotOpen);
int got = readBuffer.Read(buf, off, len);
if (got > 0)
{
@@ -102,7 +102,7 @@ namespace Thrift.Transport
CheckNotDisposed();
ValidateBufferArgs(buf, off, len);
if (!IsOpen)
- throw new InvalidOperationException("Transport is not open.");
+ throw new TTransportException(TTransportException.ExceptionType.NotOpen);
if (writeBuffer.Length + (long)len > (long)int.MaxValue)
Flush();
writeBuffer.Write(buf, off, len);
@@ -112,7 +112,7 @@ namespace Thrift.Transport
{
CheckNotDisposed();
if (!IsOpen)
- throw new InvalidOperationException("Transport is not open.");
+ throw new TTransportException(TTransportException.ExceptionType.NotOpen);
byte[] buf = writeBuffer.GetBuffer();
int len = (int)writeBuffer.Length;
int data_len = len - HeaderSize;