Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpilibc] Return reference from GetInstance (#3247)

Browse Source 
Improves consistency across all classes.

Affects Preferences, LiveWindow, and CameraServer.

Old commands Scheduler::GetInstance() was not updated as this is already
deprecated.
This commit is contained in:
Peter Johnson
2021-03-21 11:13:49 -07:00
committed by GitHub
parent 9550777b9d
commit a79faace1b
18 changed files with 67 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
wpilibcIntegrationTests/src/main/native/cpp/PreferencesTest.cpp
View File

@@ -44,14 +44,14 @@ TEST(PreferencesTest, ReadPreferencesFromFile) {
preferencesFile.close();
inst.StartServer();
Preferences* preferences = Preferences::GetInstance();
Preferences& preferences = Preferences::GetInstance();
EXPECT_EQ("Hello, preferences file",
preferences->GetString("testFileGetString"));
EXPECT_EQ(1, preferences->GetInt("testFileGetInt"));
EXPECT_FLOAT_EQ(0.5, preferences->GetDouble("testFileGetDouble"));
EXPECT_FLOAT_EQ(0.25f, preferences->GetFloat("testFileGetFloat"));
EXPECT_TRUE(preferences->GetBoolean("testFileGetBoolean"));
EXPECT_EQ(1000000000000000000ll, preferences->GetLong("testFileGetLong"));
preferences.GetString("testFileGetString"));
EXPECT_EQ(1, preferences.GetInt("testFileGetInt"));
EXPECT_FLOAT_EQ(0.5, preferences.GetDouble("testFileGetDouble"));
EXPECT_FLOAT_EQ(0.25f, preferences.GetFloat("testFileGetFloat"));
EXPECT_TRUE(preferences.GetBoolean("testFileGetBoolean"));
EXPECT_EQ(1000000000000000000ll, preferences.GetLong("testFileGetLong"));
}
/**
@@ -61,22 +61,22 @@ TEST(PreferencesTest, ReadPreferencesFromFile) {
TEST(PreferencesTest, WritePreferencesToFile) {
auto inst = nt::NetworkTableInstance::GetDefault();
inst.StartServer();
Preferences* preferences = Preferences::GetInstance();
preferences->Remove("testFileGetString");
preferences->Remove("testFileGetInt");
preferences->Remove("testFileGetDouble");
preferences->Remove("testFileGetFloat");
preferences->Remove("testFileGetBoolean");
preferences->Remove("testFileGetLong");
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);
preferences->PutFloat("testFilePutFloat", 0.25f);
preferences->PutBoolean("testFilePutBoolean", true);
preferences->PutLong("testFilePutLong", 1000000000000000000ll);
preferences.PutString("testFilePutString", "Hello, preferences file");
preferences.PutInt("testFilePutInt", 1);
preferences.PutDouble("testFilePutDouble", 0.5);
preferences.PutFloat("testFilePutFloat", 0.25f);
preferences.PutBoolean("testFilePutBoolean", true);
preferences.PutLong("testFilePutLong", 1000000000000000000ll);
Wait(kSaveTime);

2
wpilibcIntegrationTests/src/main/native/cpp/TestEnvironment.cpp
View File

@@ -40,7 +40,7 @@ class TestEnvironment : public testing::Environment {
station returns that the robot is enabled, to ensure that tests
will be able to run on the hardware. */
HAL_ObserveUserProgramStarting();
LiveWindow::GetInstance()->SetEnabled(false);
LiveWindow::GetInstance().SetEnabled(false);
wpi::outs() << "Started coms\n";