languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-22 01:22:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use cammelCase for all service extension variables

Browse source 
R=johnmccutchan@google.com, johnmmccutchan@google.com
BUG=

Review URL: https://codereview.chromium.org//1343033002 .
This commit is contained in:
Rico Wind 2015-09-16 07:27:45 +02:00
parent 09c804aa78
commit b6e48e9617
6 changed files with 113 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
runtime/observatory/tests/service/file_service_test.dart
View file

@ -79,22 +79,22 @@ var fileTests = [
var writing = await isolate.invokeRpcNoUpgrade(
'__getFileByID', { 'id' : result['data'][0]['id'] });
expect(writing['total_read'], equals(0));
expect(writing['read_count'], equals(0));
expect(writing['write_count'], equals(3));
expect(writing['total_written'], equals(3));
expect(writing['last_write'], greaterThan(0));
expect(writing['last_read'], equals(0));
expect(writing['totalRead'], equals(0));
expect(writing['readCount'], equals(0));
expect(writing['writeCount'], equals(3));
expect(writing['totalWritten'], equals(3));
expect(writing['lastWrite'], greaterThan(0));
expect(writing['lastRead'], equals(0));
var reading = await isolate.invokeRpcNoUpgrade(
'__getFileByID', { 'id' : result['data'][1]['id'] });
expect(reading['total_read'], equals(5));
expect(reading['read_count'], equals(5));
expect(reading['write_count'], equals(0));
expect(reading['total_written'], equals(0));
expect(reading['last_write'], equals(0));
expect(reading['last_read'], greaterThan(0));
expect(reading['totalRead'], equals(5));
expect(reading['readCount'], equals(5));
expect(reading['writeCount'], equals(0));
expect(reading['totalWritten'], equals(0));
expect(reading['lastWrite'], equals(0));
expect(reading['lastRead'], greaterThan(0));
} finally {
await isolate.invokeRpcNoUpgrade('__cleanup', {});

8
runtime/observatory/tests/service/process_service_test.dart
View file

@ -94,7 +94,7 @@ var processTests = [
expect(first['name'], io.Platform.executable);
expect(first['pid'], equals(setup['pids'][0]));
expect(first['arguments'].contains('foobar'), isFalse);
expect(first['started_at'], greaterThan(0));
expect(first['startedAt'], greaterThan(0));
var second = await isolate.invokeRpcNoUpgrade(
'__getProcessById', { 'id' : all['data'][1]['id'] });
@ -102,8 +102,8 @@ var processTests = [
expect(second['pid'], equals(setup['pids'][1]));
expect(second['arguments'].contains('foobar'), isTrue);
expect(second['pid'] != first['pid'], isTrue);
expect(second['started_at'], greaterThan(0));
expect(second['started_at'], greaterThanOrEqualTo(first['started_at']));
expect(second['startedAt'], greaterThan(0));
expect(second['startedAt'], greaterThanOrEqualTo(first['startedAt']));
var third = await isolate.invokeRpcNoUpgrade(
'__getProcessById', { 'id' : all['data'][2]['id'] });
@ -111,7 +111,7 @@ var processTests = [
expect(third['pid'], equals(setup['pids'][2]));
expect(third['pid'] != first['pid'], isTrue);
expect(third['pid'] != second['pid'], isTrue);
expect(third['started_at'], greaterThanOrEqualTo(second['started_at']));
expect(third['startedAt'], greaterThanOrEqualTo(second['startedAt']));
await isolate.invokeRpcNoUpgrade('__closeStdin', {});
all = await isolate.invokeRpcNoUpgrade('__getProcesses', {});

12
runtime/observatory/tests/service/tcp_socket_closing_service_test.dart
View file

@ -62,12 +62,12 @@ var tests = [
var server = await isolate.invokeRpcNoUpgrade(
'__getSocketByID', { 'id' : result['data'][0]['id'] });
expect(server['listening'], isTrue);
expect(server['last_read'], equals(0));
expect(server['total_read'], equals(0));
expect(server['last_write'], equals(0));
expect(server['total_written'], equals(0));
expect(server['write_count'], equals(0));
expect(server['read_count'], equals(0));
expect(server['lastRead'], equals(0));
expect(server['totalRead'], equals(0));
expect(server['lastWrite'], equals(0));
expect(server['totalWritten'], equals(0));
expect(server['writeCount'], equals(0));
expect(server['readCount'], equals(0));
},
];

110
runtime/observatory/tests/service/tcp_socket_service_test.dart
View file

@ -48,17 +48,17 @@ var tcpTests = [
'__getSocketByID', { 'id' : result['data'][0]['id'] });
expect(listening['id'], equals(result['data'][0]['id']));
expect(listening['listening'], isTrue);
expect(listening['socket_type'], equals('TCP'));
expect(listening['socketType'], equals('TCP'));
expect(listening['port'], greaterThanOrEqualTo(1024));
expect(listening['last_read'], greaterThan(0));
expect(listening['lastRead'], greaterThan(0));
expect(listening['total_read'], equals(2));
expect(listening['last_write'], equals(0));
expect(listening['total_written'], equals(0));
expect(listening['write_count'], equals(0));
expect(listening['read_count'], equals(2));
expect(listening['remote_host'], equals('NA'));
expect(listening['remote_port'], equals('NA'));
expect(listening['totalRead'], equals(2));
expect(listening['lastWrite'], equals(0));
expect(listening['totalWritten'], equals(0));
expect(listening['writeCount'], equals(0));
expect(listening['readCount'], equals(2));
expect(listening['remoteHost'], equals('NA'));
expect(listening['remotePort'], equals('NA'));
var client = await isolate.invokeRpcNoUpgrade(
'__getSocketByID', { 'id' : result['data'][1]['id'] });
@ -70,8 +70,8 @@ var tcpTests = [
// We expect the client to be connected on the port and
// host of the listening socket.
expect(client['remote_port'], equals(listening['port']));
expect(client['remote_host'], equals(listening['host']));
expect(client['remotePort'], equals(listening['port']));
expect(client['remoteHost'], equals(listening['host']));
// We expect the third socket (accepted server) to be connected to the
// same port and host as the listening socket (the listening one).
expect(server['port'], equals(listening['port']));
@ -80,8 +80,8 @@ var tcpTests = [
expect(client['listening'], isFalse);
expect(server['listening'], isFalse);
expect(client['socket_type'], equals('TCP'));
expect(server['socket_type'], equals('TCP'));
expect(client['socketType'], equals('TCP'));
expect(server['socketType'], equals('TCP'));
// We are using no reserved ports.
expect(client['port'], greaterThanOrEqualTo(1024));
@ -89,76 +89,76 @@ var tcpTests = [
// The client and server "mirror" each other in reads and writes, and the
// timestamps are in correct order.
expect(client['last_read'], equals(0));
expect(server['last_read'], greaterThan(0));
expect(client['total_read'], equals(0));
expect(server['total_read'], equals(12));
expect(client['read_count'], equals(0));
expect(server['read_count'], greaterThanOrEqualTo(1));
expect(client['lastRead'], equals(0));
expect(server['lastRead'], greaterThan(0));
expect(client['totalRead'], equals(0));
expect(server['totalRead'], equals(12));
expect(client['readCount'], equals(0));
expect(server['readCount'], greaterThanOrEqualTo(1));
expect(client['last_write'], greaterThan(0));
expect(server['last_write'], equals(0));
expect(client['total_written'], equals(12));
expect(server['total_written'], equals(0));
expect(client['write_count'], greaterThanOrEqualTo(2));
expect(server['write_count'], equals(0));
expect(client['lastWrite'], greaterThan(0));
expect(server['lastWrite'], equals(0));
expect(client['totalWritten'], equals(12));
expect(server['totalWritten'], equals(0));
expect(client['writeCount'], greaterThanOrEqualTo(2));
expect(server['writeCount'], equals(0));
// Order
// Stopwatch resolution on windows can make us have the same timestamp.
if (io.Platform.isWindows) {
expect(server['last_read'], greaterThanOrEqualTo(client['last_write']));
expect(server['lastRead'], greaterThanOrEqualTo(client['lastWrite']));
} else {
expect(server['last_read'], greaterThan(client['last_write']));
expect(server['lastRead'], greaterThan(client['lastWrite']));
}
var second_client = await isolate.invokeRpcNoUpgrade(
var secondClient = await isolate.invokeRpcNoUpgrade(
'__getSocketByID', { 'id' : result['data'][3]['id'] });
expect(second_client['id'], equals(result['data'][3]['id']));
var second_server = await isolate.invokeRpcNoUpgrade(
expect(secondClient['id'], equals(result['data'][3]['id']));
var secondServer = await isolate.invokeRpcNoUpgrade(
'__getSocketByID', { 'id' : result['data'][4]['id'] });
expect(second_server['id'], equals(result['data'][4]['id']));
expect(secondServer['id'], equals(result['data'][4]['id']));
// We expect the client to be connected on the port and
// host of the listening socket.
expect(second_client['remote_port'], equals(listening['port']));
expect(second_client['remote_host'], equals(listening['host']));
expect(secondClient['remotePort'], equals(listening['port']));
expect(secondClient['remoteHost'], equals(listening['host']));
// We expect the third socket (accepted server) to be connected to the
// same port and host as the listening socket (the listening one).
expect(second_server['port'], equals(listening['port']));
expect(second_server['host'], equals(listening['host']));
expect(secondServer['port'], equals(listening['port']));
expect(secondServer['host'], equals(listening['host']));
expect(second_client['listening'], isFalse);
expect(second_server['listening'], isFalse);
expect(secondClient['listening'], isFalse);
expect(secondServer['listening'], isFalse);
expect(second_client['socket_type'], equals('TCP'));
expect(second_server['socket_type'], equals('TCP'));
expect(secondClient['socketType'], equals('TCP'));
expect(secondServer['socketType'], equals('TCP'));
// We are using no reserved ports.
expect(second_client['port'], greaterThanOrEqualTo(1024));
expect(second_server['port'], greaterThanOrEqualTo(1024));
expect(secondClient['port'], greaterThanOrEqualTo(1024));
expect(secondServer['port'], greaterThanOrEqualTo(1024));
// The client and server "mirror" each other in reads and writes, and the
// timestamps are in correct order.
expect(second_client['last_read'], equals(0));
expect(second_server['last_read'], greaterThan(0));
expect(second_client['total_read'], equals(0));
expect(second_server['total_read'], equals(12));
expect(second_client['read_count'], equals(0));
expect(second_server['read_count'], greaterThanOrEqualTo(1));
expect(secondClient['lastRead'], equals(0));
expect(secondServer['lastRead'], greaterThan(0));
expect(secondClient['totalRead'], equals(0));
expect(secondServer['totalRead'], equals(12));
expect(secondClient['readCount'], equals(0));
expect(secondServer['readCount'], greaterThanOrEqualTo(1));
expect(second_client['last_write'], greaterThan(0));
expect(second_server['last_write'], equals(0));
expect(second_client['total_written'], equals(12));
expect(second_server['total_written'], equals(0));
expect(second_client['write_count'], greaterThanOrEqualTo(1));
expect(second_server['write_count'], equals(0));
expect(secondClient['lastWrite'], greaterThan(0));
expect(secondServer['lastWrite'], equals(0));
expect(secondClient['totalWritten'], equals(12));
expect(secondServer['totalWritten'], equals(0));
expect(secondClient['writeCount'], greaterThanOrEqualTo(1));
expect(secondServer['writeCount'], equals(0));
// Order
// Stopwatch resolution on windows make us sometimes report the same value.
if (io.Platform.isWindows) {
expect(server['last_read'], greaterThanOrEqualTo(client['last_write']));
expect(server['lastRead'], greaterThanOrEqualTo(client['lastWrite']));
} else {
expect(server['last_read'], greaterThan(client['last_write']));
expect(server['lastRead'], greaterThan(client['lastWrite']));
}
},
];

40
runtime/observatory/tests/service/udp_socket_service_test.dart
View file

@ -40,42 +40,42 @@ var udpTests = [
var server = await isolate.invokeRpcNoUpgrade(
'__getSocketByID', { 'id' : result['data'][0]['id'] });
expect(server['id'], equals(result['data'][0]['id']));
expect(server['remote_port'], equals('NA'));
expect(server['remote_host'], equals('NA'));
expect(server['remotePort'], equals('NA'));
expect(server['remoteHost'], equals('NA'));
expect(server['listening'], isFalse);
expect(server['socket_type'], equals('UDP'));
expect(server['socketType'], equals('UDP'));
expect(server['port'], greaterThanOrEqualTo(1024));
// Stopwatch resolution on windows makes us sometimes report 0;
if (io.Platform.isWindows) {
expect(server['last_read'], greaterThanOrEqualTo(0));
expect(server['lastRead'], greaterThanOrEqualTo(0));
} else {
expect(server['last_read'], greaterThan(0));
expect(server['lastRead'], greaterThan(0));
}
expect(server['total_read'], equals(6));
expect(server['last_write'], equals(0));
expect(server['total_written'], equals(0));
expect(server['write_count'], equals(0));
expect(server['read_count'], greaterThanOrEqualTo(1));
expect(server['totalRead'], equals(6));
expect(server['lastWrite'], equals(0));
expect(server['totalWritten'], equals(0));
expect(server['writeCount'], equals(0));
expect(server['readCount'], greaterThanOrEqualTo(1));
var client = await isolate.invokeRpcNoUpgrade(
'__getSocketByID', { 'id' : result['data'][1]['id'] });
expect(client['id'], equals(result['data'][1]['id']));
expect(client['remote_port'], equals('NA'));
expect(client['remote_host'], equals('NA'));
expect(client['remotePort'], equals('NA'));
expect(client['remoteHost'], equals('NA'));
expect(client['listening'], isFalse);
expect(client['socket_type'], equals('UDP'));
expect(client['socketType'], equals('UDP'));
expect(client['port'], greaterThanOrEqualTo(1024));
expect(client['last_read'], equals(0));
expect(client['total_read'], equals(0));
expect(client['lastRead'], equals(0));
expect(client['totalRead'], equals(0));
// Stopwatch resolution on windows makes us sometimes report 0;
if (io.Platform.isWindows) {
expect(client['last_write'], greaterThanOrEqualTo(0));
expect(client['lastWrite'], greaterThanOrEqualTo(0));
} else {
expect(client['last_write'], greaterThan(0));
expect(client['lastWrite'], greaterThan(0));
}
expect(client['total_written'], equals(6));
expect(client['write_count'], greaterThanOrEqualTo(1));
expect(client['read_count'], equals(0));
expect(client['totalWritten'], equals(6));
expect(client['writeCount'], greaterThanOrEqualTo(1));
expect(client['readCount'], equals(0));
},
];

32
sdk/lib/io/io_resource_info.dart
View file

@ -76,12 +76,12 @@ abstract class _ReadWriteResourceInfo extends _IOResourceInfo {
'type': type,
'id': id,
'name': name,
'total_read': totalRead,
'total_written': totalWritten,
'read_count': readCount,
'write_count': writeCount,
'last_read': lastRead,
'last_write': lastWrite
'totalRead': totalRead,
'totalWritten': totalWritten,
'readCount': readCount,
'writeCount': writeCount,
'lastRead': lastRead,
'lastWrite': lastWrite
};
}
@ -161,9 +161,9 @@ class _ProcessResourceInfo extends _IOResourceInfo{
'id': id,
'name': name,
'pid': process.pid,
'started_at': startedAt,
'startedAt': startedAt,
'arguments': process._arguments,
'working_directory':
'workingDirectory':
process._workingDirectory == null ? '.' : process._workingDirectory,
};
@ -232,24 +232,24 @@ class _SocketResourceInfo extends _ReadWriteResourceInfo {
Map<String, String> getSocketInfoMap() {
var result = fullValueMap;
result['socket_type'] = socket.isTcp ? TCP_STRING : UDP_STRING;
result['socketType'] = socket.isTcp ? TCP_STRING : UDP_STRING;
result['listening'] = socket.isListening;
result['host'] = socket.address.host;
result['port'] = socket.port;
if (!socket.isListening) {
try {
result['remote_host'] = socket.remoteAddress.host;
result['remote_port'] = socket.remotePort;
result['remoteHost'] = socket.remoteAddress.host;
result['remotePort'] = socket.remotePort;
} catch (e) {
// UDP.
result['remote_port'] = 'NA';
result['remote_host'] = 'NA';
result['remotePort'] = 'NA';
result['remoteHost'] = 'NA';
}
} else {
result['remote_port'] = 'NA';
result['remote_host'] = 'NA';
result['remotePort'] = 'NA';
result['remoteHost'] = 'NA';
}
result['address_type'] = socket.address.type.name;
result['addressType'] = socket.address.type.name;
return result;
}