diff options
| author | Jooyung Han <jooyung@google.com> | 2021-12-08 02:30:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-08 02:30:50 +0000 |
| commit | af03551d36b37f75703e89bee17234e03d474997 (patch) | |
| tree | aa88dfc43f241f8f1c51e9f5f840e58205acff87 /aidl_unittest.cpp | |
| parent | 07a72126b1f750aa51c56988c687c0339a56e564 (diff) | |
| parent | 6466daabe5cadd58674ea2c96b7f92255834dc42 (diff) | |
| download | aidl-af03551d36b37f75703e89bee17234e03d474997.tar.gz | |
Revert "Revert "Add automatic default value for char-type field"" am: 6466daabe5
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/tools/aidl/+/16379730
Change-Id: Ibf09aa2978d86b0c4a90ef91bc9ffa5647174b59
Diffstat (limited to 'aidl_unittest.cpp')
| -rw-r--r-- | aidl_unittest.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/aidl_unittest.cpp b/aidl_unittest.cpp index 98744c26..f825cfd2 100644 --- a/aidl_unittest.cpp +++ b/aidl_unittest.cpp @@ -1026,7 +1026,7 @@ TEST_F(AidlTest, AidlConstantValue_EvaluatedValue) { using Ptr = unique_ptr<AidlConstantValue>; const AidlLocation& loc = AIDL_LOCATION_HERE; - EXPECT_EQ('c', Ptr(AidlConstantValue::Character(loc, 'c'))->EvaluatedValue<char>()); + EXPECT_EQ('c', Ptr(AidlConstantValue::Character(loc, "'c'"))->EvaluatedValue<char16_t>()); EXPECT_EQ("abc", Ptr(AidlConstantValue::String(loc, "\"abc\""))->EvaluatedValue<string>()); EXPECT_FLOAT_EQ(1.0f, Ptr(AidlConstantValue::Floating(loc, "1.0f"))->EvaluatedValue<float>()); EXPECT_EQ(true, Ptr(AidlConstantValue::Boolean(loc, true))->EvaluatedValue<bool>()); @@ -1044,6 +1044,14 @@ TEST_F(AidlTest, AidlConstantValue_EvaluatedValue) { Ptr(AidlConstantValue::Array(loc, std::move(values)))->EvaluatedValue<vector<string>>()); } +TEST_F(AidlTest, AidlConstantCharacterDefault) { + AidlTypeSpecifier char_type(AIDL_LOCATION_HERE, "char", false, nullptr, {}); + auto default_value = unique_ptr<AidlConstantValue>(AidlConstantValue::Default(char_type)); + EXPECT_EQ("'\\0'", default_value->ValueString(char_type, cpp::ConstantValueDecorator)); + EXPECT_EQ("'\\0'", default_value->ValueString(char_type, ndk::ConstantValueDecorator)); + EXPECT_EQ("'\\0'", default_value->ValueString(char_type, java::ConstantValueDecorator)); +} + TEST_P(AidlTest, FailOnManyDefinedTypes) { AidlError error; const string expected_stderr = |