dart-lang#993. Changes according to review notes

sgrekhov · Aug 2, 2022 · 42d4e24 · 42d4e24
1 parent 2e78f3e
commit 42d4e24
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 12 deletions.
diff --git a/LibTest/ffi/Bool/Bool_A01_t01.dart b/LibTest/ffi/Bool/Bool_A01_t01.dart
@@ -17,7 +17,6 @@ import "../../../Utils/expect.dart";
 void main() {
   Pointer<Bool> p1 = calloc<Bool>();
   try {
-    Expect.isFalse(p1.value);
     p1.value = true;
     Expect.isTrue(p1.value);
     p1.value = false;

diff --git a/LibTest/ffi/Bool/Bool_A01_t02.dart b/LibTest/ffi/Bool/Bool_A01_t02.dart
@@ -16,7 +16,7 @@ import "../../../Utils/expect.dart";
 
 void main() {
   Pointer<Bool> p1 = calloc<Bool>();
-  Pointer<Int16> p2 = new Pointer<Int16>.fromAddress(p1.address);
+  Pointer<Uint8> p2 = new Pointer<Uint8>.fromAddress(p1.address);
   try {
     p2.value = 0;
     Expect.isFalse(p1.value);

diff --git a/LibTest/ffi/Bool/Bool_A02_t01.dart b/LibTest/ffi/Bool/Bool_A02_t01.dart
@@ -18,7 +18,7 @@ void main() {
   Pointer<Bool> p1 = calloc<Bool>(3);
   try {
     Expect.equals(1, p1.elementAt(1).address - p1.address);
-    Expect.equals(1, p1.elementAt(2).address - p1.elementAt(1).address);
+    Expect.equals(1, sizeOf<Bool>());
   } finally {
     calloc.free(p1);
   }

diff --git a/LibTest/ffi/Char/Char_A02_t01.dart b/LibTest/ffi/Char/Char_A02_t01.dart
@@ -25,7 +25,7 @@ void main() {
   Pointer<Char> p1 = calloc<Char>(3);
   try {
     Expect.equals(1, p1.elementAt(1).address - p1.address);
-    Expect.equals(1, p1.elementAt(2).address - p1.elementAt(1).address);
+    Expect.equals(1, sizeOf<Char>());
   } finally {
     calloc.free(p1);
   }

diff --git a/LibTest/ffi/Long/Long_A01_t01.dart b/LibTest/ffi/Long/Long_A01_t01.dart
@@ -22,13 +22,12 @@ import "../../../Utils/expect.dart";
 void main() {
   Pointer<Long> p1 = calloc<Long>();
   try {
-    Expect.equals(0, p1.value);
     p1.value = 42;
     Expect.equals(42, p1.value);
     p1.value = 32768;
     Expect.equals(32768, p1.value);
-    p1.value = 2147483647; // 0x7FFFFFFF
-    Expect.equals(2147483647, p1.value);
+    p1.value = 0x7FFFFFFF;
+    Expect.equals(0x7FFFFFFF, p1.value);
   } finally {
     calloc.free(p1);
   }

diff --git a/LibTest/ffi/Long/Long_A02_t01.dart b/LibTest/ffi/Long/Long_A02_t01.dart
@@ -24,6 +24,7 @@ void main() {
   try {
     Expect.isTrue(p1.elementAt(1).address - p1.address == 4 ||
         p1.elementAt(1).address - p1.address == 8);
+    Expect.isTrue(sizeOf<Long>() == 4 || sizeOf<Long>() == 8);
   } finally {
     calloc.free(p1);
   }

diff --git a/LibTest/ffi/LongLong/LongLong_A01_t01.dart b/LibTest/ffi/LongLong/LongLong_A01_t01.dart
@@ -22,7 +22,6 @@ import "../../../Utils/expect.dart";
 void main() {
   Pointer<LongLong> p1 = calloc<LongLong>();
   try {
-    Expect.equals(0, p1.value);
     p1.value = 42;
     Expect.equals(42, p1.value);
     p1.value = 32768;

diff --git a/LibTest/ffi/LongLong/LongLong_A02_t01.dart b/LibTest/ffi/LongLong/LongLong_A02_t01.dart
@@ -23,7 +23,7 @@ void main() {
   Pointer<LongLong> p1 = calloc<LongLong>(3);
   try {
     Expect.equals(8, p1.elementAt(1).address - p1.address);
-    Expect.equals(8, p1.elementAt(2).address - p1.elementAt(1).address);
+    Expect.equals(8, sizeOf<LongLong>);
   } finally {
     calloc.free(p1);
   }

diff --git a/LibTest/ffi/Short/Short_A01_t01.dart b/LibTest/ffi/Short/Short_A01_t01.dart
@@ -21,7 +21,6 @@ import "../../../Utils/expect.dart";
 void main() {
   Pointer<Short> p1 = calloc<Short>();
   try {
-    Expect.equals(0, p1.value);
     p1.value = 42;
     Expect.equals(42, p1.value);
     p1.value = -42;

diff --git a/LibTest/ffi/Short/Short_A02_t01.dart b/LibTest/ffi/Short/Short_A02_t01.dart
@@ -22,7 +22,7 @@ void main() {
   Pointer<Short> p1 = calloc<Short>(3);
   try {
     Expect.equals(2, p1.elementAt(1).address - p1.address);
-    Expect.equals(2, p1.elementAt(2).address - p1.elementAt(1).address);
+    Expect.equals(2, sizeOf<Short>());
   } finally {
     calloc.free(p1);
   }

diff --git a/LibTest/ffi/SignedChar/SignedChar_A02_t01.dart b/LibTest/ffi/SignedChar/SignedChar_A02_t01.dart
@@ -22,7 +22,7 @@ void main() {
   Pointer<SignedChar> p1 = calloc<SignedChar>(3);
   try {
     Expect.equals(1, p1.elementAt(1).address - p1.address);
-    Expect.equals(1, p1.elementAt(2).address - p1.elementAt(1).address);
+    Expect.equals(1, sizeOf<SignedChar>());
   } finally {
     calloc.free(p1);
   }