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

Commit 4a1092b9 authored by Mark Punzalan's avatar Mark Punzalan
Browse files

aapt2: Update test using CopyWithoutSdkVersion 

This should have been included in ag/32809565, which set minorVersion to
0 in ConfigDescription::CopyWithoutSdkVersion.

Bug: 383177182
Test: atest aapt2_tests
Flag: EXEMPT used in host tool (aapt2)
Change-Id: I9cc5410a5db2b2568d7a77db3fbe69cfb7f5839d
parent 9233954c

tools/aapt2/cmd/Util_test.cpp

+15 −8
Original line number Diff line number Diff line
@@ -412,26 +412,33 @@ TEST (UtilTest, AdjustSplitConstraintsForMinSdk) { 
  std::string path;



  test_constraints.push_back({});

  ASSERT_TRUE(ParseSplitParameter(CREATE_PATH("v7"),

                                  diagnostics, &path, &test_constraints.back()));

  ASSERT_TRUE(ParseSplitParameter(CREATE_PATH("v7"), diagnostics, &path, &test_constraints.back()));

  test_constraints.push_back({});

  ASSERT_TRUE(ParseSplitParameter(CREATE_PATH("xhdpi"),

                                  diagnostics, &path, &test_constraints.back()));

  EXPECT_EQ(test_constraints.size(), 2);

  ASSERT_TRUE(

      ParseSplitParameter(CREATE_PATH("xhdpi"), diagnostics, &path, &test_constraints.back()));

  test_constraints.push_back({});

  ASSERT_TRUE(

      ParseSplitParameter(CREATE_PATH("v38.9"), diagnostics, &path, &test_constraints.back()));

  EXPECT_EQ(test_constraints.size(), 3);

  EXPECT_EQ(test_constraints[0].name, "v7");

  EXPECT_EQ(test_constraints[0].configs.size(), 1);

  EXPECT_NE(*test_constraints[0].configs.begin(), ConfigDescription::DefaultConfig());

  EXPECT_EQ(test_constraints[1].name, "xhdpi");

  EXPECT_EQ(test_constraints[1].configs.size(), 1);

  EXPECT_NE(*test_constraints[0].configs.begin(), ConfigDescription::DefaultConfig());

  EXPECT_NE(*test_constraints[1].configs.begin(), ConfigDescription::DefaultConfig());

  EXPECT_EQ(test_constraints[2].name, "v38.9");

  EXPECT_EQ(test_constraints[2].configs.size(), 1);

  EXPECT_NE(*test_constraints[2].configs.begin(), ConfigDescription::DefaultConfig());



  auto adjusted_contraints = AdjustSplitConstraintsForMinSdk(26, test_constraints);

  EXPECT_EQ(adjusted_contraints.size(), 2);

  auto adjusted_contraints = AdjustSplitConstraintsForMinSdk(40, test_constraints);

  EXPECT_EQ(adjusted_contraints.size(), 3);

  EXPECT_EQ(adjusted_contraints[0].name, "v7");

  EXPECT_EQ(adjusted_contraints[0].configs.size(), 0);

  EXPECT_EQ(adjusted_contraints[1].name, "xhdpi");

  EXPECT_EQ(adjusted_contraints[1].configs.size(), 1);

  EXPECT_NE(*adjusted_contraints[1].configs.begin(), ConfigDescription::DefaultConfig());

  EXPECT_EQ(adjusted_contraints[2].name, "v38.9");

  EXPECT_EQ(adjusted_contraints[2].configs.size(), 0);

}



TEST (UtilTest, RegularExperssionsSimple) {