Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Apr 26, 2015, 3:51:49 PM (9 years ago)
Author:
landauf
Message:

fixed tests in util_test which failed when a different order of execution was used

Location:
code/branches/core7/test/util/output
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/core7/test/util/output/ConsoleWriterTest.cc

    r9547 r10402  
    77namespace orxonox
    88{
    9     TEST(ConsoleWriterTest, Disable)
     9    namespace
    1010    {
    11         // reset output manager
    12         OutputManager::Testing::getInstancePointer() = new OutputManager();
     11        // Fixture
     12        class ConsoleWriterTest : public ::testing::Test
     13        {
     14            public:
     15                virtual void SetUp()
     16                {
     17                    // reset output manager
     18                    OutputManager::Testing::getInstancePointer() = new OutputManager();
     19                }
    1320
     21                virtual void TearDown()
     22                {
     23                }
     24        };
     25    }
     26
     27    TEST_F(ConsoleWriterTest, Disable)
     28    {
    1429        std::ostream stream(NULL);
    1530        EXPECT_EQ(0U, OutputManager::getInstance().getListeners().size());
     
    2035    }
    2136
    22     TEST(ConsoleWriterTest, Enable)
     37    TEST_F(ConsoleWriterTest, Enable)
    2338    {
    24         // reset output manager
    25         OutputManager::Testing::getInstancePointer() = new OutputManager();
    26 
    2739        std::ostream stream(NULL);
    2840        ConsoleWriter writer(stream);
     
    3345    }
    3446
    35     TEST(ConsoleWriterTest, WritesNoOutputToOutputStream)
     47    TEST_F(ConsoleWriterTest, WritesNoOutputToOutputStream)
    3648    {
    3749        std::stringbuf buffer;
     
    4456    }
    4557
    46     TEST(ConsoleWriterTest, WritesOutputToOutputStream)
     58    TEST_F(ConsoleWriterTest, WritesOutputToOutputStream)
    4759    {
    4860        std::stringbuf buffer;
     
    6375    }
    6476
    65     TEST(ConsoleWriterTest, DefaultConsoleWriterUsesCout)
     77    TEST_F(ConsoleWriterTest, DefaultConsoleWriterUsesCout)
    6678    {
    6779        OutputManager::getInstanceAndCreateListeners();
  • code/branches/core7/test/util/output/LogWriterTest.cc

    r9549 r10402  
    33#include "util/output/LogWriter.h"
    44#include "util/Convert.h"
     5#include "util/output/OutputManager.h"
     6#include "util/SharedPtr.h"
    57
    68namespace orxonox
     
    1416                    { this->LogWriter::printLine(line, level); }
    1517        };
     18
     19        // Fixture
     20        class LogWriterTest : public ::testing::Test
     21        {
     22            public:
     23                virtual void SetUp()
     24                {
     25                    // reset output manager
     26                    OutputManager::Testing::getInstancePointer() = new OutputManager();
     27                }
     28
     29                virtual void TearDown()
     30                {
     31                }
     32        };
    1633    }
    1734
    1835    // test constructor opens file
    19     TEST(LogWriterTest, ConstructorOpensFile)
     36    TEST_F(LogWriterTest, ConstructorOpensFile)
    2037    {
    2138        LogWriter logWriter;
     
    6481    }
    6582
    66     TEST(LogWriterTest, SetLogDirectoryOpensNewFile)
     83    TEST_F(LogWriterTest, SetLogDirectoryOpensNewFile)
    6784    {
    6885        std::string path = "./orxonox.log";
     
    83100
    84101    // prints output to logfile
    85     TEST(LogWriterTest, PrintsOutputToLogfile)
     102    TEST_F(LogWriterTest, PrintsOutputToLogfile)
    86103    {
    87104        std::string path;
     
    103120
    104121    // prints time to logfile
    105     TEST(LogWriterTest, PrintsTimestampToLogfile)
     122    TEST_F(LogWriterTest, PrintsTimestampToLogfile)
    106123    {
    107124        std::string path;
     
    152169    }
    153170
    154     TEST(LogWriterTest, ArchivesOldLogFile)
     171    TEST_F(LogWriterTest, ArchivesOldLogFile)
    155172    {
    156173        deleteAllLogFiles();
     
    196213    }
    197214
    198     TEST(LogWriterTest, ArchivesNineLogFiles)
     215    TEST_F(LogWriterTest, ArchivesNineLogFiles)
    199216    {
    200217        deleteAllLogFiles();
  • code/branches/core7/test/util/output/MemoryWriterTest.cc

    r9545 r10402  
    44#include "util/output/MemoryWriter.h"
    55#include "util/output/OutputManager.h"
     6#include "util/SharedPtr.h"
    67
    78namespace orxonox
     
    1415                MOCK_METHOD3(output, void(OutputLevel, const OutputContextContainer&, const std::vector<std::string>&));
    1516        };
     17
     18        // Fixture
     19        class MemoryWriterTest : public ::testing::Test
     20        {
     21            public:
     22                virtual void SetUp()
     23                {
     24                    // reset output manager
     25                    OutputManager::Testing::getInstancePointer() = new OutputManager();
     26                }
     27
     28                virtual void TearDown()
     29                {
     30                }
     31        };
    1632    }
    1733
    18     TEST(MemoryWriterTest, Disable)
     34    TEST_F(MemoryWriterTest, Disable)
    1935    {
    2036        EXPECT_EQ(0U, OutputManager::getInstance().getListeners().size());
     
    2541    }
    2642
    27     TEST(MemoryWriterTest, ResendOutput)
     43    TEST_F(MemoryWriterTest, ResendOutput)
    2844    {
    2945        MemoryWriter writer;
Note: See TracChangeset for help on using the changeset viewer.