Skip to content
This repository was archived by the owner on Jan 6, 2020. It is now read-only.

MAID-730 Rename NETWORK_tests in NFS #57

Open
benjaminbollen wants to merge 2 commits into
base: next
Choose a base branch
from
Open

MAID-730 Rename NETWORK_tests in NFS #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b728def
Rename NETWORK_tests in NFS
Feb 2, 2015
0c4e6b9
MAID-730 change network test
Feb 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/maidsafe/nfs/tests/maid_client_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace nfs {

namespace test {

TEST_F(MaidClientTest, FUNC_Constructor) {
TEST_F(MaidClientTest, NETWORK_Constructor) {
auto maid_and_signer(passport::CreateMaidAndSigner());
{
auto nfs_new_account = nfs_client::MaidClient::MakeShared(maid_and_signer);
Expand All @@ -33,14 +33,14 @@ TEST_F(MaidClientTest, FUNC_Constructor) {
auto nfs_existing_account = nfs_client::MaidClient::MakeShared(maid_and_signer.first);
}

TEST_F(MaidClientTest, FUNC_FailingGet) {
TEST_F(MaidClientTest, NETWORK_FailingGet) {
ImmutableData data(NonEmptyString(RandomString(kTestChunkSize)));
AddClient();
auto future(clients_.back()->Get<ImmutableData::Name>(data.name(), std::chrono::seconds(10)));
EXPECT_THROW(future.get(), std::exception) << "must have failed";
}

TEST_F(MaidClientTest, FUNC_PutGet) {
TEST_F(MaidClientTest, NETWORK_PutGet) {
AddClient();
ImmutableData data(NonEmptyString(RandomString(kTestChunkSize)));
LOG(kVerbose) << "Before put";
Expand All @@ -61,7 +61,7 @@ TEST_F(MaidClientTest, FUNC_PutGet) {
}
}

TEST_F(MaidClientTest, FUNC_MultipleSequentialPuts) {
TEST_F(MaidClientTest, NETWORK_MultipleSequentialPuts) {
routing::Parameters::caching = true;
const size_t kIterations(10);
GenerateChunks(kIterations);
Expand All @@ -82,20 +82,20 @@ TEST_F(MaidClientTest, FUNC_MultipleSequentialPuts) {
LOG(kVerbose) << "Multiple sequential puts is finished successfully";
}

TEST_F(MaidClientTest, FUNC_MultipleParallelPuts) {
TEST_F(MaidClientTest, NETWORK_MultipleParallelPuts) {
routing::Parameters::caching = false;
LOG(kVerbose) << "put 10 chunks with 1 clients";
PutGetTest(1, 10);
LOG(kVerbose) << "Multiple parallel puts test has finished successfully";
}

TEST_F(MaidClientTest, FUNC_MultipleClientsPut) {
TEST_F(MaidClientTest, NETWORK_MultipleClientsPut) {
LOG(kVerbose) << "put 10 chunks with 5 clients";
PutGetTest(5, 10);
LOG(kVerbose) << "Put with multiple clients test has finished successfully";
}

TEST_F(MaidClientTest, FUNC_DataFlooding) {
TEST_F(MaidClientTest, NETWORK_DataFlooding) {
LOG(kVerbose) << "flooding 100 chunks with 10 clients";
PutGetTest(10, 100);
LOG(kVerbose) << "Data flooding test has finished successfully";
Expand Down Expand Up @@ -151,7 +151,7 @@ TEST_F(MaidClientTest, DISABLED_FUNC_PutMultipleCopies) {
}
*/

TEST_F(MaidClientTest, FUNC_PopulateSingleBranchTree) {
TEST_F(MaidClientTest, NETWORK_PopulateSingleBranchTree) {
ImmutableData chunk(NonEmptyString(RandomAlphaNumericString(1024)));
const size_t max_versions(5), max_branches(1);
GenerateChunks(max_versions * 2);
Expand Down Expand Up @@ -190,7 +190,7 @@ TEST_F(MaidClientTest, FUNC_PopulateSingleBranchTree) {
}
}

TEST_F(MaidClientTest, FUNC_PopulateMultipleBranchTree) {
TEST_F(MaidClientTest, NETWORK_PopulateMultipleBranchTree) {
VersionTreeTest(5, 4, 20);
VersionTreeTest(100, 10, 60);
}
Expand Down
2 changes: 1 addition & 1 deletion src/maidsafe/nfs/tests/mpid_client_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace nfs {

namespace test {

TEST_F(MpidClientTest, FUNC_Constructor) {
TEST_F(MpidClientTest, NETWORK_Constructor) {
auto mpid_and_signer(passport::CreateMpidAndSigner());
{
auto new_account = nfs_client::MpidClient::MakeShared(mpid_and_signer);
Expand Down