Skip to content

Commit

Permalink
Minimize diff
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Carroll <[email protected]>
  • Loading branch information
mjcarroll committed Nov 9, 2023
1 parent 50cfc6b commit e61ebc1
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion testing/include/gz/common/testing/CMakeTestPaths.hh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace gz::common::testing
///
/// It is not intended that users will directly construct this, but rather
/// utilize the TestPathFactory.
class CMakeTestPaths: public TestPaths
class GZ_COMMON_TESTING_VISIBLE CMakeTestPaths: public TestPaths
{
/// \brief Constructor
/// \param[in] _projectSourcePath Path to the root of the project source
Expand Down
2 changes: 1 addition & 1 deletion testing/include/gz/common/testing/TestPaths.hh
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ enum class GZ_COMMON_TESTING_VISIBLE BuildType
kBazel
};


//////////////////////////////////////////////////
/// \brief Helper interface to generate path information to support
/// test access to source/data files
Expand Down Expand Up @@ -83,6 +82,7 @@ class GZ_COMMON_TESTING_VISIBLE TestPaths
public: virtual bool TestTmpPath(std::string &_tmpDir) = 0;

GZ_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
/// \brief Path to the root of the project source
protected: std::string projectSourcePath;
GZ_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
};
Expand Down
8 changes: 4 additions & 4 deletions testing/src/CMakeTestPaths_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ TEST(CMakeTestPaths, TestBuildType)
/////////////////////////////////////////////////
TEST(CMakeTestPaths, ProjectSourcePath)
{
auto testPaths = TestPathFactory(kTestingProjectSourceDir);
gz::common::testing::CMakeTestPaths testPaths;

std::string sourceDir;
ASSERT_TRUE(testPaths->ProjectSourcePath(sourceDir));
ASSERT_TRUE(testPaths.ProjectSourcePath(sourceDir));
ASSERT_FALSE(sourceDir.empty());
ASSERT_TRUE(exists(sourceDir)) << sourceDir;
ASSERT_TRUE(isDirectory(sourceDir));
Expand All @@ -81,10 +81,10 @@ TEST(CMakeTestPaths, ProjectSourcePath)
/////////////////////////////////////////////////
TEST(CMakeTestPaths, TestTmpPath)
{
auto testPaths = TestPathFactory(kTestingProjectSourceDir);
gz::common::testing::CMakeTestPaths testPaths;

std::string tmpDir;
ASSERT_TRUE(testPaths->TestTmpPath(tmpDir));
ASSERT_TRUE(testPaths.TestTmpPath(tmpDir));
ASSERT_FALSE(tmpDir.empty());
ASSERT_TRUE(exists(tmpDir)) << tmpDir;
ASSERT_TRUE(isDirectory(tmpDir));
Expand Down

0 comments on commit e61ebc1

Please sign in to comment.