diff options
author | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 18:09:04 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 18:09:04 +0000 |
commit | 393f1b414746a7f1977971dd7659dd2b47092b11 (patch) | |
tree | 81d0ca1ee70ab86a7d79c1991abe5c387b655fb2 /src/unitsuite.cpp | |
parent | c259f95bd0e58b247940a339bb9b4b401b4e9438 (diff) | |
parent | 7e25a863325dc3e9762397e700030969e093b087 (diff) | |
download | libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.tar.gz libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.tar.bz2 libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.tar.xz libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.zip |
Wow! Merged the branch, streams are updated, and there's no more FString, run
the fixstrings.sh script in the support directory to (hopefully) automatically
update your projects.
Diffstat (limited to 'src/unitsuite.cpp')
-rw-r--r-- | src/unitsuite.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/unitsuite.cpp b/src/unitsuite.cpp index ce6d037..db930a4 100644 --- a/src/unitsuite.cpp +++ b/src/unitsuite.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -158,14 +158,14 @@ int Bu::UnitSuite::run( int argc, char *argv[] ) | |||
158 | return 0; | 158 | return 0; |
159 | } | 159 | } |
160 | 160 | ||
161 | Bu::File Bu::UnitSuite::tempFile( Bu::FString &sFileName ) | 161 | Bu::File Bu::UnitSuite::tempFile( Bu::String &sFileName ) |
162 | { | 162 | { |
163 | Bu::File f = Bu::File::tempFile( sFileName ); | 163 | Bu::File f = Bu::File::tempFile( sFileName ); |
164 | lFileCleanup.append( sFileName ); | 164 | lFileCleanup.append( sFileName ); |
165 | return f; | 165 | return f; |
166 | } | 166 | } |
167 | 167 | ||
168 | void Bu::UnitSuite::add( Test fTest, const Bu::FString &sName, Expect e ) | 168 | void Bu::UnitSuite::add( Test fTest, const Bu::String &sName, Expect e ) |
169 | { | 169 | { |
170 | TestInfo ti; | 170 | TestInfo ti; |
171 | ti.sName = sName; | 171 | ti.sName = sName; |
@@ -173,7 +173,7 @@ void Bu::UnitSuite::add( Test fTest, const Bu::FString &sName, Expect e ) | |||
173 | long index = ti.sName.rfindIdx("::"); | 173 | long index = ti.sName.rfindIdx("::"); |
174 | if( index != -1 ) | 174 | if( index != -1 ) |
175 | { | 175 | { |
176 | FString tmp = sSuiteName; | 176 | String tmp = sSuiteName; |
177 | tmp += ti.sName.getStr()+index; | 177 | tmp += ti.sName.getStr()+index; |
178 | ti.sName = tmp; | 178 | ti.sName = tmp; |
179 | } | 179 | } |
@@ -183,7 +183,7 @@ void Bu::UnitSuite::add( Test fTest, const Bu::FString &sName, Expect e ) | |||
183 | iNameWidth = ti.sName.getSize(); | 183 | iNameWidth = ti.sName.getSize(); |
184 | } | 184 | } |
185 | 185 | ||
186 | void Bu::UnitSuite::setName( const FString &sName ) | 186 | void Bu::UnitSuite::setName( const String &sName ) |
187 | { | 187 | { |
188 | sSuiteName = sName; | 188 | sSuiteName = sName; |
189 | } | 189 | } |