Commit1dc56d8

committed

Merge pull requestFirebaseExtended#180 from ed7coyne/fix-modem-streaming

Add json parsing to modem streaming

2 parentsdf8372a +56bb2c5 commit1dc56d8Copy full SHA for 1dc56d8

File tree

+11

-8

lines changed

+11

-8

lines changed

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,17 +23,19 @@ bool StreamCommand::execute(const String& command,`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`bool running =true;`
	`26`	`+ DynamicJsonBuffer buffer;`
`26`	`27`	`while(running) {`
`27`	`28`	`if (stream->available()) {`
`28`	`29`	`std::string json;`
`29`	`30`	`FirebaseStream::Event event = stream->read(json);`
`30`	`31`	`out->print("+");`
`31`	`32`	`out->print(FirebaseStream::EventToName(event).c_str());`
`32`	`33`	`out->print("");`
`33`		`-// TODO(edcoyne): add json parsing and get real path.`
`34`		`- out->println("/dummy/path");`
`35`		`- out->println(json.length());`
`36`		`- out->println(json.c_str());`
	`34`	`+constauto& object = buffer.parseObject(json.c_str());`
	`35`	`+ String data = object["data"];`
	`36`	`+ out->println(object["path"].asString());`
	`37`	`+ out->println(data.length());`
	`38`	`+ out->println(data);`
`37`	`39`	`}elseif (in->available()) {`
`38`	`40`	`String command = in->readLine();`
`39`	`41`	`if (command =="END_STREAM") {`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,8 @@ TEST_F(StreamCommandTest, streams) {`
`46`	`46`	`.WillOnce(Return(path))`
`47`	`47`	`.WillOnce(Return("END_STREAM"));`
`48`	`48`
`49`		`-const Stringvalue("Test value");`
	`49`	`+const String data ="Test Value";`
	`50`	`+const Stringvalue(String("{\"path\" :\"/test/path\",\"data\" :\"") + data +"\"}");`
`50`	`51`	`EXPECT_CALL(*stream_,available())`
`51`	`52`	`.WillOnce(Return(true))`
`52`	`53`	`.WillRepeatedly(Return(false));`
`@@ -63,12 +64,12 @@ TEST_F(StreamCommandTest, streams) {`
`63`	`64`	`.WillOnce(Return(1));`
`64`	`65`	`EXPECT_CALL(out_,print(String("")))`
`65`	`66`	`.WillOnce(Return(1));`
`66`		`-EXPECT_CALL(out_,println(String("/dummy/path")))`
	`67`	`+EXPECT_CALL(out_,println(path))`
`67`	`68`	`.WillOnce(Return(1));`
`68`	`69`
`69`		`-EXPECT_CALL(out_,println(value.length()))`
	`70`	`+EXPECT_CALL(out_,println(data.length()))`
`70`	`71`	`.WillOnce(Return(1));`
`71`		`-EXPECT_CALL(out_,println(value))`
	`72`	`+EXPECT_CALL(out_,println(data))`
`72`	`73`	`.WillOnce(Return(1));`
`73`	`74`
`74`	`75`	`EXPECT_CALL(out_,println(String("+OK")))`

Comments

(0)