Add operator==
To compatibilityMatrix, HalManfiest, Vndk, Sepolicy.
This is much easier for testing.
Test: libvintf_test
Change-Id: I6ca64b2ddcb6c14c200ba0348863266c078a29c3
diff --git a/test/main.cpp b/test/main.cpp
index 0a636c8..0ddaee3 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -60,9 +60,6 @@
ConstMapValueIterable<std::string, ManifestHal> getHals(HalManifest &vm) {
return vm.getHals();
}
- bool isEqual(const CompatibilityMatrix &cm1, const CompatibilityMatrix &cm2) {
- return cm1.mHals == cm2.mHals && cm1.framework.mKernels == cm2.framework.mKernels;
- }
bool isValid(const ManifestHal &mh) {
return mh.isValid();
}
@@ -182,6 +179,9 @@
" <version>25.0</version>\n"
" </sepolicy>\n"
"</manifest>\n");
+ HalManifest vm2;
+ EXPECT_TRUE(gHalManifestConverter(&vm2, xml));
+ EXPECT_EQ(vm, vm2);
}
TEST_F(LibVintfTest, HalManifestConverterFramework) {
@@ -212,6 +212,7 @@
"</manifest>\n");
HalManifest vm2;
EXPECT_TRUE(gHalManifestConverter(&vm2, xml));
+ EXPECT_EQ(vm, vm2);
}
TEST_F(LibVintfTest, HalManifestOptional) {
@@ -420,7 +421,7 @@
"</compatibility-matrix>\n");
CompatibilityMatrix cm2;
EXPECT_TRUE(gCompatibilityMatrixConverter(&cm2, xml));
- EXPECT_TRUE(isEqual(cm, cm2));
+ EXPECT_EQ(cm, cm2);
}
TEST_F(LibVintfTest, IsValid) {