From 58e809f741c3dc8528c7dc754cfc9fa65517a9ca Mon Sep 17 00:00:00 2001
From: "SND\\kernelnet_cp"
<SND\kernelnet_cp@9b283d60-5439-405e-af05-b73fd8c4d996>
Date: Mon, 3 Jun 2013 12:51:49 +0000
Subject: [PATCH] [0.3.x] updated : tests
git-svn-id: https://pykd.svn.codeplex.com/svn@83935 9b283d60-5439-405e-af05-b73fd8c4d996
---
pykd/pymod.cpp | 4 ++--
test/scripts/moduletest.py | 8 ++++----
test/scripts/typedvar.py | 2 +-
test/scripts/typeinfo.py | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pykd/pymod.cpp b/pykd/pymod.cpp
index 8b0fcd2..cfb0171 100644
--- a/pykd/pymod.cpp
+++ b/pykd/pymod.cpp
@@ -482,8 +482,8 @@ BOOST_PYTHON_MODULE( pykd )
"Return field of structure as an object attribute" )
//.def( "dataKind", &kdlib::TypedVar::getDataKind,
// "Retrieves the variable classification of a data: DataIsXxx")
- // .def("deref", &kdlib::TypedVar::deref,
- // "Return value by pointer" )
+ .def("deref", &kdlib::TypedVar::deref,
+ "Return value by pointer" )
.def("type", &kdlib::TypedVar::getType,
"Return typeInfo instance" )
.def("__getattr__", TypedVarAdapter::getField,
diff --git a/test/scripts/moduletest.py b/test/scripts/moduletest.py
index 2882885..c556ecb 100644
--- a/test/scripts/moduletest.py
+++ b/test/scripts/moduletest.py
@@ -94,11 +94,11 @@ class ModuleTest( unittest.TestCase ):
self.assertNotEqual( 0, len(lst) )
lst = target.module.enumSymbols("hello*Str")
self.assertEqual( 2, len(lst) )
- lst = target.module.enumSymbols( "g_const*Value")
- self.assertEqual( 2, len(lst) )
- lst = target.module.enumSymbols( "*FuncWithName?")
+ lst = target.module.enumSymbols( "*Const")
self.assertEqual( 3, len(lst) )
- lst = target.module.enumSymbols( "*virtFunc*")
+ lst = target.module.enumSymbols( "*cal?Func")
+ self.assertEqual( 2, len(lst) )
+ lst = target.module.enumSymbols( "*virtMethod*")
self.assertNotEqual( 0, len(lst) )
lst = target.module.enumSymbols( "classChild" )
self.assertEqual( 0, len(lst) )
diff --git a/test/scripts/typedvar.py b/test/scripts/typedvar.py
index 49d2f85..3cbae59 100644
--- a/test/scripts/typedvar.py
+++ b/test/scripts/typedvar.py
@@ -33,7 +33,7 @@ class TypedVarTest( unittest.TestCase ):
def testPtrTo(self):
tvBaseType = pykd.typedVar( pykd.typeInfo("UInt8B").ptrTo(), target.module.offset("pbigValue") )
- self.assertEqual( target.module.typedVar( "ulonglongVar" ), tvBaseType.deref() )
+ self.assertEqual( target.module.typedVar( "bigValue" ), tvBaseType.deref() )
tvDiaStruct = pykd.typedVar( target.module.type("structTest").ptrTo(), target.module.offset("g_structTestPtr") )
self.assertEqual( 500, tvDiaStruct.deref().m_field1 )
diff --git a/test/scripts/typeinfo.py b/test/scripts/typeinfo.py
index 00b1045..58c533f 100644
--- a/test/scripts/typeinfo.py
+++ b/test/scripts/typeinfo.py
@@ -139,7 +139,7 @@ class TypeInfoTest( unittest.TestCase ):
self.assertEqual( "enumType", ti.m_enumField.name() )
def testPtr(self):
- self.assertEqual( "ULongLong*", target.module.type( "pbigValue" ).name() )
+ self.assertEqual( "UInt8B*", target.module.type( "pbigValue" ).name() )
self.assertEqual( "testStruct*", target.module.type( "testStruct*" ).name() )
self.assertEqual( "UShort*", target.module.type( "UShort*" ).name() )
self.assertEqual( "Void*", target.module.type( "voidPtr" ).name() )
@@ -219,7 +219,7 @@ class TypeInfoTest( unittest.TestCase ):
def testUdtSubscribe(self):
ti = pykd.typeInfo( "g_virtChild" )
- self.assertEqual( 5, len(ti) )
+ self.assertEqual( 6, len(ti) )
for field in ti:
str( field )