languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-14 14:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop using deprecated "screaming caps" constants from dart:io

Browse source 
Bug: https://github.com/dart-lang/sdk/issues/34218
Change-Id: I4215c0a2212d5c15972d9ffe4075c89d27c9081e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/235701
Reviewed-by: Daco Harkes <dacoharkes@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Paul Berry <paulberry@google.com>
This commit is contained in:
Paul Berry 2022-03-09 16:08:44 +00:00 committed by Commit Bot
parent 23b1f38981
commit 9872e9d4c4
9 changed files with 60 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
runtime/tests/vm/dart/hello_fuchsia_test.dart
View file

@ -21,13 +21,13 @@ testAddressParse() async {
}
testSimpleBind() async {
var s = await RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0);
var s = await RawServerSocket.bind(InternetAddress.loopbackIPv4, 0);
print("port = ${s.port}");
await s.close();
}
testSimpleConnect() async {
var server = await RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0);
var server = await RawServerSocket.bind(InternetAddress.loopbackIPv4, 0);
print("server port = ${server.port}");
server.listen((socket) {
print("listen socket port = ${socket.port}");
@ -36,7 +36,7 @@ testSimpleConnect() async {
var socket = await RawSocket.connect("127.0.0.1", server.port);
print("socket port = ${socket.port}");
if (socket.remoteAddress.address != "127.0.0.1" ||
socket.remoteAddress.type != InternetAddressType.IP_V4) {
socket.remoteAddress.type != InternetAddressType.IPv4) {
throw "Bad remote address ${socket.remoteAddress}";
}
if (socket.remotePort is! int) {
@ -68,7 +68,7 @@ testSimpleReadWriteClose() async {
}
}
var server = await RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0);
var server = await RawServerSocket.bind(InternetAddress.loopbackIPv4, 0);
server.listen((client) {
int bytesRead = 0;
int bytesWritten = 0;
@ -79,7 +79,7 @@ testSimpleReadWriteClose() async {
client.writeEventsEnabled = false;
client.listen((event) {
switch (event) {
case RawSocketEvent.READ:
case RawSocketEvent.read:
if (doneReading) {
break;
}
@ -97,7 +97,7 @@ testSimpleReadWriteClose() async {
doneReading = true;
}
break;
case RawSocketEvent.WRITE:
case RawSocketEvent.write:
assert(!client.writeEventsEnabled);
bytesWritten +=
client.write(data, bytesWritten, data.length - bytesWritten);
@ -109,12 +109,12 @@ testSimpleReadWriteClose() async {
print("client WRITE event: done writing.");
}
break;
case RawSocketEvent.READ_CLOSED:
case RawSocketEvent.readClosed:
print("client READ_CLOSED event");
client.close();
server.close();
break;
case RawSocketEvent.CLOSED:
case RawSocketEvent.closed:
assert(!closedEventReceived);
print("client CLOSED event");
closedEventReceived = true;
@ -139,7 +139,7 @@ testSimpleReadWriteClose() async {
socket.listen((event) {
switch (event) {
case RawSocketEvent.READ:
case RawSocketEvent.read:
assert(socket.available() > 0);
print("server READ event: ${bytesRead} read");
var buffer = socket.read()!;
@ -151,7 +151,7 @@ testSimpleReadWriteClose() async {
socket.close();
}
break;
case RawSocketEvent.WRITE:
case RawSocketEvent.write:
assert(bytesRead == 0);
assert(!socket.writeEventsEnabled);
bytesWritten +=
@ -164,12 +164,12 @@ testSimpleReadWriteClose() async {
data = new List<int>.filled(messageSize, -1);
}
break;
case RawSocketEvent.READ_CLOSED:
case RawSocketEvent.readClosed:
print("server READ_CLOSED event");
verifyTestData(data);
socket.close();
break;
case RawSocketEvent.CLOSED:
case RawSocketEvent.closed:
assert(!closedEventReceived);
print("server CLOSED event");
closedEventReceived = true;
@ -210,7 +210,7 @@ testSimpleReadWriteShutdown({required bool dropReads}) async {
}
}
var server = await RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0);
var server = await RawServerSocket.bind(InternetAddress.loopbackIPv4, 0);
server.listen((client) {
int bytesRead = 0;
int bytesWritten = 0;
@ -221,7 +221,7 @@ testSimpleReadWriteShutdown({required bool dropReads}) async {
client.writeEventsEnabled = false;
client.listen((event) {
switch (event) {
case RawSocketEvent.READ:
case RawSocketEvent.read:
if (doneReading) {
break;
}
@ -247,7 +247,7 @@ testSimpleReadWriteShutdown({required bool dropReads}) async {
doneReading = true;
}
break;
case RawSocketEvent.WRITE:
case RawSocketEvent.write:
assert(!client.writeEventsEnabled);
bytesWritten +=
client.write(data, bytesWritten, data.length - bytesWritten);
@ -257,14 +257,14 @@ testSimpleReadWriteShutdown({required bool dropReads}) async {
}
if (bytesWritten == data.length) {
print("client WRITE event: done writing.");
client.shutdown(SocketDirection.SEND);
client.shutdown(SocketDirection.send);
}
break;
case RawSocketEvent.READ_CLOSED:
case RawSocketEvent.readClosed:
print("client READ_CLOSED event");
server.close();
break;
case RawSocketEvent.CLOSED:
case RawSocketEvent.closed:
assert(!closedEventReceived);
print("client CLOSED event");
closedEventReceived = true;
@ -287,7 +287,7 @@ testSimpleReadWriteShutdown({required bool dropReads}) async {
socket.listen((event) {
switch (event) {
case RawSocketEvent.READ:
case RawSocketEvent.read:
assert(socket.available() > 0);
if (dropReads) {
if (clientReadCount != 10) {
@ -303,7 +303,7 @@ testSimpleReadWriteShutdown({required bool dropReads}) async {
data.setRange(bytesRead, bytesRead + buffer.length, buffer);
bytesRead += buffer.length;
break;
case RawSocketEvent.WRITE:
case RawSocketEvent.write:
assert(bytesRead == 0);
assert(!socket.writeEventsEnabled);
bytesWritten +=
@ -316,12 +316,12 @@ testSimpleReadWriteShutdown({required bool dropReads}) async {
data = new List<int>.filled(messageSize, -1);
}
break;
case RawSocketEvent.READ_CLOSED:
case RawSocketEvent.readClosed:
print("server READ_CLOSED event");
verifyTestData(data);
socket.close();
break;
case RawSocketEvent.CLOSED:
case RawSocketEvent.closed:
assert(!closedEventReceived);
print("server CLOSED event");
closedEventReceived = true;

4
runtime/tests/vm/dart/regress38654_test.dart
View file

@ -60,7 +60,7 @@ String foo0() {
((var3
? Float32x4.wyyy
: var7[
(false ? var4 : ZLibOption.DEFAULT_WINDOW_BITS)]) <<
(false ? var4 : ZLibOption.defaultWindowBits)]) <<
var7[var7[-32769]]),
(var3 ? 8 : var7[-9223372036854775680]),
(Int32x4.xxww ^ Int32x4.zzyy)
@ -183,7 +183,7 @@ Set<int> foo1(int par1, bool par2) {
(~(((!(true))
? (false
? (++var2)
: var7[ZLibOption.STRATEGY_FILTERED])
: var7[ZLibOption.strategyFiltered])
: Float32x4.xxyz))),
(var3
? (true

44
runtime/tests/vm/dart_2/hello_fuchsia_test.dart
View file

@ -23,13 +23,13 @@ testAddressParse() async {
}
testSimpleBind() async {
var s = await RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0);
var s = await RawServerSocket.bind(InternetAddress.loopbackIPv4, 0);
print("port = ${s.port}");
await s.close();
}
testSimpleConnect() async {
var server = await RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0);
var server = await RawServerSocket.bind(InternetAddress.loopbackIPv4, 0);
print("server port = ${server.port}");
server.listen((socket) {
print("listen socket port = ${socket.port}");
@ -38,7 +38,7 @@ testSimpleConnect() async {
var socket = await RawSocket.connect("127.0.0.1", server.port);
print("socket port = ${socket.port}");
if (socket.remoteAddress.address != "127.0.0.1" ||
socket.remoteAddress.type != InternetAddressType.IP_V4) {
socket.remoteAddress.type != InternetAddressType.IPv4) {
throw "Bad remote address ${socket.remoteAddress}";
}
if (socket.remotePort is! int) {
@ -70,7 +70,7 @@ testSimpleReadWriteClose() async {
}
}
var server = await RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0);
var server = await RawServerSocket.bind(InternetAddress.loopbackIPv4, 0);
server.listen((client) {
int bytesRead = 0;
int bytesWritten = 0;
@ -81,7 +81,7 @@ testSimpleReadWriteClose() async {
client.writeEventsEnabled = false;
client.listen((event) {
switch (event) {
case RawSocketEvent.READ:
case RawSocketEvent.read:
if (doneReading) {
break;
}
@ -99,7 +99,7 @@ testSimpleReadWriteClose() async {
doneReading = true;
}
break;
case RawSocketEvent.WRITE:
case RawSocketEvent.write:
assert(!client.writeEventsEnabled);
bytesWritten +=
client.write(data, bytesWritten, data.length - bytesWritten);
@ -111,12 +111,12 @@ testSimpleReadWriteClose() async {
print("client WRITE event: done writing.");
}
break;
case RawSocketEvent.READ_CLOSED:
case RawSocketEvent.readClosed:
print("client READ_CLOSED event");
client.close();
server.close();
break;
case RawSocketEvent.CLOSED:
case RawSocketEvent.closed:
assert(!closedEventReceived);
print("client CLOSED event");
closedEventReceived = true;
@ -141,7 +141,7 @@ testSimpleReadWriteClose() async {
socket.listen((event) {
switch (event) {
case RawSocketEvent.READ:
case RawSocketEvent.read:
assert(socket.available() > 0);
print("server READ event: ${bytesRead} read");
var buffer = socket.read();
@ -153,7 +153,7 @@ testSimpleReadWriteClose() async {
socket.close();
}
break;
case RawSocketEvent.WRITE:
case RawSocketEvent.write:
assert(bytesRead == 0);
assert(!socket.writeEventsEnabled);
bytesWritten +=
@ -166,12 +166,12 @@ testSimpleReadWriteClose() async {
data = new List<int>(messageSize);
}
break;
case RawSocketEvent.READ_CLOSED:
case RawSocketEvent.readClosed:
print("server READ_CLOSED event");
verifyTestData(data);
socket.close();
break;
case RawSocketEvent.CLOSED:
case RawSocketEvent.closed:
assert(!closedEventReceived);
print("server CLOSED event");
closedEventReceived = true;
@ -212,7 +212,7 @@ testSimpleReadWriteShutdown({bool dropReads}) async {
}
}
var server = await RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0);
var server = await RawServerSocket.bind(InternetAddress.loopbackIPv4, 0);
server.listen((client) {
int bytesRead = 0;
int bytesWritten = 0;
@ -223,7 +223,7 @@ testSimpleReadWriteShutdown({bool dropReads}) async {
client.writeEventsEnabled = false;
client.listen((event) {
switch (event) {
case RawSocketEvent.READ:
case RawSocketEvent.read:
if (doneReading) {
break;
}
@ -249,7 +249,7 @@ testSimpleReadWriteShutdown({bool dropReads}) async {
doneReading = true;
}
break;
case RawSocketEvent.WRITE:
case RawSocketEvent.write:
assert(!client.writeEventsEnabled);
bytesWritten +=
client.write(data, bytesWritten, data.length - bytesWritten);
@ -259,14 +259,14 @@ testSimpleReadWriteShutdown({bool dropReads}) async {
}
if (bytesWritten == data.length) {
print("client WRITE event: done writing.");
client.shutdown(SocketDirection.SEND);
client.shutdown(SocketDirection.send);
}
break;
case RawSocketEvent.READ_CLOSED:
case RawSocketEvent.readClosed:
print("client READ_CLOSED event");
server.close();
break;
case RawSocketEvent.CLOSED:
case RawSocketEvent.closed:
assert(!closedEventReceived);
print("client CLOSED event");
closedEventReceived = true;
@ -289,7 +289,7 @@ testSimpleReadWriteShutdown({bool dropReads}) async {
socket.listen((event) {
switch (event) {
case RawSocketEvent.READ:
case RawSocketEvent.read:
assert(socket.available() > 0);
if (dropReads) {
if (clientReadCount != 10) {
@ -305,7 +305,7 @@ testSimpleReadWriteShutdown({bool dropReads}) async {
data.setRange(bytesRead, bytesRead + buffer.length, buffer);
bytesRead += buffer.length;
break;
case RawSocketEvent.WRITE:
case RawSocketEvent.write:
assert(bytesRead == 0);
assert(!socket.writeEventsEnabled);
bytesWritten +=
@ -318,12 +318,12 @@ testSimpleReadWriteShutdown({bool dropReads}) async {
data = new List<int>(messageSize);
}
break;
case RawSocketEvent.READ_CLOSED:
case RawSocketEvent.readClosed:
print("server READ_CLOSED event");
verifyTestData(data);
socket.close();
break;
case RawSocketEvent.CLOSED:
case RawSocketEvent.closed:
assert(!closedEventReceived);
print("server CLOSED event");
closedEventReceived = true;

4
runtime/tests/vm/dart_2/regress38654_test.dart
View file

@ -62,7 +62,7 @@ String foo0() {
((var3
? Float32x4.wyyy
: var7[
(false ? var4 : ZLibOption.DEFAULT_WINDOW_BITS)]) <<
(false ? var4 : ZLibOption.defaultWindowBits)]) <<
var7[var7[-32769]]),
(var3 ? 8 : var7[-9223372036854775680]),
(Int32x4.xxww ^ Int32x4.zzyy)
@ -185,7 +185,7 @@ Set<int> foo1(int par1, bool par2) {
(~(((!(true))
? (false
? (++var2)
: var7[ZLibOption.STRATEGY_FILTERED])
: var7[ZLibOption.strategyFiltered])
: Float32x4.xxyz))),
(var3
? (true

2
sdk/lib/_internal/vm/bin/sync_socket_patch.dart
View file

@ -177,7 +177,7 @@ class _NativeSynchronousSocket extends _NativeSynchronousSocketNativeWrapper {
}
static List<_InternetAddress> lookup(String host,
{InternetAddressType type: InternetAddressType.ANY}) {
{InternetAddressType type: InternetAddressType.any}) {
var response = _nativeLookupRequest(host, type._value);
if (response is OSError) {
throw response;

4
tests/language_2/vm/regress_36977_test.dart
View file

@ -140,7 +140,7 @@ class X0 {
var5[-5],
(-(((var1 ? false : true) ? var5[-87] : par2)))
} ??
{FileSystemEvent.MODIFY, 31, var2})))) +
{FileSystemEvent.modify, 31, var2})))) +
var2),
(((++par2)).isEven
? foo1(
@ -237,7 +237,7 @@ class X0 {
-13,
par2,
-83,
ZLibOption.DEFAULT_MEM_LEVEL,
ZLibOption.defaultMemLevel,
(var2++)
})))))
});

8
tests/standalone/io/unix_socket_test.dart
View file

@ -641,7 +641,7 @@ Future testFileMessageWithShortRead(String tempDirPath) async {
}
Future<RawServerSocket> createTestServer() async {
final server = await RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0);
final server = await RawServerSocket.bind(InternetAddress.loopbackIPv4, 0);
return server
..listen((client) {
String receivedData = "";
@ -649,16 +649,16 @@ Future<RawServerSocket> createTestServer() async {
client.writeEventsEnabled = false;
client.listen((event) {
switch (event) {
case RawSocketEvent.READ:
case RawSocketEvent.read:
assert(client.available() > 0);
final buffer = client.read(200)!;
receivedData += String.fromCharCodes(buffer);
break;
case RawSocketEvent.READ_CLOSED:
case RawSocketEvent.readClosed:
client.close();
server.close();
break;
case RawSocketEvent.CLOSED:
case RawSocketEvent.closed:
Expect.equals(
"Hello, client 1!\nHello, client 2!\nHello, server!\n",
receivedData);

8
tests/standalone_2/io/unix_socket_test.dart
View file

@ -637,7 +637,7 @@ Future testFileMessageWithShortRead(String tempDirPath) async {
}
Future<RawServerSocket> createTestServer() async {
final server = await RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0);
final server = await RawServerSocket.bind(InternetAddress.loopbackIPv4, 0);
return server
..listen((client) {
String receivedData = "";
@ -645,16 +645,16 @@ Future<RawServerSocket> createTestServer() async {
client.writeEventsEnabled = false;
client.listen((event) {
switch (event) {
case RawSocketEvent.READ:
case RawSocketEvent.read:
assert(client.available() > 0);
final buffer = client.read(200);
receivedData += String.fromCharCodes(buffer);
break;
case RawSocketEvent.READ_CLOSED:
case RawSocketEvent.readClosed:
client.close();
server.close();
break;
case RawSocketEvent.CLOSED:
case RawSocketEvent.closed:
Expect.equals(
"Hello, client 1!\nHello, client 2!\nHello, server!\n",
receivedData);

2
tools/dart2js/sourceMapViewer/bin/source_map_viewer.dart
View file

@ -81,7 +81,7 @@ void startServer() {
// Use port 0 to get an ephemeral port.
int port = 0;
HttpServer.bind(InternetAddress.LOOPBACK_IP_V4, port).then((server) {
HttpServer.bind(InternetAddress.loopbackIPv4, port).then((server) {
port = server.port;
print("Source mapping server is running on "
"'http://${server.address.address}:$port/'");