You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ns...@apache.org on 2015/10/25 08:17:17 UTC
thrift git commit: THRIFT-3366 ThriftTest to implement standard
return values Client: Test, Dart Patch Mark Erickson
Repository: thrift
Updated Branches:
refs/heads/master 4eb24f8f1 -> 83072a623
THRIFT-3366 ThriftTest to implement standard return values
Client: Test, Dart
Patch Mark Erickson
This closes #635
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/83072a62
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/83072a62
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/83072a62
Branch: refs/heads/master
Commit: 83072a623447093458dccdf54ddfe789e68ef0e5
Parents: 4eb24f8
Author: Mark Erickson <ma...@workiva.com>
Authored: Mon Oct 5 14:33:28 2015 -0500
Committer: Nobuaki Sukegawa <ns...@apache.org>
Committed: Sun Oct 25 16:00:13 2015 +0900
----------------------------------------------------------------------
test/dart/test_client/bin/main.dart | 237 ++++++++++++++++++-------------
1 file changed, 139 insertions(+), 98 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/83072a62/test/dart/test_client/bin/main.dart
----------------------------------------------------------------------
diff --git a/test/dart/test_client/bin/main.dart b/test/dart/test_client/bin/main.dart
index 3733a08..48c6b3c 100644
--- a/test/dart/test_client/bin/main.dart
+++ b/test/dart/test_client/bin/main.dart
@@ -25,11 +25,80 @@ import 'package:thrift/thrift.dart';
import 'package:thrift/thrift_console.dart';
import 'package:thrift_test/thrift_test.dart';
+const TEST_BASETYPES = 1; // 0000 0001
+const TEST_STRUCTS = 2; // 0000 0010
+const TEST_CONTAINERS = 4; // 0000 0100
+const TEST_EXCEPTIONS = 8; // 0000 1000
+const TEST_UNKNOWN = 64; // 0100 0000 (Failed to prepare environemt etc.)
+const TEST_TIMEOUT = 128; // 1000 0000
+const TEST_NOTUSED = 48; // 0011 0000 (reserved bits)
+
+typedef Future FutureFunction();
+
+class TTest {
+ final int errorCode;
+ final String name;
+ final FutureFunction func;
+
+ TTest(this.errorCode, this.name, this.func);
+}
+
+class TTestError extends Error {
+ final actual;
+ final expected;
+
+ TTestError(this.actual, this.expected);
+
+ String toString() => '$actual != $expected';
+}
+
+List<TTest> _tests;
ThriftTestClient client;
bool verbose;
/// Adapted from TestClient.php
main(List<String> args) async {
+ ArgResults results = _parseArgs(args);
+
+ if (results == null) {
+ exit(TEST_UNKNOWN);
+ }
+
+ verbose = results['verbose'] == true;
+
+ await _initTestClient(
+ host: results['host'],
+ port: int.parse(results['port']),
+ transportType: results['transport'],
+ protocolType: results['protocol']).catchError((e) {
+ stdout.writeln('Error:');
+ stdout.writeln('$e');
+ if (e is Error) {
+ stdout.writeln('${e.stackTrace}');
+ }
+ exit(TEST_UNKNOWN);
+ });
+
+ // run tests
+ _tests = _createTests();
+
+ int result = 0;
+
+ for (TTest test in _tests) {
+ if (verbose) stdout.write('${test.name}... ');
+ try {
+ await test.func();
+ if (verbose) stdout.writeln('success!');
+ } catch (e) {
+ if (verbose) stdout.writeln('$e');
+ result = result | test.errorCode;
+ }
+ }
+
+ exit(result);
+}
+
+ArgResults _parseArgs(List<String> args) {
var parser = new ArgParser();
parser.addOption('host', defaultsTo: 'localhost', help: 'The server host');
parser.addOption('port', defaultsTo: '9090', help: 'The port to connect to');
@@ -53,31 +122,11 @@ main(List<String> args) async {
results = parser.parse(args);
} catch (e) {
stdout.writeln('$e\n');
- results = null;
}
- if (results == null) {
- print(parser.usage);
- exit(0);
- }
-
- verbose = results['verbose'] == true;
+ if (results == null) stdout.write(parser.usage);
- await init(
- host: results['host'],
- port: int.parse(results['port']),
- transportType: results['transport'],
- protocolType: results['protocol']).then((_) {
- exit(0);
- }).catchError((e) {
- stdout.writeln('Error:');
- stdout.writeln('$e');
- if (e is Error) {
- stdout.writeln('${e.stackTrace}');
- }
- exit(1);
- });
- exit(0);
+ return results;
}
TProtocolFactory getProtocolFactory(String protocolType) {
@@ -90,7 +139,7 @@ TProtocolFactory getProtocolFactory(String protocolType) {
throw new ArgumentError.value(protocolType);
}
-Future init(
+Future _initTestClient(
{String host, int port, String transportType, String protocolType}) async {
TTransport transport;
var protocolFactory = getProtocolFactory(protocolType);
@@ -111,145 +160,135 @@ Future init(
client = new ThriftTestClient(protocol);
await transport.open();
-
- await runTests();
}
-Future _test(String name, Function testFunc) async {
- if (verbose) stdout.write('$name... ');
- await testFunc();
- if (verbose) stdout.writeln('success!');
-}
+List<TTest> _createTests() {
+ List<TTest> tests = [];
-Future runTests() async {
var xtruct = new Xtruct()
..string_thing = 'Zero'
..byte_thing = 1
..i32_thing = -3
..i64_thing = -5;
- await _test('testVoid', () async {
+ tests.add(new TTest(TEST_BASETYPES, 'testVoid', () async {
await client.testVoid();
- });
+ }));
- await _test('testString', () async {
+ tests.add(new TTest(TEST_BASETYPES, 'testString', () async {
var input = 'Test';
var result = await client.testString(input);
- if (result != input) throw new StateError('$result != $input');
- });
+ if (result != input) throw new TTestError(result, input);
+ }));
- await _test('testBool', () async {
+ tests.add(new TTest(TEST_BASETYPES, 'testBool', () async {
var input = true;
var result = await client.testBool(input);
- if (result != input) throw new StateError('$result != $input');
- });
+ if (result != input) throw new TTestError(result, input);
+ }));
- await _test('testByte', () async {
+ tests.add(new TTest(TEST_BASETYPES, 'testByte', () async {
var input = 64;
var result = await client.testByte(input);
- if (result != input) throw new StateError('$result != $input');
- });
+ if (result != input) throw new TTestError(result, input);
+ }));
- await _test('testI32', () async {
+ tests.add(new TTest(TEST_BASETYPES, 'testI32', () async {
var input = 2147483647;
var result = await client.testI32(input);
- if (result != input) throw new StateError('$result != $input');
- });
+ if (result != input) throw new TTestError(result, input);
+ }));
- await _test('testI64', () async {
+ tests.add(new TTest(TEST_BASETYPES, 'testI64', () async {
var input = 9223372036854775807;
var result = await client.testI64(input);
- if (result != input) throw new StateError('$result != $input');
- });
+ if (result != input) throw new TTestError(result, input);
+ }));
- await _test('testDouble', () async {
+ tests.add(new TTest(TEST_BASETYPES, 'testDouble', () async {
var input = 3.1415926;
var result = await client.testDouble(input);
- if (result != input) throw new StateError('$result != $input');
- });
+ if (result != input) throw new TTestError(result, input);
+ }));
- await _test('testBinary', () async {
+ tests.add(new TTest(TEST_BASETYPES, 'testBinary', () async {
var utf8Codec = const Utf8Codec();
var input = utf8Codec.encode('foo');
var result = await client.testBinary(input);
var equality = const ListEquality();
- if (!equality.equals(
- result, input)) throw new StateError('$result != $input');
- });
+ if (!equality.equals(result, input)) throw new TTestError(result, input);
+ }));
- await _test('testStruct', () async {
+ tests.add(new TTest(TEST_CONTAINERS, 'testStruct', () async {
var result = await client.testStruct(xtruct);
- if ('$result' != '$xtruct') throw new StateError('$result != $xtruct');
- });
+ if ('$result' != '$xtruct') throw new TTestError(result, xtruct);
+ }));
- await _test('testNest', () async {
+ tests.add(new TTest(TEST_CONTAINERS, 'testNest', () async {
var input = new Xtruct2()
..byte_thing = 1
..struct_thing = xtruct
..i32_thing = -3;
var result = await client.testNest(input);
- if ('$result' != '$input') throw new StateError('$result != $input');
- });
+ if ('$result' != '$input') throw new TTestError(result, input);
+ }));
- await _test('testMap', () async {
+ tests.add(new TTest(TEST_CONTAINERS, 'testMap', () async {
Map<int, int> input = {1: -10, 2: -9, 3: -8, 4: -7, 5: -6};
var result = await client.testMap(input);
var equality = const MapEquality();
- if (!equality.equals(
- result, input)) throw new StateError('$result != $input');
- });
+ if (!equality.equals(result, input)) throw new TTestError(result, input);
+ }));
- await _test('testSet', () async {
+ tests.add(new TTest(TEST_CONTAINERS, 'testSet', () async {
var input = new Set.from([-2, -1, 0, 1, 2]);
var result = await client.testSet(input);
var equality = const SetEquality();
- if (!equality.equals(
- result, input)) throw new StateError('$result != $input');
- });
+ if (!equality.equals(result, input)) throw new TTestError(result, input);
+ }));
- await _test('testList', () async {
+ tests.add(new TTest(TEST_CONTAINERS, 'testList', () async {
var input = [-2, -1, 0, 1, 2];
var result = await client.testList(input);
var equality = const ListEquality();
- if (!equality.equals(
- result, input)) throw new StateError('$result != $input');
- });
+ if (!equality.equals(result, input)) throw new TTestError(result, input);
+ }));
- await _test('testEnum', () async {
+ tests.add(new TTest(TEST_CONTAINERS, 'testEnum', () async {
await _testEnum(Numberz.ONE);
await _testEnum(Numberz.TWO);
await _testEnum(Numberz.THREE);
await _testEnum(Numberz.FIVE);
await _testEnum(Numberz.EIGHT);
- });
+ }));
- await _test('testTypedef', () async {
+ tests.add(new TTest(TEST_BASETYPES, 'testTypedef', () async {
var input = 309858235082523;
var result = await client.testTypedef(input);
- if (result != input) throw new StateError('$result != $input');
- });
+ if (result != input) throw new TTestError(result, input);
+ }));
- await _test('testMapMap', () async {
+ tests.add(new TTest(TEST_CONTAINERS, 'testMapMap', () async {
Map<int, Map<int, int>> result = await client.testMapMap(1);
- if (result.isEmpty ||
- result[result.keys.first].isEmpty) throw new StateError(
- 'expected Map<int, Map<int, int>> got $result');
- });
+ if (result.isEmpty || result[result.keys.first].isEmpty) {
+ throw new TTestError(result, 'Map<int, Map<int, int>>');
+ }
+ }));
- await _test('testInsanity', () async {
+ tests.add(new TTest(TEST_CONTAINERS, 'testInsanity', () async {
var input = new Insanity();
input.userMap = {Numberz.FIVE: 5000};
input.xtructs = [xtruct];
Map<int, Map<int, Insanity>> result = await client.testInsanity(input);
- if (result.isEmpty ||
- result[result.keys.first].isEmpty) throw new StateError(
- 'expected Map<int, Map<int, Insanity>> got $result');
- });
+ if (result.isEmpty || result[result.keys.first].isEmpty) {
+ throw new TTestError(result, 'Map<int, Map<int, Insanity>>');
+ }
+ }));
- await _test('testMulti', () async {
+ tests.add(new TTest(TEST_CONTAINERS, 'testMulti', () async {
var input = new Xtruct()
..string_thing = 'Hello2'
..byte_thing = 123
@@ -258,31 +297,33 @@ Future runTests() async {
var result = await client.testMulti(input.byte_thing, input.i32_thing,
input.i64_thing, {1: 'one'}, Numberz.EIGHT, 5678);
- if ('$result' != '$input') throw new StateError('$result != $input');
- });
+ if ('$result' != '$input') throw new TTestError(result, input);
+ }));
- await _test('testException', () async {
+ tests.add(new TTest(TEST_EXCEPTIONS, 'testException', () async {
try {
await client.testException('Xception');
} on Xception catch (x) {
return;
}
- throw new StateError('expected an Xception');
- });
+ throw new TTestError(null, 'Xception');
+ }));
- await _test('testMultiException', () async {
+ tests.add(new TTest(TEST_EXCEPTIONS, 'testMultiException', () async {
try {
await client.testMultiException('Xception2', 'foo');
} on Xception2 catch (x) {
return;
}
- throw new StateError('expected an Xception2');
- });
+ throw new TTestError(null, 'Xception2');
+ }));
+
+ return tests;
}
Future _testEnum(int input) async {
var result = await client.testEnum(input);
- if (result != input) throw new StateError('$result != $input');
+ if (result != input) throw new TTestError(result, input);
}