Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/include/internal
diff options
context:
space:
mode:
authorPhil Nash2013-05-28 19:07:29 +0100
committerPhil Nash2013-05-28 19:07:29 +0100
commit6b8837bd9360f26c03112ce4e104ec7aa96b264d (patch)
tree898d63c772e3817fdc45b6ba9494ad73a1b8335d /include/internal
parent43fe6c6e9edae209947101295edcf0e9e217716c (diff)
downloadcatch3-6b8837bd9360f26c03112ce4e104ec7aa96b264d.tar.gz
Final refactoring to remove direct access to encapsulated ConfigData once in Config
Diffstat (limited to 'include/internal')
-rw-r--r--include/internal/catch_config.hpp16
1 files changed, 9 insertions, 7 deletions
diff --git a/include/internal/catch_config.hpp b/include/internal/catch_config.hpp
index 11e1e86d..baaad59f 100644
--- a/include/internal/catch_config.hpp
+++ b/include/internal/catch_config.hpp
@@ -88,7 +88,8 @@ namespace Catch {
Config( ConfigData const& data )
: m_data( data ),
- m_os( std::cout.rdbuf() )
+ m_os( std::cout.rdbuf() ),
+ m_filters( data.filters )
{}
virtual ~Config() {
@@ -134,6 +135,10 @@ namespace Catch {
m_stream.release();
m_stream = stream;
}
+
+ std::string getStreamName() const { return m_data.stream; }
+
+ std::string getReporterName() const { return m_data.reporter; }
void addTestSpec( std::string const& testSpec ) {
TestCaseFilters filters( testSpec );
@@ -145,11 +150,8 @@ namespace Catch {
return m_data.cutoff;
}
- ConfigData const& data() const {
- return m_data;
- }
- ConfigData& data() {
- return m_data;
+ std::vector<TestCaseFilters> const& filters() const {
+ return m_filters;
}
// IConfig interface
@@ -162,9 +164,9 @@ namespace Catch {
private:
ConfigData m_data;
- // !TBD Move these out of here
Stream m_stream;
mutable std::ostream m_os;
+ std::vector<TestCaseFilters> m_filters;
};