Skip to content

Commit 6251d30

Browse files
Robert Lynchfacebook-github-bot
Robert Lynch
authored and
facebook-github-bot
committed
toBeSame -> toEqual
Summary: Move all use-cases of toBeSame to toEqual. Will cleanup toEqual in a later diff bypass-lint allow_many_files drop-conflicts ignore-signed-source Reviewed By: shashkambh Differential Revision: D16204278 fbshipit-source-id: 94fe93adb34e4648b2bdd07dda86a992c40e1efb
1 parent ecbd3d2 commit 6251d30

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

‎tests/ClusterTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ final class ClusterTest extends \Facebook\HackTest\HackTest {
1818
public function testReplaceTrailing(): void {
1919
$diff = StringDiff::characters('abc', 'ade')->getDiff()
2020
|> cluster($$);
21-
expect(C\count($diff))->toBeSame(3);
21+
expect(C\count($diff))->toEqual(3);
2222
expect($diff[0])->toBeInstanceOf(DiffKeepOp::class);
2323
expect($diff[1])->toBeInstanceOf(DiffDeleteOp::class);
2424
expect($diff[2])->toBeInstanceOf(DiffInsertOp::class);
2525

26-
expect(Vec\map($diff, $op ==> $op->getContent()))->toBeSame(
26+
expect(Vec\map($diff, $op ==> $op->getContent()))->toEqual(
2727
vec[vec['a'], vec['b', 'c'], vec['d', 'e']],
2828
);
2929
}

‎tests/RawDiffTest.php

+20-20
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,22 @@ final class RawDiffTest extends \Facebook\HackTest\HackTest {
2323
public function testReplaceLastItem(): void {
2424
$diff = (new StringDiff(vec['a', 'b', 'b'], vec['a', 'b', 'c']))->getDiff();
2525

26-
expect(C\count($diff))->toBeSame(4);
26+
expect(C\count($diff))->toEqual(4);
2727

2828
expect($diff[0])->toBeInstanceOf(DiffKeepOp::class);
2929
expect($diff[1])->toBeInstanceOf(DiffKeepOp::class);
3030
expect($diff[2])->toBeInstanceOf(DiffDeleteOp::class);
3131
expect($diff[3])->toBeInstanceOf(DiffInsertOp::class);
3232

33-
expect(Vec\map($diff, $op ==> $op->getContent()))->toBeSame(
33+
expect(Vec\map($diff, $op ==> $op->getContent()))->toEqual(
3434
vec['a', 'b', 'b', 'c'],
3535
);
3636
}
3737

3838
public function testTotalReplacement(): void {
3939
$diff = (new StringDiff(vec['a', 'b', 'c'], vec['d', 'e', 'f']))->getDiff();
4040

41-
expect(C\count($diff))->toBeSame(6);
41+
expect(C\count($diff))->toEqual(6);
4242

4343
expect($diff[0])->toBeInstanceOf(DiffDeleteOp::class);
4444
expect($diff[1])->toBeInstanceOf(DiffDeleteOp::class);
@@ -47,7 +47,7 @@ public function testTotalReplacement(): void {
4747
expect($diff[4])->toBeInstanceOf(DiffInsertOp::class);
4848
expect($diff[5])->toBeInstanceOf(DiffInsertOp::class);
4949

50-
expect(Vec\map($diff, $op ==> $op->getContent()))->toBeSame(
50+
expect(Vec\map($diff, $op ==> $op->getContent()))->toEqual(
5151
vec['a', 'b', 'c', 'd', 'e', 'f'],
5252
);
5353
}
@@ -57,7 +57,7 @@ public function testAppend(): void {
5757
new StringDiff(vec['a', 'b', 'c'], vec['a', 'b', 'c', 'd', 'e', 'f'])
5858
)->getDiff();
5959

60-
expect(C\count($diff))->toBeSame(6);
60+
expect(C\count($diff))->toEqual(6);
6161

6262
expect($diff[0])->toBeInstanceOf(DiffKeepOp::class);
6363
expect($diff[1])->toBeInstanceOf(DiffKeepOp::class);
@@ -66,7 +66,7 @@ public function testAppend(): void {
6666
expect($diff[4])->toBeInstanceOf(DiffInsertOp::class);
6767
expect($diff[5])->toBeInstanceOf(DiffInsertOp::class);
6868

69-
expect(Vec\map($diff, $op ==> $op->getContent()))->toBeSame(
69+
expect(Vec\map($diff, $op ==> $op->getContent()))->toEqual(
7070
vec['a', 'b', 'c', 'd', 'e', 'f'],
7171
);
7272
}
@@ -76,91 +76,91 @@ public function testTruncate(): void {
7676
new StringDiff(vec['a', 'b', 'c'], vec['a', 'b'])
7777
)->getDiff();
7878

79-
expect(C\count($diff))->toBeSame(3);
79+
expect(C\count($diff))->toEqual(3);
8080

8181
expect($diff[0])->toBeInstanceOf(DiffKeepOp::class);
8282
expect($diff[1])->toBeInstanceOf(DiffKeepOp::class);
8383
expect($diff[2])->toBeInstanceOf(DiffDeleteOp::class);
8484

85-
expect(Vec\map($diff, $op ==> $op->getContent()))->toBeSame(
85+
expect(Vec\map($diff, $op ==> $op->getContent()))->toEqual(
8686
vec['a', 'b', 'c'],
8787
);
8888
}
8989

9090
public function testPrepend(): void {
9191
$diff = (new StringDiff(vec['b', 'c'], vec['a', 'b', 'c']))->getDiff();
92-
expect(C\count($diff))->toBeSame(3);
92+
expect(C\count($diff))->toEqual(3);
9393

9494
expect($diff[0])->toBeInstanceOf(DiffInsertOp::class);
9595
expect($diff[1])->toBeInstanceOf(DiffKeepOp::class);
9696
expect($diff[2])->toBeInstanceOf(DiffKeepOp::class);
9797

98-
expect(Vec\map($diff, $op ==> $op->getContent()))->toBeSame(
98+
expect(Vec\map($diff, $op ==> $op->getContent()))->toEqual(
9999
vec['a', 'b', 'c'],
100100
);
101101
}
102102

103103
public function testChomp(): void {
104104
$diff = (new StringDiff(vec['a', 'b', 'c'], vec['b', 'c']))->getDiff();
105-
expect(C\count($diff))->toBeSame(3);
105+
expect(C\count($diff))->toEqual(3);
106106

107107
expect($diff[0])->toBeInstanceOf(DiffDeleteOp::class);
108108
expect($diff[1])->toBeInstanceOf(DiffKeepOp::class);
109109
expect($diff[2])->toBeInstanceOf(DiffKeepOp::class);
110110

111-
expect(Vec\map($diff, $op ==> $op->getContent()))->toBeSame(
111+
expect(Vec\map($diff, $op ==> $op->getContent()))->toEqual(
112112
vec['a', 'b', 'c'],
113113
);
114114
}
115115

116116
public function testInsertMid(): void {
117117
$diff = (new StringDiff(vec['a', 'c'], vec['a', 'b', 'c']))->getDiff();
118-
expect(C\count($diff))->toBeSame(3);
118+
expect(C\count($diff))->toEqual(3);
119119

120120
expect($diff[0])->toBeInstanceOf(DiffKeepOp::class);
121121
expect($diff[1])->toBeInstanceOf(DiffInsertOp::class);
122122
expect($diff[2])->toBeInstanceOf(DiffKeepOp::class);
123123

124-
expect(Vec\map($diff, $op ==> $op->getContent()))->toBeSame(
124+
expect(Vec\map($diff, $op ==> $op->getContent()))->toEqual(
125125
vec['a', 'b', 'c'],
126126
);
127127
}
128128

129129
public function testDeleteMid(): void {
130130
$diff = (new StringDiff(vec['a', 'b', 'c'], vec['a', 'c']))->getDiff();
131-
expect(C\count($diff))->toBeSame(3);
131+
expect(C\count($diff))->toEqual(3);
132132

133133
expect($diff[0])->toBeInstanceOf(DiffKeepOp::class);
134134
expect($diff[1])->toBeInstanceOf(DiffDeleteOp::class);
135135
expect($diff[2])->toBeInstanceOf(DiffKeepOp::class);
136136

137-
expect(Vec\map($diff, $op ==> $op->getContent()))->toBeSame(
137+
expect(Vec\map($diff, $op ==> $op->getContent()))->toEqual(
138138
vec['a', 'b', 'c'],
139139
);
140140
}
141141

142142
public function testInsertFromEmpty(): void {
143143
$diff = (new StringDiff(vec[], vec['a', 'b', 'c']))->getDiff();
144-
expect(C\count($diff))->toBeSame(3);
144+
expect(C\count($diff))->toEqual(3);
145145

146146
expect($diff[0])->toBeInstanceOf(DiffInsertOp::class);
147147
expect($diff[1])->toBeInstanceOf(DiffInsertOp::class);
148148
expect($diff[2])->toBeInstanceOf(DiffInsertOp::class);
149149

150-
expect(Vec\map($diff, $op ==> $op->getContent()))->toBeSame(
150+
expect(Vec\map($diff, $op ==> $op->getContent()))->toEqual(
151151
vec['a', 'b', 'c'],
152152
);
153153
}
154154

155155
public function testDeleteAll(): void {
156156
$diff = (new StringDiff(vec['a', 'b', 'c'], vec[]))->getDiff();
157-
expect(C\count($diff))->toBeSame(3);
157+
expect(C\count($diff))->toEqual(3);
158158

159159
expect($diff[0])->toBeInstanceOf(DiffDeleteOp::class);
160160
expect($diff[1])->toBeInstanceOf(DiffDeleteOp::class);
161161
expect($diff[2])->toBeInstanceOf(DiffDeleteOp::class);
162162

163-
expect(Vec\map($diff, $op ==> $op->getContent()))->toBeSame(
163+
expect(Vec\map($diff, $op ==> $op->getContent()))->toEqual(
164164
vec['a', 'b', 'c'],
165165
);
166166
}

‎tests/StringDiffTest.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -21,29 +21,29 @@
2121
final class StringDiffTest extends \Facebook\HackTest\HackTest {
2222
public function testDiffLines(): void {
2323
$diff = StringDiff::lines("a\nb\nb\n", "a\nb\nc\n")->getDiff();
24-
expect(C\count($diff))->toBeSame(5);
24+
expect(C\count($diff))->toEqual(5);
2525

2626
expect($diff[0])->toBeInstanceOf(DiffKeepOp::class);
2727
expect($diff[1])->toBeInstanceOf(DiffKeepOp::class);
2828
expect($diff[2])->toBeInstanceOf(DiffDeleteOp::class);
2929
expect($diff[3])->toBeInstanceOf(DiffInsertOp::class);
3030
expect($diff[4])->toBeInstanceOf(DiffKeepOp::class);
3131

32-
expect(Vec\map($diff, $op ==> $op->getContent()))->toBeSame(
32+
expect(Vec\map($diff, $op ==> $op->getContent()))->toEqual(
3333
vec['a', 'b', 'b', 'c', ''],
3434
);
3535
}
3636

3737
public function testDiffCharacters(): void {
3838
$diff = StringDiff::characters('abb', 'abc')->getDiff();
39-
expect(C\count($diff))->toBeSame(4);
39+
expect(C\count($diff))->toEqual(4);
4040

4141
expect($diff[0])->toBeInstanceOf(DiffKeepOp::class);
4242
expect($diff[1])->toBeInstanceOf(DiffKeepOp::class);
4343
expect($diff[2])->toBeInstanceOf(DiffDeleteOp::class);
4444
expect($diff[3])->toBeInstanceOf(DiffInsertOp::class);
4545

46-
expect(Vec\map($diff, $op ==> $op->getContent()))->toBeSame(
46+
expect(Vec\map($diff, $op ==> $op->getContent()))->toEqual(
4747
vec['a', 'b', 'b', 'c'],
4848
);
4949
}
@@ -66,7 +66,7 @@ public function testUnifiedDiff(string $name): void {
6666
$b = \file_get_contents($base.'.b');
6767
$diff = StringDiff::lines($a, $b)->getUnifiedDiff();
6868

69-
expect($diff)->toBeSame(
69+
expect($diff)->toEqual(
7070
\file_get_contents($base.'.udiff.expect'),
7171
'Did not match expected contents '.
7272
'(from diff -u %s.a %s.b | tail -n +3 > %s.udiff.expect)',
@@ -97,7 +97,7 @@ public function testCLIColoredDiff(string $name): void {
9797
));
9898
}
9999

100-
expect($diff)->toBeSame(
100+
expect($diff)->toEqual(
101101
\file_get_contents($base.'.clidiff.expect'),
102102
'Did not match expected contents (- %s.clidiff.expect, + %s.clidiff.out)',
103103
$base,

0 commit comments

Comments
 (0)