commit 63ad559e53ee2c2b7735ffab4d03bdbf1e575b4e
author Chenbo Feng <fengc@google.com> Mon Jan 22 23:14:12 2018 -0800
committer Chenbo Feng <fengc@google.com> Tue Jan 23 07:24:15 2018 +0000
tree edd2b3caa77f1cd23e901697d7b157d4e57a1c97
parent 05393d8d36429a81466725b429ab976ea977fd07

Fix the incorrect test setup for trafficController

The function used for populate stats into the fake map accidentally
changed the tagStatsKey returned. Fix it so all test now pass with
desired behavior.

Bug: 30950746
Test: run netd_unit_test
Change-Id: I6e774ae6bfa45df24b398c40f0fdb26f4efbb0fa

server/TrafficControllerTest.cpp

diff --git a/server/TrafficControllerTest.cpp b/server/TrafficControllerTest.cpp
index 3194b33..6818f43 100644
--- a/server/TrafficControllerTest.cpp
+++ b/server/TrafficControllerTest.cpp
@@ -136,6 +136,8 @@
         EXPECT_EQ(0, writeToMapEntry(mFakeTagStatsMap, key, &statsMapValue, BPF_ANY));
         key->tag = 0;
         EXPECT_EQ(0, writeToMapEntry(mFakeUidStatsMap, key, &statsMapValue, BPF_ANY));
+        // put tag information back to statsKey
+        key->tag = tag;
     }
 
     void TearDown() {
@@ -253,6 +255,7 @@
     ASSERT_EQ(TEST_COUNTERSET, counterSetResult);
     StatsValue statsMapResult;
     ASSERT_EQ(-1, findMapEntry(mFakeTagStatsMap, &tagStatsMapKey, &statsMapResult));
+    tagStatsMapKey.tag = 0;
     ASSERT_EQ(0, findMapEntry(mFakeUidStatsMap, &tagStatsMapKey, &statsMapResult));
     ASSERT_EQ((uint64_t)1, statsMapResult.rxTcpPackets);
     ASSERT_EQ((uint64_t)100, statsMapResult.rxTcpBytes);
@@ -333,7 +336,9 @@
     ASSERT_EQ(-1, findMapEntry(mFakeUidCounterSetMap, &uid2, &counterSetResult));
     StatsValue statsMapResult;
     ASSERT_EQ(-1, findMapEntry(mFakeTagStatsMap, &tagStatsMapKey2, &statsMapResult));
+    tagStatsMapKey2.tag = 0;
     ASSERT_EQ(-1, findMapEntry(mFakeUidStatsMap, &tagStatsMapKey2, &statsMapResult));
+    tagStatsMapKey1.tag = 0;
     ASSERT_EQ(0, findMapEntry(mFakeUidStatsMap, &tagStatsMapKey1, &statsMapResult));
     ASSERT_EQ((uint64_t)1, statsMapResult.rxTcpPackets);
     ASSERT_EQ((uint64_t)100, statsMapResult.rxTcpBytes);