Correct raw pointer handling test for virtual inheritance

This commit is contained in:
William S Fulton 2022-08-11 18:44:36 +01:00
commit 63632f80fb
12 changed files with 16 additions and 14 deletions

View file

@ -15,7 +15,7 @@ end
# Test raw pointer handling involving virtual inheritance
kini = KlassInheritance("KlassInheritanceInput");
checkCount(1);
s = takeKlassUniquePtr(kini);
s = useKlassRawPtr(kini);
if (!strcmp(s, "KlassInheritanceInput"))
error("Incorrect string: %s", s);
endif

View file

@ -15,7 +15,7 @@ end
# Test raw pointer handling involving virtual inheritance
kini = KlassInheritance("KlassInheritanceInput");
checkCount(1);
s = takeKlassAutoPtr(kini);
s = useKlassRawPtr(kini);
if (!strcmp(s, "KlassInheritanceInput"))
error("Incorrect string: %s", s);
endif

View file

@ -16,7 +16,7 @@ sub checkCount {
{
my $kini = new cpp11_std_unique_ptr::KlassInheritance("KlassInheritanceInput");
checkCount(1);
my $s = cpp11_std_unique_ptr::takeKlassUniquePtr($kini);
my $s = cpp11_std_unique_ptr::useKlassRawPtr($kini);
is($s, "KlassInheritanceInput", "Incorrect string: $s");
undef $kini;
checkCount(0);

View file

@ -16,7 +16,7 @@ sub checkCount {
{
my $kini = new li_std_auto_ptr::KlassInheritance("KlassInheritanceInput");
checkCount(1);
my $s = li_std_auto_ptr::takeKlassAutoPtr($kini);
my $s = li_std_auto_ptr::useKlassRawPtr($kini);
is($s, "KlassInheritanceInput", "Incorrect string: $s");
undef $kini;
checkCount(0);

View file

@ -10,7 +10,7 @@ function checkCount($expected_count) {
# Test raw pointer handling involving virtual inheritance
$kini = new KlassInheritance("KlassInheritanceInput");
checkCount(1);
$s = takeKlassUniquePtr($kini);
$s = useKlassRawPtr($kini);
check::equal($s, "KlassInheritanceInput", "Incorrect string: $s");
$kini = NULL;
checkCount(0);

View file

@ -10,7 +10,7 @@ function checkCount($expected_count) {
# Test raw pointer handling involving virtual inheritance
$kini = new KlassInheritance("KlassInheritanceInput");
checkCount(1);
$s = takeKlassAutoPtr($kini);
$s = useKlassRawPtr($kini);
check::equal($s, "KlassInheritanceInput", "Incorrect string: $s");
$kini = NULL;
checkCount(0);

View file

@ -8,7 +8,7 @@ def checkCount(expected_count):
# Test raw pointer handling involving virtual inheritance
kini = KlassInheritance("KlassInheritanceInput")
checkCount(1)
s = takeKlassUniquePtr(kini)
s = useKlassRawPtr(kini)
if s != "KlassInheritanceInput":
raise RuntimeError("Incorrect string: " + s)
del kini

View file

@ -8,7 +8,7 @@ def checkCount(expected_count):
# Test raw pointer handling involving virtual inheritance
kini = KlassInheritance("KlassInheritanceInput")
checkCount(1)
s = takeKlassAutoPtr(kini)
s = useKlassRawPtr(kini)
if s != "KlassInheritanceInput":
raise RuntimeError("Incorrect string: " + s)
del kini

View file

@ -21,11 +21,12 @@ end
# Test raw pointer handling involving virtual inheritance
kini = Cpp11_std_unique_ptr::KlassInheritance.new("KlassInheritanceInput")
checkCount(1)
s = Cpp11_std_unique_ptr.takeKlassUniquePtr(kini)
s = Cpp11_std_unique_ptr.useKlassRawPtr(kini)
if (s != "KlassInheritanceInput")
raise RuntimeError, "Incorrect string: " + s
end
kini = nil
# kini = nil
Cpp11_std_unique_ptr.takeKlassUniquePtr(kini) # Ensure object is deleted (can't rely on GC)
checkCount(0)

View file

@ -21,11 +21,12 @@ end
# Test raw pointer handling involving virtual inheritance
kini = Li_std_auto_ptr::KlassInheritance.new("KlassInheritanceInput")
checkCount(1)
s = Li_std_auto_ptr.takeKlassAutoPtr(kini)
s = Li_std_auto_ptr.useKlassRawPtr(kini)
if (s != "KlassInheritanceInput")
raise RuntimeError, "Incorrect string: " + s
end
kini = nil
# kini = nil
Li_std_auto_ptr.takeKlassAutoPtr(kini) # Ensure object is deleted (can't rely on GC)
checkCount(0)

View file

@ -47,7 +47,7 @@ checkCount 0
# Test raw pointer handling involving virtual inheritance
KlassInheritance kini "KlassInheritanceInput"
checkCount 1
set s [takeKlassUniquePtr kini]
set s [useKlassRawPtr kini]
kini -delete
checkCount 0

View file

@ -18,7 +18,7 @@ proc checkCount {expected_count} {
# Test raw pointer handling involving virtual inheritance
KlassInheritance kini "KlassInheritanceInput"
checkCount 1
set s [takeKlassAutoPtr kini]
set s [useKlassRawPtr kini]
kini -delete
checkCount 0