From fbfe85568b2c0b3b2cddfe421c827ea3dd226552 Mon Sep 17 00:00:00 2001 From: sciencewhiz Date: Sun, 29 Oct 2017 21:30:50 -0700 Subject: [PATCH] Fix preferences test (#699) --- .../src/FRCUserProgram/cpp/PreferencesTest.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/wpilibcIntegrationTests/src/FRCUserProgram/cpp/PreferencesTest.cpp b/wpilibcIntegrationTests/src/FRCUserProgram/cpp/PreferencesTest.cpp index 7eab13a7c5..65544d54d5 100644 --- a/wpilibcIntegrationTests/src/FRCUserProgram/cpp/PreferencesTest.cpp +++ b/wpilibcIntegrationTests/src/FRCUserProgram/cpp/PreferencesTest.cpp @@ -62,17 +62,17 @@ TEST(PreferencesTest, ReadPreferencesFromFile) { */ TEST(PreferencesTest, WritePreferencesToFile) { auto inst = nt::NetworkTableInstance::GetDefault(); - inst.StopServer(); - inst.DeleteAllEntries(); - // persistent keys don't get deleted normally, so make remaining keys - // non-persistent and delete them too - for (auto entry : inst.GetEntries("", 0)) { - entry.SetFlags(0); - } - inst.DeleteAllEntries(); - std::remove(kFileName); inst.StartServer(); Preferences* preferences = Preferences::GetInstance(); + preferences->Remove("testFileGetString"); + preferences->Remove("testFileGetInt"); + preferences->Remove("testFileGetDouble"); + preferences->Remove("testFileGetFloat"); + preferences->Remove("testFileGetBoolean"); + preferences->Remove("testFileGetLong"); + + Wait(kSaveTime); + preferences->PutString("testFilePutString", "Hello, preferences file"); preferences->PutInt("testFilePutInt", 1); preferences->PutDouble("testFilePutDouble", 0.5);