Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
s/cmp_ok/cmp-ok/g
  • Loading branch information
lizmat committed May 19, 2015
1 parent d36a7d8 commit 4005f4d
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion S01-perl-5-integration/roundtrip.t
Expand Up @@ -33,7 +33,7 @@ my $tohash_p5 = EVAL('sub { return {map {$_ => 1} @_ } }', :lang<perl5>);
my %hash = (foo => 'bar', hate => 'software');
{
my $foo = $tohash_p5.(keys %hash);
cmp_ok($foo, &infix:<cmp>, %hash);
cmp-ok($foo, &infix:<cmp>, %hash);
is-deeply([$foo.keys].sort, [%hash.keys].sort);
}

Expand Down
2 changes: 1 addition & 1 deletion S02-types/catch_type_cast_mismatch.t
Expand Up @@ -15,7 +15,7 @@ plan 11;
my $ref = { val => 42 };
isa-ok($ref, Hash);
nok $ref ~~ Positional, "It's not a positional";
cmp_ok $ref, '===', $ref[0], 'So [0] returns itself';
cmp-ok $ref, '===', $ref[0], 'So [0] returns itself';

{
$ref = [ 42 ];
Expand Down
4 changes: 2 additions & 2 deletions S02-types/pair.t
Expand Up @@ -339,9 +339,9 @@ Note, "non-chaining binary" was later renamed to "structural infix".
# RT #123215
#?rakudo.jvm todo 'RT #123215'
{
cmp_ok (:a(2) :b(3) :c(4)), "eqv", ( a => 2, b => 3, c => 4 ),
cmp-ok (:a(2) :b(3) :c(4)), "eqv", ( a => 2, b => 3, c => 4 ),
"chained colonpairs in parens build a list of pairs";
cmp_ok {:a(2) :b(3) :c(4)}<a b c>, "eqv", ( 2, 3, 4 ),
cmp-ok {:a(2) :b(3) :c(4)}<a b c>, "eqv", ( 2, 3, 4 ),
"chained colonpairs in curlies construct hashes with more than one element";
}

Expand Down
4 changes: 2 additions & 2 deletions S02-types/parcel.t
Expand Up @@ -81,10 +81,10 @@ is $(;).elems, 0, '$(;) parses, and is empty';
} #13

{
cmp_ok <a b c>, '===', <a b c>, 'a b c === a b c';
cmp-ok <a b c>, '===', <a b c>, 'a b c === a b c';
ok (my $x1=42,1) !=== (42,1), '$x1 = 42,1 !==== 42,1'; # !=== not an op
ok (my $x2=42,1) !=== (my $y=42,1), '$x2 = 42,1 !==== $y = 42,1';
cmp_ok (my $x3=42,1), '===', (my $y2:=$x3,1), '$x3=42,1 ==== $y2 := $x3,1';
cmp-ok (my $x3=42,1), '===', (my $y2:=$x3,1), '$x3=42,1 ==== $y2 := $x3,1';
} #4

