[pygccxml-commit] SF.net SVN: pygccxml:[1488] pygccxml_dev/unittests
Brought to you by:
mbaas,
roman_yakovenko
Menu
▾
▴
[pygccxml-commit] SF.net SVN: pygccxml:[1488] pygccxml_dev/unittests
|
From: <rom...@us...> - 2008-12-23 20:43:03
|
Revision: 1488
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1488&view=rev
Author: roman_yakovenko
Date: 2008-12-23 20:43:00 +0000 (Tue, 23 Dec 2008)
Log Message:
-----------
porting tester to MSVC 9.0
Modified Paths:
--------------
pygccxml_dev/unittests/data/remove_template_defaults.hpp
pygccxml_dev/unittests/remove_template_defaults_tester.py
Modified: pygccxml_dev/unittests/data/remove_template_defaults.hpp
===================================================================
--- pygccxml_dev/unittests/data/remove_template_defaults.hpp 2008-12-23 13:27:29 UTC (rev 1487)
+++ pygccxml_dev/unittests/data/remove_template_defaults.hpp 2008-12-23 20:43:00 UTC (rev 1488)
@@ -13,7 +13,7 @@
#else
#include <hash_set>
#include <hash_map>
- #ifdef __GCCXML__
+ #if defined( __GCCXML__ ) && !defined( __PYGCCXML_MSVC9__ )
#define HASH_XXX_NS std
#else
#define HASH_XXX_NS stdext
@@ -31,22 +31,22 @@
template <class T>
struct type {};
-
-namespace vectors{
+
+namespace vectors{
typedef std::vector< int > v_int;
typedef std::vector< std::string > v_string;
typedef std::vector< v_int > v_v_int;
-}
+}
namespace lists{
typedef std::list< int > l_int;
typedef std::list< std::wstring > l_wstring;
}
-namespace deques{
+namespace deques{
typedef std::deque< std::vector< int > > d_v_int;
typedef std::deque< std::list< std::string > > d_l_string;
-}
+}
namespace queues{
typedef std::queue< int > q_int;
@@ -76,7 +76,7 @@
typedef std::map< int, double > m_i2d;
typedef std::map< std::wstring, double > m_wstr2d;
typedef std::map< const std::vector< int >, m_wstr2d > m_v_i2m_wstr2d;
-
+
inline std::map<std::string, int> f2(){}
}
@@ -93,7 +93,7 @@
}
-namespace hash_multisets{
+namespace hash_multisets{
typedef HASH_XXX_NS::hash_multiset< std::vector< int > > mhs_v_int;
typedef HASH_XXX_NS::hash_multiset< std::string > mhs_string;
}
Modified: pygccxml_dev/unittests/remove_template_defaults_tester.py
===================================================================
--- pygccxml_dev/unittests/remove_template_defaults_tester.py 2008-12-23 13:27:29 UTC (rev 1487)
+++ pygccxml_dev/unittests/remove_template_defaults_tester.py 2008-12-23 20:43:00 UTC (rev 1488)
@@ -16,138 +16,139 @@
def __init__(self, *args ):
parser_test_case.parser_test_case_t.__init__( self, *args )
self.header = 'remove_template_defaults.hpp'
-
+
def setUp(self):
if not tester_t.global_ns:
decls = parser.parse( [self.header], self.config )
tester_t.global_ns = declarations.get_global_namespace( decls )
tester_t.global_ns.init_optimizer()
- def test_vector( self ):
- v_int = self.global_ns.typedef( 'v_int' )
- self.failUnless( 'vector< int >'
+ def test_vector( self ):
+ v_int = self.global_ns.typedef( 'v_int' )
+ self.failUnless( 'vector< int >'
== declarations.vector_traits.remove_defaults( v_int ) )
v_string = self.global_ns.typedef( 'v_string' )
self.failUnless( 'vector< std::string >'
== declarations.vector_traits.remove_defaults( v_string ) )
- v_v_int = self.global_ns.typedef( 'v_v_int' )
+ v_v_int = self.global_ns.typedef( 'v_v_int' )
self.failUnless( 'vector< std::vector< int > >'
== declarations.vector_traits.remove_defaults( v_v_int ) )
-
- def test_list( self ):
+
+ def test_list( self ):
l_int = self.global_ns.typedef( 'l_int' )
- self.failUnless( 'list< int >'
+ self.failUnless( 'list< int >'
== declarations.list_traits.remove_defaults( l_int ) )
l_wstring = self.global_ns.typedef( 'l_wstring' )
self.failUnless( 'list< std::wstring >'
== declarations.list_traits.remove_defaults( l_wstring ) )
- def test_deque( self ):
+ def test_deque( self ):
d_v_int = self.global_ns.typedef( 'd_v_int' )
- self.failUnless( 'deque< std::vector< int > >'
+ self.failUnless( 'deque< std::vector< int > >'
== declarations.deque_traits.remove_defaults( d_v_int ) )
d_l_string = self.global_ns.typedef( 'd_l_string' )
self.failUnless( 'deque< std::list< std::string > >'
== declarations.deque_traits.remove_defaults( d_l_string ) )
- def test_queue( self ):
+ def test_queue( self ):
q_int = self.global_ns.typedef( 'q_int' )
- self.failUnless( 'queue< int >'
+ self.failUnless( 'queue< int >'
== declarations.queue_traits.remove_defaults( q_int ) )
q_string = self.global_ns.typedef( 'q_string' )
self.failUnless( 'queue< std::string >'
== declarations.queue_traits.remove_defaults( q_string ) )
- def test_priority_queue( self ):
+ def test_priority_queue( self ):
pq_int = self.global_ns.typedef( 'pq_int' )
- self.failUnless( 'priority_queue< int >'
+ self.failUnless( 'priority_queue< int >'
== declarations.priority_queue_traits.remove_defaults( pq_int ) )
pq_string = self.global_ns.typedef( 'pq_string' )
self.failUnless( 'priority_queue< std::string >'
== declarations.priority_queue_traits.remove_defaults( pq_string ) )
- def test_set( self ):
+ def test_set( self ):
s_v_int = self.global_ns.typedef( 's_v_int' )
- self.failUnless( 'set< std::vector< int > >'
+ self.failUnless( 'set< std::vector< int > >'
== declarations.set_traits.remove_defaults( s_v_int ) )
s_string = self.global_ns.typedef( 's_string' )
self.failUnless( 'set< std::string >'
== declarations.set_traits.remove_defaults( s_string ) )
- def test_multiset( self ):
+ def test_multiset( self ):
ms_v_int = self.global_ns.typedef( 'ms_v_int' )
- self.failUnless( 'multiset< std::vector< int > >'
+ self.failUnless( 'multiset< std::vector< int > >'
== declarations.multiset_traits.remove_defaults( ms_v_int ) )
ms_string = self.global_ns.typedef( 'ms_string' )
self.failUnless( 'multiset< std::string >'
== declarations.multiset_traits.remove_defaults( ms_string ) )
- def test_map( self ):
+ def test_map( self ):
m_i2d = self.global_ns.typedef( 'm_i2d' )
- self.failUnless( 'map< int, double >'
+ self.failUnless( 'map< int, double >'
== declarations.map_traits.remove_defaults( m_i2d ) )
m_wstr2d = self.global_ns.typedef( 'm_wstr2d' )
- self.failUnless( 'map< std::wstring, double >'
+ self.failUnless( 'map< std::wstring, double >'
== declarations.map_traits.remove_defaults( m_wstr2d ) )
- m_v_i2m_wstr2d = self.global_ns.typedef( 'm_v_i2m_wstr2d' )
- self.failUnless( 'map< const std::vector< int >, std::map< std::wstring, double > >'
+ m_v_i2m_wstr2d = self.global_ns.typedef( 'm_v_i2m_wstr2d' )
+ self.failUnless( 'map< const std::vector< int >, std::map< std::wstring, double > >'
== declarations.map_traits.remove_defaults( m_v_i2m_wstr2d ) )
- def test_multimap( self ):
+ def test_multimap( self ):
mm_i2d = self.global_ns.typedef( 'mm_i2d' )
- self.failUnless( 'multimap< int, double >'
+ self.failUnless( 'multimap< int, double >'
== declarations.multimap_traits.remove_defaults( mm_i2d ) )
mm_wstr2d = self.global_ns.typedef( 'mm_wstr2d' )
- self.failUnless( 'multimap< const std::wstring, double >'
+ self.failUnless( 'multimap< const std::wstring, double >'
== declarations.multimap_traits.remove_defaults( mm_wstr2d ) )
- mm_v_i2mm_wstr2d = self.global_ns.typedef( 'mm_v_i2mm_wstr2d' )
- self.failUnless( 'multimap< const std::vector< int >, const std::multimap< const std::wstring, double > >'
+ mm_v_i2mm_wstr2d = self.global_ns.typedef( 'mm_v_i2mm_wstr2d' )
+ self.failUnless( 'multimap< const std::vector< int >, const std::multimap< const std::wstring, double > >'
== declarations.multimap_traits.remove_defaults( mm_v_i2mm_wstr2d ) )
- def test_hash_set( self ):
+ def test_hash_set( self ):
hs_v_int = self.global_ns.typedef( 'hs_v_int' )
- self.failUnless( 'hash_set< std::vector< int > >'
+ self.failUnless( 'hash_set< std::vector< int > >'
== declarations.hash_set_traits.remove_defaults( hs_v_int )
, declarations.hash_set_traits.remove_defaults( hs_v_int ) )
hs_string = self.global_ns.typedef( 'hs_string' )
self.failUnless( 'hash_set< std::string >'
== declarations.hash_set_traits.remove_defaults( hs_string ) )
- def test_hash_multiset( self ):
+ def test_hash_multiset( self ):
mhs_v_int = self.global_ns.typedef( 'mhs_v_int' )
- self.failUnless( 'hash_multiset< std::vector< int > >'
+ self.failUnless( 'hash_multiset< std::vector< int > >'
== declarations.hash_multiset_traits.remove_defaults( mhs_v_int ) )
mhs_string = self.global_ns.typedef( 'mhs_string' )
self.failUnless( 'hash_multiset< std::string >'
== declarations.hash_multiset_traits.remove_defaults( mhs_string ) )
- def test_hash_map( self ):
+ def test_hash_map( self ):
hm_i2d = self.global_ns.typedef( 'hm_i2d' )
- self.failUnless( 'hash_map< int, double >'
+ self.failUnless( 'hash_map< int, double >'
== declarations.hash_map_traits.remove_defaults( hm_i2d ) )
hm_wstr2d = self.global_ns.typedef( 'hm_wstr2d' )
- self.failUnless( 'hash_map< std::wstring, double >'
+ self.failUnless( 'hash_map< std::wstring, double >'
== declarations.hash_map_traits.remove_defaults( hm_wstr2d ) )
- def test_hash_multimap( self ):
+ def test_hash_multimap( self ):
hmm_i2d = self.global_ns.typedef( 'hmm_i2d' )
- self.failUnless( 'hash_multimap< int, double >'
+ self.failUnless( 'hash_multimap< int, double >'
== declarations.hash_multimap_traits.remove_defaults( hmm_i2d ) )
hmm_wstr2d = self.global_ns.typedef( 'hmm_wstr2d' )
- self.failUnless( 'hash_multimap< const std::wstring, double >'
+ self.failUnless( 'hash_multimap< const std::wstring, double >'
== declarations.hash_multimap_traits.remove_defaults( hmm_wstr2d ) )
- hmm_v_i2mm_wstr2d = self.global_ns.typedef( 'hmm_v_i2mm_wstr2d' )
-
- possible_values = (
+ hmm_v_i2mm_wstr2d = self.global_ns.typedef( 'hmm_v_i2mm_wstr2d' )
+
+ possible_values = (
'hash_multimap< const std::vector< int >, const __gnu_cxx::hash_multimap< const std::wstring, double > >'
- , 'hash_multimap< const std::vector< int >, const std::hash_multimap< const std::wstring, double > >' )
-
- self.failUnless( declarations.hash_multimap_traits.remove_defaults( hmm_v_i2mm_wstr2d )
+ , 'hash_multimap< const std::vector< int >, const std::hash_multimap< const std::wstring, double > >'
+ , 'hash_multimap< const std::vector< int >, const stdext::hash_multimap< const std::wstring, double > >' )
+
+ self.failUnless( declarations.hash_multimap_traits.remove_defaults( hmm_v_i2mm_wstr2d )
in possible_values )
def create_suite():
- suite = unittest.TestSuite()
+ suite = unittest.TestSuite()
suite.addTest( unittest.makeSuite(tester_t))
return suite
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
