nits

flutter · Apr 29, 2024 · 67baef7 · 67baef7
1 parent 5bf11e9
commit 67baef7
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 48 deletions.
diff --git a/packages/pigeon/lib/generator_tools.dart b/packages/pigeon/lib/generator_tools.dart
@@ -513,9 +513,14 @@ enum CustomTypes {
   customEnum,
 }
 
-/// Return the enumerated classes that must exist in the codec
+/// Return the enumerated types that must exist in the codec
 /// where the enumeration should be the key used in the buffer.
 Iterable<EnumeratedType> getEnumeratedTypes(Root root) sync* {
+  const int maxCustomClassesPerApi = 255 - _minimumCodecFieldKey;
+  if (root.classes.length + root.enums.length > maxCustomClassesPerApi) {
+    throw Exception(
+        "Pigeon doesn't support more than $maxCustomClassesPerApi referenced custom classes per API, try splitting up your APIs.");
+  }
   int index = 0;
   for (final Class customClass in root.classes) {
     yield EnumeratedType(

diff --git a/...ugin/android/src/test/java/com/example/alternate_language_test_plugin/NullFieldsTest.java b/...ugin/android/src/test/java/com/example/alternate_language_test_plugin/NullFieldsTest.java
@@ -166,7 +166,7 @@ public void replyToMapWithValues() {
     assertEquals(list.get(1), "error");
     assertEquals(list.get(2), Arrays.asList(1L, 2L, 3L));
     assertEquals(list.get(3), reply.getRequest());
-    assertEquals(list.get(4), NullFields.NullFieldsSearchReplyType.SUCCESS.ordinal());
+    assertEquals(list.get(4), NullFields.NullFieldsSearchReplyType.SUCCESS);
   }
 
   @Test

diff --git a/...orm_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/AllDatatypesTest.kt b/...orm_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/AllDatatypesTest.kt
@@ -10,7 +10,6 @@ import io.mockk.mockk
 import java.nio.ByteBuffer
 import java.util.ArrayList
 import junit.framework.TestCase
-import org.junit.Test
 
 internal class AllDatatypesTest : TestCase() {
   fun compareAllTypes(firstTypes: AllTypes?, secondTypes: AllTypes?) {
@@ -33,7 +32,7 @@ internal class AllDatatypesTest : TestCase() {
     assertEquals(firstTypes.anObject, secondTypes.anObject)
   }
 
-  fun compareAllNullableTypes(firstTypes: AllNullableTypes?, secondTypes: AllNullableTypes?) {
+  private fun compareAllNullableTypes(firstTypes: AllNullableTypes?, secondTypes: AllNullableTypes?) {
     assertEquals(firstTypes == null, secondTypes == null)
     if (firstTypes == null || secondTypes == null) {
       return
@@ -52,7 +51,6 @@ internal class AllDatatypesTest : TestCase() {
     assertEquals(firstTypes.aNullableObject, secondTypes.aNullableObject)
   }
 
-  @Test
   fun testNullValues() {
     val everything = AllNullableTypes()
     val binaryMessenger = mockk<BinaryMessenger>()
@@ -71,10 +69,10 @@ internal class AllDatatypesTest : TestCase() {
         }
 
     var didCall = false
-    api.echoAllNullableTypes(everything) {
+    api.echoAllNullableTypes(everything) { result ->
       didCall = true
       val output =
-          (it.getOrNull())?.let {
+          (result.getOrNull())?.let {
             assertNull(it.aNullableBool)
             assertNull(it.aNullableInt)
             assertNull(it.aNullableDouble)
@@ -93,7 +91,6 @@ internal class AllDatatypesTest : TestCase() {
     assertTrue(didCall)
   }
 
-  @Test
   fun testHasValues() {
     val everything =
         AllNullableTypes(
@@ -134,7 +131,6 @@ internal class AllDatatypesTest : TestCase() {
     assertTrue(didCall)
   }
 
-  @Test
   fun testIntegerToLong() {
     val everything = AllNullableTypes(aNullableInt = 123L)
     val list = everything.toList()

diff --git a/...rm_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/AsyncHandlersTest.kt b/...rm_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/AsyncHandlersTest.kt
@@ -11,10 +11,9 @@ import io.mockk.slot
 import io.mockk.verify
 import java.nio.ByteBuffer
 import junit.framework.TestCase
-import org.junit.Test
 
 internal class AsyncHandlersTest : TestCase() {
-  @Test
+
   fun testAsyncHost2Flutter() {
     val binaryMessenger = mockk<BinaryMessenger>()
     val api = FlutterIntegrationCoreApi(binaryMessenger)
@@ -48,15 +47,13 @@ internal class AsyncHandlersTest : TestCase() {
     }
   }
 
-  @Test
   fun testAsyncFlutter2HostEcho() {
     val binaryMessenger = mockk<BinaryMessenger>()
     val api = mockk<HostSmallApi>()
 
     val handlerSlot = slot<BinaryMessenger.BinaryMessageHandler>()
 
     val input = "Test"
-    val output = input
     val channelName = "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo"
 
     every {
@@ -67,7 +64,7 @@ internal class AsyncHandlersTest : TestCase() {
     every { api.echo(any(), any()) } answers
         {
           val callback = arg<(Result<String>) -> Unit>(1)
-          callback(Result.success(output))
+          callback(Result.success(input))
         }
 
     HostSmallApi.setUp(binaryMessenger, api)
@@ -80,15 +77,14 @@ internal class AsyncHandlersTest : TestCase() {
       it?.rewind()
       @Suppress("UNCHECKED_CAST") val wrapped = codec.decodeMessage(it) as MutableList<Any>?
       assertNotNull(wrapped)
-      wrapped?.let { assertEquals(output, wrapped.first()) }
+      wrapped?.let { assertEquals(input, wrapped.first()) }
     }
 
     verify { binaryMessenger.setMessageHandler(channelName, handlerSlot.captured) }
     verify { api.echo(input, any()) }
   }
 
-  @Test
-  fun asyncFlutter2HostVoidVoid() {
+  fun testAsyncFlutter2HostVoidVoid() {
     val binaryMessenger = mockk<BinaryMessenger>()
     val api = mockk<HostSmallApi>()
 

diff --git a/...on/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/EnumTest.kt b/...on/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/EnumTest.kt
@@ -12,10 +12,9 @@ import io.mockk.verify
 import java.nio.ByteBuffer
 import java.util.ArrayList
 import junit.framework.TestCase
-import org.junit.Test
 
 internal class EnumTest : TestCase() {
-  @Test
+
   fun testEchoHost() {
     val binaryMessenger = mockk<BinaryMessenger>()
     val api = mockk<EnumApi2Host>()
@@ -47,7 +46,6 @@ internal class EnumTest : TestCase() {
     verify { api.echo(input) }
   }
 
-  @Test
   fun testEchoFlutter() {
     val binaryMessenger = mockk<BinaryMessenger>()
     val api = EnumApi2Flutter(binaryMessenger)

diff --git a/...on/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/ListTest.kt b/...on/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/ListTest.kt
@@ -10,10 +10,9 @@ import io.mockk.mockk
 import java.nio.ByteBuffer
 import java.util.ArrayList
 import junit.framework.TestCase
-import org.junit.Test
 
 class ListTest : TestCase() {
-  @Test
+
   fun testListInList() {
     val binaryMessenger = mockk<BinaryMessenger>()
     val api = FlutterSmallApi(binaryMessenger)

diff --git a/...m_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/MultipleArityTests.kt b/...m_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/MultipleArityTests.kt
@@ -11,10 +11,9 @@ import io.mockk.slot
 import java.nio.ByteBuffer
 import java.util.ArrayList
 import junit.framework.TestCase
-import org.junit.Test
 
 class MultipleArityTests : TestCase() {
-  @Test
+
   fun testSimpleHost() {
     val binaryMessenger = mockk<BinaryMessenger>()
     val api = mockk<MultipleArityHostApi>()
@@ -41,7 +40,6 @@ class MultipleArityTests : TestCase() {
     }
   }
 
-  @Test
   fun testSimpleFlutter() {
     val binaryMessenger = mockk<BinaryMessenger>()
     val api = MultipleArityFlutterApi(binaryMessenger)

diff --git a/...m_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/NonNullFieldsTests.kt b/...m_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/NonNullFieldsTests.kt
@@ -5,10 +5,9 @@
 package com.example.test_plugin
 
 import junit.framework.TestCase
-import org.junit.Test
 
 class NonNullFieldsTests : TestCase() {
-  @Test
+
   fun testMake() {
     val request = NonNullFieldSearchRequest("hello")
     assertEquals("hello", request.query)

diff --git a/..._tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/NullableReturnsTest.kt b/..._tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/NullableReturnsTest.kt
@@ -10,10 +10,9 @@ import io.mockk.mockk
 import io.mockk.slot
 import io.mockk.verify
 import junit.framework.TestCase
-import org.junit.Test
 
 class NullableReturnsTest : TestCase() {
-  @Test
+
   fun testNullableParameterHost() {
     val binaryMessenger = mockk<BinaryMessenger>(relaxed = true)
     val api = mockk<NullableReturnHostApi>(relaxed = true)
@@ -42,7 +41,6 @@ class NullableReturnsTest : TestCase() {
     verify { api.doit() }
   }
 
-  @Test
   fun testNullableParameterFlutter() {
     val binaryMessenger = mockk<BinaryMessenger>()
     val api = NullableReturnFlutterApi(binaryMessenger)

diff --git a/...atform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/PrimitiveTest.kt b/...atform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/PrimitiveTest.kt
@@ -10,10 +10,9 @@ import io.mockk.mockk
 import io.mockk.slot
 import io.mockk.verify
 import junit.framework.TestCase
-import org.junit.Test
 
 class PrimitiveTest : TestCase() {
-  @Test
+
   fun testIntPrimitiveHost() {
     val binaryMessenger = mockk<BinaryMessenger>(relaxed = true)
     val api = mockk<PrimitiveHostApi>(relaxed = true)
@@ -42,7 +41,6 @@ class PrimitiveTest : TestCase() {
     verify { api.anInt(input.toLong()) }
   }
 
-  @Test
   fun testIntPrimitiveFlutter() {
     val binaryMessenger = EchoBinaryMessenger(MultipleArityFlutterApi.codec)
     val api = PrimitiveFlutterApi(binaryMessenger)
@@ -58,7 +56,6 @@ class PrimitiveTest : TestCase() {
     assertTrue(didCall)
   }
 
-  @Test
   fun testBoolPrimitiveHost() {
     val binaryMessenger = mockk<BinaryMessenger>(relaxed = true)
     val api = mockk<PrimitiveHostApi>(relaxed = true)
@@ -87,7 +84,6 @@ class PrimitiveTest : TestCase() {
     verify { api.aBool(input) }
   }
 
-  @Test
   fun testBoolPrimitiveFlutter() {
     val binaryMessenger = EchoBinaryMessenger(MultipleArityFlutterApi.codec)
     val api = PrimitiveFlutterApi(binaryMessenger)
@@ -103,7 +99,6 @@ class PrimitiveTest : TestCase() {
     assertTrue(didCall)
   }
 
-  @Test
   fun testStringPrimitiveHost() {
     val binaryMessenger = mockk<BinaryMessenger>(relaxed = true)
     val api = mockk<PrimitiveHostApi>(relaxed = true)
@@ -132,7 +127,6 @@ class PrimitiveTest : TestCase() {
     verify { api.aString(input) }
   }
 
-  @Test
   fun testDoublePrimitiveHost() {
     val binaryMessenger = mockk<BinaryMessenger>(relaxed = true)
     val api = mockk<PrimitiveHostApi>(relaxed = true)
@@ -161,7 +155,6 @@ class PrimitiveTest : TestCase() {
     verify { api.aDouble(input) }
   }
 
-  @Test
   fun testDoublePrimitiveFlutter() {
     val binaryMessenger = EchoBinaryMessenger(MultipleArityFlutterApi.codec)
     val api = PrimitiveFlutterApi(binaryMessenger)
@@ -177,7 +170,6 @@ class PrimitiveTest : TestCase() {
     assertTrue(didCall)
   }
 
-  @Test
   fun testMapPrimitiveHost() {
     val binaryMessenger = mockk<BinaryMessenger>(relaxed = true)
     val api = mockk<PrimitiveHostApi>(relaxed = true)
@@ -206,7 +198,6 @@ class PrimitiveTest : TestCase() {
     verify { api.aMap(input) }
   }
 
-  @Test
   fun testMapPrimitiveFlutter() {
     val binaryMessenger = EchoBinaryMessenger(MultipleArityFlutterApi.codec)
     val api = PrimitiveFlutterApi(binaryMessenger)
@@ -222,7 +213,6 @@ class PrimitiveTest : TestCase() {
     assertTrue(didCall)
   }
 
-  @Test
   fun testListPrimitiveHost() {
     val binaryMessenger = mockk<BinaryMessenger>(relaxed = true)
     val api = mockk<PrimitiveHostApi>(relaxed = true)
@@ -251,7 +241,6 @@ class PrimitiveTest : TestCase() {
     verify { api.aList(input) }
   }
 
-  @Test
   fun testListPrimitiveFlutter() {
     val binaryMessenger = EchoBinaryMessenger(MultipleArityFlutterApi.codec)
     val api = PrimitiveFlutterApi(binaryMessenger)
@@ -267,7 +256,6 @@ class PrimitiveTest : TestCase() {
     assertTrue(didCall)
   }
 
-  @Test
   fun testInt32ListPrimitiveHost() {
     val binaryMessenger = mockk<BinaryMessenger>(relaxed = true)
     val api = mockk<PrimitiveHostApi>(relaxed = true)
@@ -296,7 +284,6 @@ class PrimitiveTest : TestCase() {
     verify { api.anInt32List(input) }
   }
 
-  @Test
   fun testInt32ListPrimitiveFlutter() {
     val binaryMessenger = EchoBinaryMessenger(MultipleArityFlutterApi.codec)
     val api = PrimitiveFlutterApi(binaryMessenger)
@@ -312,7 +299,6 @@ class PrimitiveTest : TestCase() {
     assertTrue(didCall)
   }
 
-  @Test
   fun testBoolListPrimitiveHost() {
     val binaryMessenger = mockk<BinaryMessenger>(relaxed = true)
     val api = mockk<PrimitiveHostApi>(relaxed = true)
@@ -341,7 +327,6 @@ class PrimitiveTest : TestCase() {
     verify { api.aBoolList(input) }
   }
 
-  @Test
   fun testBoolListPrimitiveFlutter() {
     val binaryMessenger = EchoBinaryMessenger(MultipleArityFlutterApi.codec)
     val api = PrimitiveFlutterApi(binaryMessenger)
@@ -357,7 +342,6 @@ class PrimitiveTest : TestCase() {
     assertTrue(didCall)
   }
 
-  @Test
   fun testStringIntMapPrimitiveHost() {
     val binaryMessenger = mockk<BinaryMessenger>(relaxed = true)
     val api = mockk<PrimitiveHostApi>(relaxed = true)
@@ -386,7 +370,6 @@ class PrimitiveTest : TestCase() {
     verify { api.aStringIntMap(input) }
   }
 
-  @Test
   fun testStringIntMapPrimitiveFlutter() {
     val binaryMessenger = EchoBinaryMessenger(MultipleArityFlutterApi.codec)
     val api = PrimitiveFlutterApi(binaryMessenger)