summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Vakulenko <avakulenko@chromium.org>2015-02-23 14:40:42 -0800
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-02-25 23:32:31 +0000
commitb69be601eba1d4a1d5fdd8121a93c8fb67217fc8 (patch)
treee0edf18e41a222fee2108f57e202719c1722727a
parent1b4882c32998b6ae9d4e29ea5ac44e36d22e2ae7 (diff)
downloaddbus-binding-generator-b69be601eba1d4a1d5fdd8121a93c8fb67217fc8.tar.gz
chromeos-dbus-bindings: Inline some of named constants in tests
In order to make tests more readable and maintainable, removed named constants and use string literals in their place. Since pretty much all of these constants were used only once in a test, there is no benefit in creating a constant, but it makes it difficult to read the test and add new conditions/expectations. BUG=None TEST=`FEATURES=test emerge-link chromeos-dbus-bindings` Change-Id: I220f528f98301b7ff9f08106f9c32b3d5e87309c Reviewed-on: https://chromium-review.googlesource.com/252353 Reviewed-by: Paul Stewart <pstew@chromium.org> Reviewed-by: Christopher Wiley <wiley@chromium.org> Tested-by: Alex Vakulenko <avakulenko@chromium.org> Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
-rw-r--r--chromeos-dbus-bindings/adaptor_generator_unittest.cc97
-rw-r--r--chromeos-dbus-bindings/dbus_signature_unittest.cc73
-rw-r--r--chromeos-dbus-bindings/proxy_generator_mock_unittest.cc66
-rw-r--r--chromeos-dbus-bindings/proxy_generator_unittest.cc76
4 files changed, 113 insertions, 199 deletions
diff --git a/chromeos-dbus-bindings/adaptor_generator_unittest.cc b/chromeos-dbus-bindings/adaptor_generator_unittest.cc
index c03b39d..7d3e59f 100644
--- a/chromeos-dbus-bindings/adaptor_generator_unittest.cc
+++ b/chromeos-dbus-bindings/adaptor_generator_unittest.cc
@@ -22,38 +22,18 @@ namespace chromeos_dbus_bindings {
namespace {
-const char kMethod0Name[] = "Kaneda";
-const char kMethod0Return[] = "s";
-const char kMethod0Argument0[] = "s";
-const char kMethod0ArgumentName0[] = "iwata";
-const char kMethod0Argument1[] = "ao";
-const char kMethod0ArgumentName1[] = "clarke";
-const char kMethod1Name[] = "Tetsuo";
-const char kMethod1Argument1[] = "i";
-const char kMethod1Return[] = "x";
-const char kMethod2Name[] = "Kei";
-const char kMethod3Name[] = "Kiyoko";
-const char kMethod3ReturnName0[] = "akira";
-const char kMethod3Return0[] = "x";
-const char kMethod3Return1[] = "s";
-const char kSignal0Name[] = "Update";
-const char kSignal1Name[] = "Mapping";
-const char kSignal1Argument0[] = "s";
-const char kSignal1ArgumentName0[] = "key";
-const char kSignal1Argument1[] = "ao";
-const char kProperty0Name[] = "CharacterName";
-const char kProperty0Type[] = "s";
-const char kProperty0Access[] = "read";
-const char kProperty1Name[] = "WriteProperty";
-const char kProperty1Type[] = "s";
-const char kProperty1Access[] = "readwrite";
+const char kDBusTypeArryOfObjects[] = "ao";
+const char kDBusTypeBool[] = "b";
+const char kDBusTypeInt32[] = "i";
+const char kDBusTypeInt64[] = "x";
+const char kDBusTypeString[] = "s";
+
+const char kPropertyAccessReadOnly[] = "read";
+const char kPropertyAccessReadWrite[] = "readwrite";
const char kInterfaceName[] = "org.chromium.Test";
const char kInterfaceName2[] = "org.chromium.Test2";
-const char kMethod0Name2[] = "Kaneda2";
-const char kMethod1Name2[] = "Tetsuo2";
-const char kMethod2Name2[] = "Kei2";
-const char kMethod2Return[] = "b";
+
const char kExpectedContent[] = R"literal_string(
#include <memory>
#include <string>
@@ -261,60 +241,59 @@ TEST_F(AdaptorGeneratorTest, GenerateAdaptors) {
interface.name = kInterfaceName;
interface.path = "/org/chromium/Test";
interface.methods.emplace_back(
- kMethod0Name,
+ "Kaneda",
vector<Interface::Argument>{
- {kMethod0ArgumentName0, kMethod0Argument0},
- {kMethod0ArgumentName1, kMethod0Argument1}},
- vector<Interface::Argument>{{"", kMethod0Return}});
+ {"iwata", kDBusTypeString},
+ {"clarke", kDBusTypeArryOfObjects}},
+ vector<Interface::Argument>{{"", kDBusTypeString}});
interface.methods.back().include_dbus_message = true;
interface.methods.emplace_back(
- kMethod1Name,
- vector<Interface::Argument>{{"", kMethod1Argument1}},
- vector<Interface::Argument>{{"", kMethod1Return}});
- interface.methods.emplace_back(kMethod2Name);
+ "Tetsuo",
+ vector<Interface::Argument>{{"", kDBusTypeInt32}},
+ vector<Interface::Argument>{{"", kDBusTypeInt64}});
+ interface.methods.emplace_back("Kei");
// Interface methods with more than one return argument should be ignored.
interface.methods.emplace_back(
- kMethod3Name,
+ "Kiyoko",
vector<Interface::Argument>{},
vector<Interface::Argument>{
- {kMethod3ReturnName0, kMethod3Return0},
- {"", kMethod3Return1}});
+ {"akira", kDBusTypeInt64},
+ {"", kDBusTypeString}});
// Signals generate helper methods to send them.
interface.signals.emplace_back(
- kSignal0Name,
+ "Update",
vector<Interface::Argument>{});
interface.signals.emplace_back(
- kSignal1Name,
+ "Mapping",
vector<Interface::Argument>{
- {kSignal1ArgumentName0, kSignal1Argument0},
- {"", kSignal1Argument1}});
+ {"key", kDBusTypeString},
+ {"", kDBusTypeArryOfObjects}});
interface.properties.emplace_back(
- kProperty0Name,
- kProperty0Type,
- kProperty0Access);
+ "CharacterName",
+ kDBusTypeString,
+ kPropertyAccessReadOnly);
interface.properties.emplace_back(
- kProperty1Name,
- kProperty1Type,
- kProperty1Access);
+ "WriteProperty",
+ kDBusTypeString,
+ kPropertyAccessReadWrite);
Interface interface2;
interface2.name = kInterfaceName2;
interface2.methods.emplace_back(
- kMethod0Name2,
- vector<Interface::Argument>{
- {kMethod0ArgumentName0, kMethod0Argument0}},
- vector<Interface::Argument>{{"", kMethod0Return}});
+ "Kaneda2",
+ vector<Interface::Argument>{{"iwata", kDBusTypeString}},
+ vector<Interface::Argument>{{"", kDBusTypeString}});
interface2.methods.back().is_const = true;
interface2.methods.back().kind = Interface::Method::Kind::kSimple;
interface2.methods.emplace_back(
- kMethod1Name2,
- vector<Interface::Argument>{{"", kMethod1Argument1}},
- vector<Interface::Argument>{{"", kMethod1Return}});
+ "Tetsuo2",
+ vector<Interface::Argument>{{"", kDBusTypeInt32}},
+ vector<Interface::Argument>{{"", kDBusTypeInt64}});
interface2.methods.back().kind = Interface::Method::Kind::kAsync;
interface2.methods.emplace_back(
- kMethod2Name2,
+ "Kei2",
vector<Interface::Argument>{},
- vector<Interface::Argument>{{"", kMethod2Return}});
+ vector<Interface::Argument>{{"", kDBusTypeBool}});
interface2.methods.back().kind = Interface::Method::Kind::kAsync;
interface2.methods.back().include_dbus_message = true;
diff --git a/chromeos-dbus-bindings/dbus_signature_unittest.cc b/chromeos-dbus-bindings/dbus_signature_unittest.cc
index 18d9530..96ebbe5 100644
--- a/chromeos-dbus-bindings/dbus_signature_unittest.cc
+++ b/chromeos-dbus-bindings/dbus_signature_unittest.cc
@@ -31,45 +31,6 @@ const char kUnclosedDictInnerSignature[] = "a{a{u}";
const char kUnexpectedCloseSignature[] = "a}i{";
const char kUnknownSignature[] = "al";
-// Succeeding signatures.
-const char kBoolArraySignature[] = "ab";
-const char kByteArraySignature[] = "ay";
-const char kByteArrayArraySignature[] = "aay";
-const char kObjectArraySignature[] = "ao";
-const char kObjectDictBlobSignature[] = "a{oa{sa{sv}}}";
-const char kObjectNameDictSignature[] = "a{os}";
-const char kStringArraySignature[] = "as";
-const char kStringStringDictSignature[] = "a{ss}";
-const char kStringStringStringDictSignature[] = "a{sa{ss}}";
-const char kStringStringVariantDictSignature[] = "a{sa{sv}}";
-const char kStringVariantDictSignature[] = "a{sv}";
-const char kStringVariantDictWithTrailingSignature[] = "a{sv}NoneOfThisParses";
-const char kUnsigned64ArraySignature[] = "at";
-const char kIntVariantDictSignature[] = "a{iv}";
-const char kPairSignature[] = "(ib)";
-const char kTupleSignature[] = "(ibs)";
-
-// Corresponding typenames for signatures above.
-const char kBoolArrayTypename[] = "std::vector<bool>";
-const char kByteArrayTypename[] = "std::vector<uint8_t>";
-const char kByteArrayArrayTypename[] = "std::vector<std::vector<uint8_t>>";
-const char kObjectArrayTypename[] = "std::vector<ObjectPathType>";
-const char kObjectDictBlobTypename[] =
- "std::map<ObjectPathType, std::map<std::string, "
- "chromeos::VariantDictionary>>";
-const char kObjectNameDictTypename[] = "std::map<ObjectPathType, std::string>";
-const char kStringArrayTypename[] = "std::vector<std::string>";
-const char kStringStringDictTypename[] = "std::map<std::string, std::string>";
-const char kStringStringStringDictTypename[] =
- "std::map<std::string, std::map<std::string, std::string>>";
-const char kStringStringVariantDictTypename[] =
- "std::map<std::string, chromeos::VariantDictionary>";
-const char kStringVariantDictTypename[] = "chromeos::VariantDictionary";
-const char kUnsigned64ArrayTypename[] = "std::vector<uint64_t>";
-const char kIntVariantDictTypename[] = "std::map<int32_t, chromeos::Any>";
-const char kPairTypename[] = "std::tuple<int32_t, bool>";
-const char kTupleTypename[] = "std::tuple<int32_t, bool, std::string>";
-
// Define an object type name to disambiguate the typenames above.
const char kObjectPathTypename[] = "ObjectPathType";
@@ -125,22 +86,24 @@ TEST_F(DbusSignatureTest, ParseSuccesses) {
{ DBUS_TYPE_VARIANT_AS_STRING, DbusSignature::kVariantTypename },
// Complex types.
- { kBoolArraySignature, kBoolArrayTypename },
- { kByteArraySignature, kByteArrayTypename },
- { kByteArrayArraySignature, kByteArrayArrayTypename },
- { kObjectArraySignature, kObjectArrayTypename },
- { kObjectDictBlobSignature, kObjectDictBlobTypename },
- { kObjectNameDictSignature, kObjectNameDictTypename },
- { kStringArraySignature, kStringArrayTypename },
- { kStringStringDictSignature, kStringStringDictTypename },
- { kStringStringStringDictSignature, kStringStringStringDictTypename },
- { kStringStringVariantDictSignature, kStringStringVariantDictTypename },
- { kStringVariantDictSignature, kStringVariantDictTypename },
- { kStringVariantDictWithTrailingSignature, kStringVariantDictTypename },
- { kUnsigned64ArraySignature, kUnsigned64ArrayTypename },
- { kIntVariantDictSignature, kIntVariantDictTypename },
- { kPairSignature, kPairTypename },
- { kTupleSignature, kTupleTypename },
+ { "ab", "std::vector<bool>" },
+ { "ay", "std::vector<uint8_t>" },
+ { "aay", "std::vector<std::vector<uint8_t>>" },
+ { "ao", "std::vector<ObjectPathType>" },
+ { "a{oa{sa{sv}}}", "std::map<ObjectPathType, std::map<std::string, "
+ "chromeos::VariantDictionary>>" },
+ { "a{os}", "std::map<ObjectPathType, std::string>" },
+ { "as", "std::vector<std::string>" },
+ { "a{ss}", "std::map<std::string, std::string>" },
+ { "a{sa{ss}}", "std::map<std::string, std::map<std::string, "
+ "std::string>>"},
+ { "a{sa{sv}}", "std::map<std::string, chromeos::VariantDictionary>" },
+ { "a{sv}", "chromeos::VariantDictionary" },
+ { "a{sv}Garbage", "chromeos::VariantDictionary" },
+ { "at", "std::vector<uint64_t>" },
+ { "a{iv}", "std::map<int32_t, chromeos::Any>" },
+ { "(ib)", "std::tuple<int32_t, bool>" },
+ { "(ibs)", "std::tuple<int32_t, bool, std::string>" },
};
signature_.set_object_path_typename(kObjectPathTypename);
for (const auto& parse_test : parse_values) {
diff --git a/chromeos-dbus-bindings/proxy_generator_mock_unittest.cc b/chromeos-dbus-bindings/proxy_generator_mock_unittest.cc
index aef4b97..f12b8ec 100644
--- a/chromeos-dbus-bindings/proxy_generator_mock_unittest.cc
+++ b/chromeos-dbus-bindings/proxy_generator_mock_unittest.cc
@@ -22,28 +22,14 @@ namespace chromeos_dbus_bindings {
namespace {
-const char kInterfaceName[] = "org.chromium.TestInterface";
-const char kInterfaceName2[] = "org.chromium.TestInterface2";
-const char kMethod1Name[] = "Elements";
-const char kMethod1Return[] = "s";
-const char kMethod1Argument1[] = "s";
-const char kMethod1ArgumentName1[] = "space_walk";
-const char kMethod1Argument2[] = "ao";
-const char kMethod1ArgumentName2[] = "ramblin_man";
-const char kMethod2Name[] = "ReturnToPatagonia";
-const char kMethod2Return[] = "x";
-const char kMethod3Name[] = "NiceWeatherForDucks";
-const char kMethod3Argument1[] = "b";
-const char kMethod4Name[] = "ExperimentNumberSix";
-const char kMethod5Name[] = "GetPersonInfo";
-const char kMethod5Argument1[] = "s";
-const char kMethod5ArgumentName1[] = "name";
-const char kMethod5Argument2[] = "i";
-const char kMethod5ArgumentName2[] = "age";
-const char kSignal1Name[] = "Closer";
-const char kSignal2Name[] = "TheCurseOfKaZar";
-const char kSignal2Argument1[] = "as";
-const char kSignal2Argument2[] = "y";
+const char kDBusTypeArryOfObjects[] = "ao";
+const char kDBusTypeArryOfStrings[] = "as";
+const char kDBusTypeBool[] = "b";
+const char kDBusTypeByte[] = "y";
+const char kDBusTypeInt32[] = "i";
+const char kDBusTypeInt64[] = "x";
+const char kDBusTypeString[] = "s";
+
const char kExpectedContent[] = R"literal_string(
#include <string>
#include <vector>
@@ -155,38 +141,38 @@ class ProxyGeneratorMockTest : public Test {
TEST_F(ProxyGeneratorMockTest, GenerateMocks) {
Interface interface;
- interface.name = kInterfaceName;
+ interface.name = "org.chromium.TestInterface";
interface.path = "/org/chromium/Test";
interface.methods.emplace_back(
- kMethod1Name,
+ "Elements",
vector<Interface::Argument>{
- {kMethod1ArgumentName1, kMethod1Argument1},
- {kMethod1ArgumentName2, kMethod1Argument2}},
- vector<Interface::Argument>{{"", kMethod1Return}});
+ {"space_walk", kDBusTypeString},
+ {"ramblin_man", kDBusTypeArryOfObjects}},
+ vector<Interface::Argument>{{"", kDBusTypeString}});
interface.methods.emplace_back(
- kMethod2Name,
+ "ReturnToPatagonia",
vector<Interface::Argument>{},
- vector<Interface::Argument>{{"", kMethod2Return}});
+ vector<Interface::Argument>{{"", kDBusTypeInt64}});
interface.methods.emplace_back(
- kMethod3Name,
- vector<Interface::Argument>{{"", kMethod3Argument1}},
+ "NiceWeatherForDucks",
+ vector<Interface::Argument>{{"", kDBusTypeBool}},
vector<Interface::Argument>{});
- interface.methods.emplace_back(kMethod4Name);
- interface.signals.emplace_back(kSignal1Name);
+ interface.methods.emplace_back("ExperimentNumberSix");
+ interface.signals.emplace_back("Closer");
interface.signals.emplace_back(
- kSignal2Name,
+ "TheCurseOfKaZar",
vector<Interface::Argument>{
- {"", kSignal2Argument1},
- {"", kSignal2Argument2}});
+ {"", kDBusTypeArryOfStrings},
+ {"", kDBusTypeByte}});
interface.methods.back().doc_string = "Comment line1\nline2";
Interface interface2;
- interface2.name = kInterfaceName2;
+ interface2.name = "org.chromium.TestInterface2";
interface2.methods.emplace_back(
- kMethod5Name,
+ "GetPersonInfo",
vector<Interface::Argument>{},
vector<Interface::Argument>{
- {kMethod5ArgumentName1, kMethod5Argument1},
- {kMethod5ArgumentName2, kMethod5Argument2}});
+ {"name", kDBusTypeString},
+ {"age", kDBusTypeInt32}});
vector<Interface> interfaces{interface, interface2};
base::FilePath output_path = temp_dir_.path().Append("output.h");
base::FilePath proxy_path = temp_dir_.path().Append("proxies.h");
diff --git a/chromeos-dbus-bindings/proxy_generator_unittest.cc b/chromeos-dbus-bindings/proxy_generator_unittest.cc
index aed7703..1c04fbe 100644
--- a/chromeos-dbus-bindings/proxy_generator_unittest.cc
+++ b/chromeos-dbus-bindings/proxy_generator_unittest.cc
@@ -22,28 +22,14 @@ namespace chromeos_dbus_bindings {
namespace {
-const char kInterfaceName[] = "org.chromium.TestInterface";
-const char kInterfaceName2[] = "org.chromium.TestInterface2";
-const char kMethod1Name[] = "Elements";
-const char kMethod1Return[] = "s";
-const char kMethod1Argument1[] = "s";
-const char kMethod1ArgumentName1[] = "space_walk";
-const char kMethod1Argument2[] = "ao";
-const char kMethod1ArgumentName2[] = "ramblin_man";
-const char kMethod2Name[] = "ReturnToPatagonia";
-const char kMethod2Return[] = "x";
-const char kMethod3Name[] = "NiceWeatherForDucks";
-const char kMethod3Argument1[] = "b";
-const char kMethod4Name[] = "ExperimentNumberSix";
-const char kMethod5Name[] = "GetPersonInfo";
-const char kMethod5Argument1[] = "s";
-const char kMethod5ArgumentName1[] = "name";
-const char kMethod5Argument2[] = "i";
-const char kMethod5ArgumentName2[] = "age";
-const char kSignal1Name[] = "Closer";
-const char kSignal2Name[] = "TheCurseOfKaZar";
-const char kSignal2Argument1[] = "as";
-const char kSignal2Argument2[] = "y";
+const char kDBusTypeArryOfObjects[] = "ao";
+const char kDBusTypeArryOfStrings[] = "as";
+const char kDBusTypeBool[] = "b";
+const char kDBusTypeByte[] = "y";
+const char kDBusTypeInt32[] = "i";
+const char kDBusTypeInt64[] = "x";
+const char kDBusTypeString[] = "s";
+
const char kExpectedContent[] = R"literal_string(
#include <memory>
#include <string>
@@ -1281,38 +1267,38 @@ class ProxyGeneratorTest : public Test {
TEST_F(ProxyGeneratorTest, GenerateAdaptors) {
Interface interface;
- interface.name = kInterfaceName;
+ interface.name = "org.chromium.TestInterface";
interface.path = "/org/chromium/Test";
interface.methods.emplace_back(
- kMethod1Name,
+ "Elements",
vector<Interface::Argument>{
- {kMethod1ArgumentName1, kMethod1Argument1},
- {kMethod1ArgumentName2, kMethod1Argument2}},
- vector<Interface::Argument>{{"", kMethod1Return}});
+ {"space_walk", kDBusTypeString},
+ {"ramblin_man", kDBusTypeArryOfObjects}},
+ vector<Interface::Argument>{{"", kDBusTypeString}});
interface.methods.emplace_back(
- kMethod2Name,
+ "ReturnToPatagonia",
vector<Interface::Argument>{},
- vector<Interface::Argument>{{"", kMethod2Return}});
+ vector<Interface::Argument>{{"", kDBusTypeInt64}});
interface.methods.emplace_back(
- kMethod3Name,
- vector<Interface::Argument>{{"", kMethod3Argument1}},
+ "NiceWeatherForDucks",
+ vector<Interface::Argument>{{"", kDBusTypeBool}},
vector<Interface::Argument>{});
- interface.methods.emplace_back(kMethod4Name);
- interface.signals.emplace_back(kSignal1Name);
+ interface.methods.emplace_back("ExperimentNumberSix");
+ interface.signals.emplace_back("Closer");
interface.signals.emplace_back(
- kSignal2Name,
+ "TheCurseOfKaZar",
vector<Interface::Argument>{
- {"", kSignal2Argument1},
- {"", kSignal2Argument2}});
+ {"", kDBusTypeArryOfStrings},
+ {"", kDBusTypeByte}});
interface.methods.back().doc_string = "Comment line1\nline2";
Interface interface2;
- interface2.name = kInterfaceName2;
+ interface2.name = "org.chromium.TestInterface2";
interface2.methods.emplace_back(
- kMethod5Name,
+ "GetPersonInfo",
vector<Interface::Argument>{},
vector<Interface::Argument>{
- {kMethod5ArgumentName1, kMethod5Argument1},
- {kMethod5ArgumentName2, kMethod5Argument2}});
+ {"name", kDBusTypeString},
+ {"age", kDBusTypeInt32}});
vector<Interface> interfaces{interface, interface2};
base::FilePath output_path = temp_dir_.path().Append("output.h");
ServiceConfig config;
@@ -1328,11 +1314,11 @@ TEST_F(ProxyGeneratorTest, GenerateAdaptors) {
TEST_F(ProxyGeneratorTest, GenerateAdaptorsWithServiceName) {
Interface interface;
- interface.name = kInterfaceName;
+ interface.name = "org.chromium.TestInterface";
interface.path = "/org/chromium/Test";
- interface.signals.emplace_back(kSignal1Name);
+ interface.signals.emplace_back("Closer");
Interface interface2;
- interface2.name = kInterfaceName2;
+ interface2.name = "org.chromium.TestInterface2";
vector<Interface> interfaces{interface, interface2};
base::FilePath output_path = temp_dir_.path().Append("output2.h");
ServiceConfig config;
@@ -1351,7 +1337,7 @@ TEST_F(ProxyGeneratorTest, GenerateAdaptorsWithObjectManager) {
Interface interface;
interface.name = "org.chromium.Itf1";
interface.path = "/org/chromium/Test/Object";
- interface.signals.emplace_back(kSignal1Name);
+ interface.signals.emplace_back("Closer");
interface.properties.emplace_back("data", "s", "read");
Interface interface2;
interface2.name = "org.chromium.Itf2";
@@ -1375,7 +1361,7 @@ TEST_F(ProxyGeneratorTest, GenerateAdaptorsWithObjectManagerAndServiceName) {
Interface interface;
interface.name = "org.chromium.Itf1";
interface.path = "/org/chromium/Test/Object";
- interface.signals.emplace_back(kSignal1Name);
+ interface.signals.emplace_back("Closer");
Interface interface2;
interface2.name = "org.chromium.Itf2";
vector<Interface> interfaces{interface, interface2};