{
Expand Down
8 changes: 4 additions & 4 deletions S10-packages/scope.t
Expand Up @@ -37,20 +37,20 @@ is($?PACKAGE, "Main", 'The Main $?PACKAGE was not broken by any declarations');

# block level
is(Test1::ns, "Test1", "block-level package declarations");
cmp_ok(Test1::pkg, &infix:<===>, ::Test1::, 'block-level $?PACKAGE var');
cmp-ok(Test1::pkg, &infix:<===>, ::Test1::, 'block-level $?PACKAGE var');
dies_ok { EVAL 'test1_export' }, "export was not imported implicitly";

# declared packages
is(Test2::ns, "Test2", "declared package");
cmp_ok(Test2::pkg, &infix:<===>, ::Test2::, 'declared package $?PACKAGE');
cmp-ok(Test2::pkg, &infix:<===>, ::Test2::, 'declared package $?PACKAGE');

# string EVAL'ed packages
is(Test3::pkg, ::Test3::, 'EVAL\'ed package $?PACKAGE');
cmp_ok(Test3::pkg, &infix:<===>, ::Test3::, 'EVAL\'ed package type object');
cmp-ok(Test3::pkg, &infix:<===>, ::Test3::, 'EVAL\'ed package type object');

# this one came from t/packages/Test.pm
is(t::spec::packages::PackageTest::ns, "t::packages::PackageTest", "loaded package");
cmp_ok(t::spec::packages::PackageTest::pkg, &infix:<===>, ::t::packages::PackageTest::, 'loaded package $?PACKAGE object');
cmp-ok(t::spec::packages::PackageTest::pkg, &infix:<===>, ::t::packages::PackageTest::, 'loaded package $?PACKAGE object');
my $x;
lives_ok { $x = test_export() }, "export was imported successfully";
is($x, "party island", "exported OK");
Expand Down
4 changes: 2 additions & 2 deletions S17-procasync/basic.t
Expand Up @@ -10,9 +10,9 @@ my $pc = $*DISTRO.is-win
isa-ok $pc, Proc::Async;

my $so = $pc.stdout;
cmp_ok $so, '~~', Supply;
cmp-ok $so, '~~', Supply;
my $se = $pc.stderr;
cmp_ok $se, '~~', Supply;
cmp-ok $se, '~~', Supply;

my $stdout = "";
my $stderr = "";
Expand Down
2 changes: 1 addition & 1 deletion S17-procasync/kill.t
Expand Up @@ -22,7 +22,7 @@ say 'Done';
isa-ok $pc, Proc::Async;

my $so = $pc.stdout;
cmp_ok $so, '~~', Supply;
cmp-ok $so, '~~', Supply;

my $stdout = "";;
$so.act: { $stdout ~= $_ };
Expand Down
4 changes: 2 additions & 2 deletions S17-procasync/print.t
Expand Up @@ -21,9 +21,9 @@ my $pc = Proc::Async.new( $*EXECUTABLE, $program, :w );
isa-ok $pc, Proc::Async;

my $so = $pc.stdout;
cmp_ok $so, '~~', Supply;
cmp-ok $so, '~~', Supply;
my $se = $pc.stderr;
cmp_ok $se, '~~', Supply;
cmp-ok $se, '~~', Supply;

my $stdout = "";;
my $stderr = "";;
Expand Down
12 changes: 6 additions & 6 deletions S24-testing/1-basic.t
Expand Up @@ -98,14 +98,14 @@ unlike("HelloWorld", rx:P5/\s/, :desc('... testing unlike()'));
unlike("Hello World", rx:P5/\s/, todo => 1, desc => '... testing unlike()');
unlike("Hello World", rx:P5/\s/, :desc('... testing unlike()'), :todo(1));

## cmp_ok
## cmp-ok

cmp_ok('test', sub ($a, $b) { ?($a gt $b) }, 'me', '... testing gt on two strings');
cmp_ok('test', sub ($a, $b) { ?($a gt $b) }, 'me', desc => '... testing gt on two strings');
cmp_ok('test', sub ($a, $b) { ?($a gt $b) }, 'me', :desc('... testing gt on two strings'));
cmp-ok('test', sub ($a, $b) { ?($a gt $b) }, 'me', '... testing gt on two strings');
cmp-ok('test', sub ($a, $b) { ?($a gt $b) }, 'me', desc => '... testing gt on two strings');
cmp-ok('test', sub ($a, $b) { ?($a gt $b) }, 'me', :desc('... testing gt on two strings'));

cmp_ok('test', sub ($a, $b) { ?($a gt $b) }, 'you', :todo(1), desc => '... testing gt on two strings');
cmp_ok('test', sub ($a, $b) { ?($a gt $b) }, 'you', :desc('... testing gt on two strings'), todo => 1);
cmp-ok('test', sub ($a, $b) { ?($a gt $b) }, 'you', :todo(1), desc => '... testing gt on two strings');
cmp-ok('test', sub ($a, $b) { ?($a gt $b) }, 'you', :desc('... testing gt on two strings'), todo => 1);

## use-ok

Expand Down
2 changes: 1 addition & 1 deletion S24-testing/line-numbers.t
Expand Up @@ -18,7 +18,7 @@ sub execute-test ( :$function, :$line ) {
}

#?DOES 1
execute-test(:function("cmp_ok"), :line(9));
execute-test(:function("cmp-ok"), :line(9));

#?DOES 1
execute-test(:function("dies_ok"), :line(9));
Expand Down
Expand Up @@ -6,4 +6,4 @@ plan 1;
## the following code should stay at line number 9
## if you move it to another line, please adjust
## the line number in S24-testing/line-numbers.t
cmp_ok 'foo', 'eq', 'bar';
cmp-ok 'foo', 'eq', 'bar';

0 comments on commit 4005f4d

Please sign in to comment.