Merge "fix: can't assign method IDs when built with --version" into qt-dev

2 files changed, 55 insertions, 1 deletions

diff --git a/aidl.cpp b/aidl.cpp
index b02c5e8f..b5f13262 100644
--- a/aidl.cpp
+++ b/aidl.cpp
@@ -312,7 +312,10 @@ bool check_and_assign_method_ids(const std::vector<std::unique_ptr<AidlMethod>>&
     // transactions must be stable during the entire lifetime of an interface.
     // In other words, their IDs must be the same even when new user-defined
     // methods are added.
-    if (item->HasId() && item->IsUserDefined()) {
+    if (!item->IsUserDefined()) {
+      continue;
+    }
+    if (item->HasId()) {
       hasAssignedIds = true;
       // Ensure that the user set id is not duplicated.
       if (usedIds.find(item->GetId()) != usedIds.end()) {
diff --git a/aidl_unittest.cpp b/aidl_unittest.cpp
index 23bc5200..8c4d7965 100644
--- a/aidl_unittest.cpp
+++ b/aidl_unittest.cpp
@@ -1272,5 +1272,56 @@ TEST_F(AidlTest, ParcelFileDescriptorIsBuiltinType) {
   EXPECT_EQ(0, ::android::aidl::compile_aidl(cppOptions, io_delegate_));
 }
 
+TEST_F(AidlTest, ManualIds) {
+  Options options = Options::From("aidl --lang=java -o out IFoo.aidl");
+  io_delegate_.SetFileContents("IFoo.aidl",
+                               "interface IFoo {\n"
+                               "  void foo() = 0;\n"
+                               "  void bar() = 1;\n"
+                               "}");
+  EXPECT_EQ(0, ::android::aidl::compile_aidl(options, io_delegate_));
+}
+
+TEST_F(AidlTest, ManualIdsWithMetaTransactions) {
+  Options options = Options::From("aidl --lang=java --version 10 -o out IFoo.aidl");
+  io_delegate_.SetFileContents("IFoo.aidl",
+                               "interface IFoo {\n"
+                               "  void foo() = 0;\n"
+                               "  void bar() = 1;\n"
+                               "}");
+  EXPECT_EQ(0, ::android::aidl::compile_aidl(options, io_delegate_));
+}
+
+TEST_F(AidlTest, FailOnDuplicatedIds) {
+  Options options = Options::From("aidl --lang=java --version 10 -o out IFoo.aidl");
+  io_delegate_.SetFileContents("IFoo.aidl",
+                               "interface IFoo {\n"
+                               "  void foo() = 3;\n"
+                               "  void bar() = 3;\n"
+                               "}");
+  EXPECT_NE(0, ::android::aidl::compile_aidl(options, io_delegate_));
+}
+
+TEST_F(AidlTest, FailOnOutOfRangeIds) {
+  // 16777115 is kLastMetaMethodId + 1
+  Options options = Options::From("aidl --lang=java --version 10 -o out IFoo.aidl");
+  io_delegate_.SetFileContents("IFoo.aidl",
+                               "interface IFoo {\n"
+                               "  void foo() = 3;\n"
+                               "  void bar() = 16777115;\n"
+                               "}");
+  EXPECT_NE(0, ::android::aidl::compile_aidl(options, io_delegate_));
+}
+
+TEST_F(AidlTest, FailOnPartiallyAssignedIds) {
+  Options options = Options::From("aidl --lang=java --version 10 -o out IFoo.aidl");
+  io_delegate_.SetFileContents("IFoo.aidl",
+                               "interface IFoo {\n"
+                               "  void foo() = 3;\n"
+                               "  void bar();\n"
+                               "}");
+  EXPECT_NE(0, ::android::aidl::compile_aidl(options, io_delegate_));
+}
+
 }  // namespace aidl
 }  // namespace android