Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(132)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: extensions/renderer/api/serial/serial_api_unittest.cc

Issue 873903002: Set serial connection parameters immediately on connect. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add a comment explaing the "set" notation. Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/browser/api/serial/serial_connection.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/renderer/api/serial/serial_api_unittest.cc
diff --git a/extensions/renderer/api/serial/serial_api_unittest.cc b/extensions/renderer/api/serial/serial_api_unittest.cc
index 36cbe456cc01be0dd174615d1596dbfb1f944b3d..81c5c352f5e7df4c142156bf0805e1872c48440b 100644
--- a/extensions/renderer/api/serial/serial_api_unittest.cc
+++ b/extensions/renderer/api/serial/serial_api_unittest.cc
@@ -176,78 +176,86 @@ class GetControlSignalsTestIoHandler : public TestIoHandlerBase {
class ConfigurePortTestIoHandler : public TestIoHandlerBase {
public:
ConfigurePortTestIoHandler() {}
- bool ConfigurePort(
- const device::serial::ConnectionOptions& options) override {
+ bool ConfigurePortImpl() override {
static const device::serial::ConnectionOptions expected_options[] = {
+ // Each JavaScript call to chrome.serial.update only modifies a single
+ // property of the connection however this function can only check the
+ // final value of all options. The modified option is marked with "set".
GenerateConnectionOptions(9600,
device::serial::DATA_BITS_EIGHT,
device::serial::PARITY_BIT_NO,
device::serial::STOP_BITS_ONE,
OPTIONAL_VALUE_FALSE),
- GenerateConnectionOptions(57600,
- device::serial::DATA_BITS_NONE,
- device::serial::PARITY_BIT_NONE,
- device::serial::STOP_BITS_NONE,
- OPTIONAL_VALUE_UNSET),
- GenerateConnectionOptions(0,
- device::serial::DATA_BITS_SEVEN,
- device::serial::PARITY_BIT_NONE,
- device::serial::STOP_BITS_NONE,
- OPTIONAL_VALUE_UNSET),
- GenerateConnectionOptions(0,
+ GenerateConnectionOptions(57600, // set
device::serial::DATA_BITS_EIGHT,
- device::serial::PARITY_BIT_NONE,
- device::serial::STOP_BITS_NONE,
- OPTIONAL_VALUE_UNSET),
- GenerateConnectionOptions(0,
- device::serial::DATA_BITS_NONE,
device::serial::PARITY_BIT_NO,
- device::serial::STOP_BITS_NONE,
- OPTIONAL_VALUE_UNSET),
- GenerateConnectionOptions(0,
- device::serial::DATA_BITS_NONE,
- device::serial::PARITY_BIT_ODD,
- device::serial::STOP_BITS_NONE,
- OPTIONAL_VALUE_UNSET),
- GenerateConnectionOptions(0,
- device::serial::DATA_BITS_NONE,
- device::serial::PARITY_BIT_EVEN,
- device::serial::STOP_BITS_NONE,
- OPTIONAL_VALUE_UNSET),
- GenerateConnectionOptions(0,
- device::serial::DATA_BITS_NONE,
- device::serial::PARITY_BIT_NONE,
device::serial::STOP_BITS_ONE,
- OPTIONAL_VALUE_UNSET),
- GenerateConnectionOptions(0,
- device::serial::DATA_BITS_NONE,
- device::serial::PARITY_BIT_NONE,
- device::serial::STOP_BITS_TWO,
- OPTIONAL_VALUE_UNSET),
- GenerateConnectionOptions(0,
- device::serial::DATA_BITS_NONE,
- device::serial::PARITY_BIT_NONE,
- device::serial::STOP_BITS_NONE,
OPTIONAL_VALUE_FALSE),
- GenerateConnectionOptions(0,
- device::serial::DATA_BITS_NONE,
- device::serial::PARITY_BIT_NONE,
- device::serial::STOP_BITS_NONE,
- OPTIONAL_VALUE_TRUE),
+ GenerateConnectionOptions(57600,
+ device::serial::DATA_BITS_SEVEN, // set
+ device::serial::PARITY_BIT_NO,
+ device::serial::STOP_BITS_ONE,
+ OPTIONAL_VALUE_FALSE),
+ GenerateConnectionOptions(57600,
+ device::serial::DATA_BITS_EIGHT, // set
+ device::serial::PARITY_BIT_NO,
+ device::serial::STOP_BITS_ONE,
+ OPTIONAL_VALUE_FALSE),
+ GenerateConnectionOptions(57600,
+ device::serial::DATA_BITS_EIGHT,
+ device::serial::PARITY_BIT_NO, // set
+ device::serial::STOP_BITS_ONE,
+ OPTIONAL_VALUE_FALSE),
+ GenerateConnectionOptions(57600,
+ device::serial::DATA_BITS_EIGHT,
+ device::serial::PARITY_BIT_ODD, // set
+ device::serial::STOP_BITS_ONE,
+ OPTIONAL_VALUE_FALSE),
+ GenerateConnectionOptions(57600,
+ device::serial::DATA_BITS_EIGHT,
+ device::serial::PARITY_BIT_EVEN, // set
+ device::serial::STOP_BITS_ONE,
+ OPTIONAL_VALUE_FALSE),
+ GenerateConnectionOptions(57600,
+ device::serial::DATA_BITS_EIGHT,
+ device::serial::PARITY_BIT_EVEN,
+ device::serial::STOP_BITS_ONE, // set
+ OPTIONAL_VALUE_FALSE),
+ GenerateConnectionOptions(57600,
+ device::serial::DATA_BITS_EIGHT,
+ device::serial::PARITY_BIT_EVEN,
+ device::serial::STOP_BITS_TWO, // set
+ OPTIONAL_VALUE_FALSE),
+ GenerateConnectionOptions(57600,
+ device::serial::DATA_BITS_EIGHT,
+ device::serial::PARITY_BIT_EVEN,
+ device::serial::STOP_BITS_TWO,
+ OPTIONAL_VALUE_FALSE), // set
+ GenerateConnectionOptions(57600,
+ device::serial::DATA_BITS_EIGHT,
+ device::serial::PARITY_BIT_EVEN,
+ device::serial::STOP_BITS_TWO,
+ OPTIONAL_VALUE_TRUE), // set
};
- if (num_calls() >= arraysize(expected_options))
+
+ if (!TestIoHandlerBase::ConfigurePortImpl()) {
return false;
+ }
- EXPECT_EQ(expected_options[num_calls()].bitrate, options.bitrate);
- EXPECT_EQ(expected_options[num_calls()].data_bits, options.data_bits);
- EXPECT_EQ(expected_options[num_calls()].parity_bit, options.parity_bit);
- EXPECT_EQ(expected_options[num_calls()].stop_bits, options.stop_bits);
+ if (num_calls() >= arraysize(expected_options)) {
+ return false;
+ }
+
+ EXPECT_EQ(expected_options[num_calls()].bitrate, options().bitrate);
+ EXPECT_EQ(expected_options[num_calls()].data_bits, options().data_bits);
+ EXPECT_EQ(expected_options[num_calls()].parity_bit, options().parity_bit);
+ EXPECT_EQ(expected_options[num_calls()].stop_bits, options().stop_bits);
EXPECT_EQ(expected_options[num_calls()].has_cts_flow_control,
- options.has_cts_flow_control);
+ options().has_cts_flow_control);
EXPECT_EQ(expected_options[num_calls()].cts_flow_control,
- options.cts_flow_control);
+ options().cts_flow_control);
record_call();
- return TestSerialIoHandler::ConfigurePort(options);
+ return true;
}
private:
@@ -275,6 +283,7 @@ class FailToConnectTestIoHandler : public TestIoHandlerBase {
public:
FailToConnectTestIoHandler() {}
void Open(const std::string& port,
+ const device::serial::ConnectionOptions& options,
const OpenCompleteCallback& callback) override {
callback.Run(false);
return;
« no previous file with comments | « extensions/browser/api/serial/serial_connection.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698