Skip to content

Commit 4de1f6d

Browse files
author
roman_yakovenko
committed
fix testers
1 parent b9e9219 commit 4de1f6d

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

unittests/data/type_traits.hpp

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -187,17 +187,18 @@ namespace yes{
187187
typedef detail::dd_t dd_t;
188188
typedef detail::f_t f_t;
189189
typedef detail::g_t g_t;
190+
191+
typedef detail::const_container const_container_t;
192+
typedef detail::const_item const_item_t;
193+
190194
}
191195
namespace no{
192196
typedef std::string string_type;
193197
typedef detail::y_type y_type;
194198
typedef std::vector< int > vector_of_int_type;
195199
typedef std::set< std::string > string_set_type;
196200
typedef std::multimap< std::string, std::string > s2s_multimap_type;
197-
typedef detail::vertex vertex_type;
198-
typedef detail::const_container const_container_t;
199-
typedef detail::const_item const_item_t;
200-
201+
typedef detail::vertex vertex_type;
201202
}
202203
}
203204

@@ -544,11 +545,13 @@ namespace yes{
544545
struct x{
545546
x(){}
546547
};
547-
typedef details::const_item const_item;
548-
typedef details::const_container const_container;
549548
}
550549

551550
namespace no{
551+
552+
typedef details::const_item const_item;
553+
typedef details::const_container const_container;
554+
552555
class y{
553556
private:
554557
y(){}

unittests/find_container_traits_tester.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def test_find_traits( self ):
6767
def test_multimap( self ):
6868
m = self.global_ns.class_( lambda decl: decl.name.startswith( 'multimap' ) )
6969
traits = declarations.find_container_traits( m )
70-
self.failUness( m.partial_name == 'multimap< int, int >' )
70+
self.failUnless( m.partial_name == 'multimap< int, int >' )
7171

7272
def test_recursive_partial_name( self ):
7373
f1 = self.global_ns.free_fun( 'f1' )

unittests/type_traits_tester.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,8 @@ def test( self ):
247247
code = "struct const_item{ const int values[10]; };"
248248
global_ns = parser.parse_string( code , config )[0]
249249
ci = global_ns.class_( 'const_item' )
250-
self.failUnless( len( ci.declarations ) == 5 )
251-
#constructor, copy constructor, destructor, operator=, variable
250+
self.failUnless( len( ci.declarations ) == 3 )
251+
#copy constructor, destructor, variable
252252

253253
def create_suite():
254254
suite = unittest.TestSuite()

0 commit comments

Comments
 (0)