SunnyQjm/ChronoSync
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests: don't use makeDummyClientFace

Browse Source 
refs #3383

Change-Id: I510e17d2aeef1739d50c680a251e1d7dd3a5a26a
This commit is contained in:
Junxiao Shi committed 2016-07-14 15:27:14 +00:00
1 parent edaef7c412
commit 0c7f56ad29
2 files changed
+20 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/unit-tests/test-logic.cpp
+11 -10
View File
@@ -1,6 +1,6 @@
/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
/*
* Copyright (c) 2012-2014 University of California, Los Angeles
* Copyright (c) 2012-2016 University of California, Los Angeles
*
* This file is part of ChronoSync, synchronization library for distributed realtime
* applications for NDN.
@@ -27,7 +27,6 @@ namespace test {
using std::vector;
using ndn::util::DummyClientFace;
using ndn::util::makeDummyClientFace;
class Handler
{
@@ -62,6 +61,7 @@ public:
logic.updateSeqNo(seqNo);
}
public:
Logic logic;
std::map<Name, SeqNo> map;
};
@@ -77,9 +77,9 @@ public:
userPrefix[1] = Name("/user1");
userPrefix[2] = Name("/user2");
faces[0] = makeDummyClientFace(ref(io), {true, true});
faces[1] = makeDummyClientFace(ref(io), {true, true});
faces[2] = makeDummyClientFace(ref(io), {true, true});
faces[0].reset(new DummyClientFace(io, {true, true}));
faces[1].reset(new DummyClientFace(io, {true, true}));
faces[2].reset(new DummyClientFace(io, {true, true}));
for (int i = 0; i < 3; i++) {
readInterestOffset[i] = 0;
@@ -104,19 +104,20 @@ public:
}
readInterestOffset[sender]++;
}
while (faces[sender]->sentDatas.size() > readDataOffset[sender]) {
while (faces[sender]->sentData.size() > readDataOffset[sender]) {
for (int i = 0; i < 3; i++) {
if (sender != i)
faces[i]->receive(faces[sender]->sentDatas[readDataOffset[sender]]);
faces[i]->receive(faces[sender]->sentData[readDataOffset[sender]]);
}
readDataOffset[sender]++;
}
}
public:
Name syncPrefix;
Name userPrefix[3];
shared_ptr<DummyClientFace> faces[3];
std::unique_ptr<DummyClientFace> faces[3];
shared_ptr<Handler> handler[3];
size_t readInterestOffset[3];
@@ -134,8 +135,8 @@ BOOST_AUTO_TEST_CASE(Constructor)
{
Name syncPrefix("/ndn/broadcast/sync");
Name userPrefix("/user");
shared_ptr<DummyClientFace> face = makeDummyClientFace(ref(io), {true, true});
BOOST_REQUIRE_NO_THROW(Logic(ref(*face), syncPrefix, userPrefix,
DummyClientFace face(io, {true, true});
BOOST_REQUIRE_NO_THROW(Logic(face, syncPrefix, userPrefix,
bind(onUpdate, _1)));
}
tests/unit-tests/test-socket.cpp
+9 -8
View File
@@ -1,6 +1,6 @@
/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
/*
* Copyright (c) 2012-2014 University of California, Los Angeles
* Copyright (c) 2012-2016 University of California, Los Angeles
*
* This file is part of ChronoSync, synchronization library for distributed realtime
* applications for NDN.
@@ -29,7 +29,6 @@ using std::string;
using std::vector;
using std::map;
using ndn::util::DummyClientFace;
using ndn::util::makeDummyClientFace;
/**
@@ -136,6 +135,7 @@ public:
return str;
}
public:
map<ndn::Name, string> data;
uint32_t sum;
Socket socket;
@@ -152,9 +152,9 @@ public:
userPrefix[1] = Name("/user1");
userPrefix[2] = Name("/user2");
faces[0] = makeDummyClientFace(ref(io), {true, true});
faces[1] = makeDummyClientFace(ref(io), {true, true});
faces[2] = makeDummyClientFace(ref(io), {true, true});
faces[0].reset(new DummyClientFace(io, {true, true}));
faces[1].reset(new DummyClientFace(io, {true, true}));
faces[2].reset(new DummyClientFace(io, {true, true}));
for (int i = 0; i < 3; i++) {
readInterestOffset[i] = 0;
@@ -179,10 +179,10 @@ public:
}
readInterestOffset[sender]++;
}
while (faces[sender]->sentDatas.size() > readDataOffset[sender]) {
while (faces[sender]->sentData.size() > readDataOffset[sender]) {
for (int i = 0; i < 3; i++) {
if (sender != i)
faces[i]->receive(faces[sender]->sentDatas[readDataOffset[sender]]);
faces[i]->receive(faces[sender]->sentData[readDataOffset[sender]]);
}
readDataOffset[sender]++;
}
@@ -224,11 +224,12 @@ public:
app[idx]->setNum(dataName, buf, size);
}
public:
Name syncPrefix;
Name userPrefix[3];
Name sessionName[3];
shared_ptr<DummyClientFace> faces[3];
std::unique_ptr<DummyClientFace> faces[3];
shared_ptr<SocketTestApp> app[3];
size_t readInterestOffset[3];