THRIFT-5285 Update http package + update to dart 2 + stylistic changes
Client: Dart
Patch: aaronstgeorge-wf
This closes #2251
diff --git a/lib/dart/test/serializer/serializer_test.dart b/lib/dart/test/serializer/serializer_test.dart
index 2f76503..89883cb 100644
--- a/lib/dart/test/serializer/serializer_test.dart
+++ b/lib/dart/test/serializer/serializer_test.dart
@@ -30,22 +30,22 @@
TestTObject testTObject;
setUp(() {
- serializer = new TSerializer();
- deserializer = new TDeserializer();
-
- testTObject = new TestTObject();
+ serializer = TSerializer();
+ deserializer = TDeserializer();
+
+ testTObject = TestTObject();
testTObject.b = true;
testTObject.s = "TEST";
testTObject.d = 15.25;
testTObject.i = 10;
-
- var testList = new List<String>();
+
+ var testList = List<String>();
testList.add("TEST 1");
testList.add("TEST 2");
-
+
testTObject.l = testList;
});
-
+
assertNewObjectEqualsTObject(TestTObject newObject) {
expect(newObject.l, equals(testTObject.l));
expect(newObject.b, equals(testTObject.b));
@@ -53,63 +53,63 @@
expect(newObject.d, equals(testTObject.d));
expect(newObject.s, equals(testTObject.s));
}
-
+
runWriteStringTest() {
var s = serializer.writeString(testTObject);
- var newObject = new TestTObject();
+ var newObject = TestTObject();
deserializer.readString(newObject, s);
assertNewObjectEqualsTObject(newObject);
- };
+ }
runWriteTest() {
var s = serializer.write(testTObject);
- var newObject = new TestTObject();
+ var newObject = TestTObject();
deserializer.read(newObject, s);
assertNewObjectEqualsTObject(newObject);
- };
+ }
test('JSON Protocol String', () {
- serializer.protocol = new TJsonProtocol(serializer.transport);
- deserializer.protocol = new TJsonProtocol(deserializer.transport);
-
+ serializer.protocol = TJsonProtocol(serializer.transport);
+ deserializer.protocol = TJsonProtocol(deserializer.transport);
+
runWriteStringTest();
});
test('JSON Protocol', () {
- serializer.protocol = new TJsonProtocol(serializer.transport);
- deserializer.protocol = new TJsonProtocol(deserializer.transport);
+ serializer.protocol = TJsonProtocol(serializer.transport);
+ deserializer.protocol = TJsonProtocol(deserializer.transport);
runWriteTest();
});
test('Binary Protocol String', () {
- serializer.protocol = new TBinaryProtocol(serializer.transport);
- deserializer.protocol = new TBinaryProtocol(deserializer.transport);
+ serializer.protocol = TBinaryProtocol(serializer.transport);
+ deserializer.protocol = TBinaryProtocol(deserializer.transport);
runWriteStringTest();
});
test('Binary Protocol', () {
- serializer.protocol = new TBinaryProtocol(serializer.transport);
- deserializer.protocol = new TBinaryProtocol(deserializer.transport);
+ serializer.protocol = TBinaryProtocol(serializer.transport);
+ deserializer.protocol = TBinaryProtocol(deserializer.transport);
runWriteTest();
});
test('Compact Protocol String', () {
- serializer.protocol = new TCompactProtocol(serializer.transport);
- deserializer.protocol = new TCompactProtocol(deserializer.transport);
+ serializer.protocol = TCompactProtocol(serializer.transport);
+ deserializer.protocol = TCompactProtocol(deserializer.transport);
runWriteStringTest();
});
test('Compact Protocol', () {
- serializer.protocol = new TCompactProtocol(serializer.transport);
- deserializer.protocol = new TCompactProtocol(deserializer.transport);
+ serializer.protocol = TCompactProtocol(serializer.transport);
+ deserializer.protocol = TCompactProtocol(deserializer.transport);
runWriteTest();
});
diff --git a/lib/dart/test/serializer/serializer_test_data.dart b/lib/dart/test/serializer/serializer_test_data.dart
index 3586f08..fc488f4 100644
--- a/lib/dart/test/serializer/serializer_test_data.dart
+++ b/lib/dart/test/serializer/serializer_test_data.dart
@@ -23,12 +23,12 @@
/// TestTObject is a simple test struct
class TestTObject implements TBase {
- static final TStruct _STRUCT_DESC = new TStruct("TestTObject");
- static final TField _I_FIELD_DESC = new TField("i", TType.I32, 1);
- static final TField _D_FIELD_DESC = new TField("d", TType.DOUBLE, 2);
- static final TField _S_FIELD_DESC = new TField("s", TType.STRING, 3);
- static final TField _L_FIELD_DESC = new TField("l", TType.LIST, 4);
- static final TField _B_FIELD_DESC = new TField("b", TType.BOOL, 5);
+ static final TStruct _STRUCT_DESC = TStruct("TestTObject");
+ static final TField _I_FIELD_DESC = TField("i", TType.I32, 1);
+ static final TField _D_FIELD_DESC = TField("d", TType.DOUBLE, 2);
+ static final TField _S_FIELD_DESC = TField("s", TType.STRING, 3);
+ static final TField _L_FIELD_DESC = TField("l", TType.LIST, 4);
+ static final TField _B_FIELD_DESC = TField("b", TType.BOOL, 5);
int _i;
static const int I = 1;
@@ -45,8 +45,7 @@
bool __isset_d = false;
bool __isset_b = false;
- TestTObject() {
- }
+ TestTObject();
// i
int get i => this._i;
@@ -116,6 +115,7 @@
this.__isset_b = false;
}
+ @override
getFieldValue(int fieldID) {
switch (fieldID) {
case I:
@@ -129,10 +129,11 @@
case B:
return this.b;
default:
- throw new ArgumentError("Field $fieldID doesn't exist!");
+ throw ArgumentError("Field $fieldID doesn't exist!");
}
}
+ @override
setFieldValue(int fieldID, Object value) {
switch (fieldID) {
case I:
@@ -176,11 +177,12 @@
break;
default:
- throw new ArgumentError("Field $fieldID doesn't exist!");
+ throw ArgumentError("Field $fieldID doesn't exist!");
}
}
// Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise
+ @override
bool isSet(int fieldID) {
switch (fieldID) {
case I:
@@ -194,10 +196,11 @@
case B:
return isSetB();
default:
- throw new ArgumentError("Field $fieldID doesn't exist!");
+ throw ArgumentError("Field $fieldID doesn't exist!");
}
}
+ @override
read(TProtocol iprot) {
TField field;
iprot.readStructBegin();
@@ -234,7 +237,7 @@
if (field.type == TType.LIST) {
{
TList _list74 = iprot.readListBegin();
- this.l = new List<String>();
+ this.l = List<String>();
for (int _i75 = 0; _i75 < _list74.length; ++_i75) {
String _elem76;
_elem76 = iprot.readString();
@@ -266,6 +269,7 @@
validate();
}
+ @override
write(TProtocol oprot) {
validate();
@@ -284,7 +288,7 @@
if (this.l != null) {
oprot.writeFieldBegin(_L_FIELD_DESC);
{
- oprot.writeListBegin(new TList(TType.STRING, this.l.length));
+ oprot.writeListBegin(TList(TType.STRING, this.l.length));
for (var elem77 in this.l) {
oprot.writeString(elem77);
}
@@ -299,8 +303,9 @@
oprot.writeStructEnd();
}
+ @override
String toString() {
- StringBuffer ret = new StringBuffer("TestTObject(");
+ StringBuffer ret = StringBuffer("TestTObject(");
ret.write("i:");
ret.write(this.i);
@@ -338,5 +343,4 @@
// check for required fields
// check that fields of type enum have valid values
}
-
}