Skip to content

Commit 76f0047

Browse files
AndLLAwsfulton
authored andcommitted
enable tests working after master merge
1 parent 899c9b8 commit 76f0047

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

Examples/test-suite/r/li_boost_shared_ptr_runme.R

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ testSuite <- function() {
8080
testSuite_verifyCount(2, kret)
8181
}
8282

83-
if (FALSE) {
83+
{
8484
# pass by shared_ptr pointer reference
8585
k = Klass("me oh my")
8686
kret = smartpointerpointerreftest(k)
@@ -90,7 +90,7 @@ testSuite <- function() {
9090
testSuite_verifyCount(2, kret)
9191
}
9292

93-
if (FALSE) {
93+
{
9494
# pass by shared_ptr pointer reference
9595
k = Klass("me oh my");
9696
kret = smartpointerpointerreftest(k);
@@ -288,7 +288,7 @@ testSuite <- function() {
288288
k = KlassDerived("me oh my");
289289
kret = smartpointerpointerreftest(k);
290290
val = kret$getValue();
291-
unittest("me oh my derivedsmartptrpointerreftest-Derived", val);
291+
unittest("me oh my derivedsmartptrpointerreftest-Derived", val); # fails "me oh my derivedsmartptrpointerreftest-Derived != me oh my smartpointerpointerreftest-Derived"
292292
testSuite_verifyCount(2, k); # includes two extra references for upcasts in the proxy classes
293293
testSuite_verifyCount(2, kret);
294294
}
@@ -300,9 +300,10 @@ testSuite <- function() {
300300
val = kret$getValue()
301301
unittest("me oh my valuetest", val) # note slicing
302302
testSuite_verifyCount(2, k)
303-
# testSuite_verifyCount(2, kret) --> use count not defined for _p_Space__Klass
303+
testSuite_verifyCount(1, kret)
304304

305-
# testSuite_verifyCount(1, k) # this is the python expected reference counting
305+
# --> these are the python expected counting
306+
# testSuite_verifyCount(1, k)
306307
# testSuite_verifyCount(1, kret)
307308
}
308309

@@ -323,9 +324,10 @@ testSuite <- function() {
323324
val = kret$getValue();
324325
unittest("me oh my reftest-Derived", val);
325326
testSuite_verifyCount(2, k);
326-
#testSuite_verifyCount(2, kret); --> use_count not defined for _p_Space__KlassDerived
327+
testSuite_verifyCount(1, kret);
327328

328-
#testSuite_verifyCount(1, k); # --> this is the python expected counting
329+
# --> these are the python expected counting
330+
#testSuite_verifyCount(1, k);
329331
#testSuite_verifyCount(1, kret);
330332
}
331333

@@ -464,11 +466,11 @@ testSuite <- function() {
464466
kmember = MemberVariables_MemberValue_get(m); # m$getMemberValue();
465467
val = kmember$getValue();
466468
unittest("plain member value", val);
467-
# testSuite_verifyCount(1, kmember); -> use_count undefined for _p_Space__Klass
469+
testSuite_verifyCount(1, kmember);
468470
testSuite_verifyCount(1, k);
469471

470472
delete_MemberVariables(m); # m.delete();
471-
# testSuite_verifyCount(1, kmember); -> use_count undefined for _p_Space__Klass
473+
testSuite_verifyCount(1, kmember);
472474
testSuite_verifyCount(1, k);
473475
}
474476

@@ -484,11 +486,11 @@ testSuite <- function() {
484486
kmember = MemberVariables_MemberPointer_get(self = m); # m$getMemberPointer();
485487
val = kmember$getValue();
486488
unittest("plain member pointer", val);
487-
# testSuite_verifyCount(1, kmember); -> use_count undefined for _p_Space__Klass
489+
testSuite_verifyCount(1, kmember);
488490
testSuite_verifyCount(1, k);
489491

490492
delete_MemberVariables(m); # m.delete();
491-
# testSuite_verifyCount(1, kmember); -> use_count undefined for _p_Space__Klass
493+
testSuite_verifyCount(1, kmember);
492494
testSuite_verifyCount(1, k);
493495
}
494496

@@ -504,11 +506,11 @@ testSuite <- function() {
504506
kmember = MemberVariables_MemberReference_get(self = m); #m$getMemberReference();
505507
val = kmember$getValue();
506508
unittest("plain member reference", val);
507-
# testSuite_verifyCount(1, kmember); -> use_count undefined for _p_Space__Klass
509+
testSuite_verifyCount(1, kmember); # -> use_count undefined for _p_Space__Klass
508510
testSuite_verifyCount(1, k);
509511

510512
delete_MemberVariables(m); # m.delete();
511-
# testSuite_verifyCount(1, kmember); -> use_count undefined for _p_Space__Klass
513+
testSuite_verifyCount(1, kmember); #-> use_count undefined for _p_Space__Klass
512514
testSuite_verifyCount(1, k);
513515
}
514516

@@ -525,7 +527,7 @@ testSuite <- function() {
525527
k = MemberVariables_SmartMemberValue_get(self = m); #m$getSmartMemberValue();
526528
if (!is.null(k))
527529
stop("expected null");
528-
#testSuite_verifyCount(0, k);
530+
#testSuite_verifyCount(0, k); # this does not work for nulls
529531

530532
# plain by value
531533
bNotCatched = F

0 commit comments

Comments
 (0)