Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c5db83d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "reflect toString changes" am: 3265440f 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2321923



Change-Id: I645049e3ec7410ef937c0444254d1eee4a22c659
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d5369624 3265440f

tests/dnsresolver_binder_test.cpp

+7 −7
Original line number Diff line number Diff line
@@ -138,13 +138,13 @@ class DnsResolverBinderTest : public NetNativeTestBase { 
                        if (!std::regex_match(line, match, lineRegex)) return false;

                        if (match.size() != 2) return false;



                        // The binder_to_string format is changed from S that will add "(null)" to

                        // the log on method's argument if binder object is null. But Q and R don't

                        // have this format in log. So to make register null listener tests are

                        // compatible from all version, just remove the "(null)" argument from

                        // output logs if existed.

                        const std::string output = android::base::StringReplace(

                                match[1].str(), "(null)", "", /*all=*/true);

                        // The binder_to_string format is changed over time to include more

                        // information. To keep it working on Q/R/..., remove what has been

                        // added for now.

                        std::string output = match[1].str();

                        using android::base::StringReplace;

                        output = StringReplace(output, "(null)", "", /*all=*/true);

                        output = StringReplace(output, "<unimplemented>", "", /*all=*/true);

                        return output == td.output;

                    });

            EXPECT_TRUE(found) << "Didn't find line '" << td.output << "' in dumpsys output.";