Move SetUp and TearDown methods to protected sections

2 files changed, 11 insertions, 10 deletions

diff --git a/include/xorg/gtest/environment.h b/include/xorg/gtest/environment.h
index 8d3901b..fd550e7 100644
--- a/include/xorg/gtest/environment.h
+++ b/include/xorg/gtest/environment.h
@@ -71,11 +71,13 @@ class Environment : public ::testing::Environment {
               const std::string& path_to_server = "Xorg", int display = 133);
 
   virtual ~Environment();
+
+ protected:
   /**
    * Starts the dummy X server.
    *
-   * Reimplemented from ::testing::Environment. Should only be called by subclasses.
-   * See Google %Test documentation for details.
+   * Reimplemented from ::testing::Environment. See Google %Test documentation
+   * for details.
    *
    * @throws std::runtime_error if a dummy X server cannot be started.
    *
@@ -88,8 +90,8 @@ class Environment : public ::testing::Environment {
   /**
    * Stops the dummy X server.
    *
-   * Reimplemented from ::testing::Environment. Should only be called by subclasses.
-   * See Google %Test documentation for details.
+   * Reimplemented from ::testing::Environment. See Google %Test documentation
+   * for details.
    *
    * @post Dummy X server stopped.
    */
diff --git a/include/xorg/gtest/test.h b/include/xorg/gtest/test.h
index 64e1dda..1d6d1ea 100644
--- a/include/xorg/gtest/test.h
+++ b/include/xorg/gtest/test.h
@@ -49,12 +49,13 @@ class Test : public ::testing::Test {
 
   virtual ~Test();
 
+ protected:
   /**
    * Tries to connect to an X server instance.
    *
    * Fails if no X server is running. Updates the display object.
-   * Reimplemented from ::testing::Test, should only be called by subclasses.
-   * See Google %Test documentation for details.
+   * Reimplemented from ::testing::Test. See Google %Test documentation for
+   * details.
    *
    * @post Subsequent calls to Display() return a valid pointer or NULL if an error occured.
    *
@@ -65,15 +66,13 @@ class Test : public ::testing::Test {
   /**
    * Closes the display.
    *
-   * Reimplemented from ::testing::Test, should only be called by subclasses.
-   * See Google %Test documentation for details.
+   * Reimplemented from ::testing::Test. See Google %Test documentation for
+   * details.
    *
    * @post Subsequent calls to Display() return NULL.
    */
   virtual void TearDown();
 
- protected:
-
   /**
    * Accesses the display representing an Xlib connection.
    *