| 1 | Index: t/07-renamevariable.t |
|---|
| 2 | =================================================================== |
|---|
| 3 | --- t/07-renamevariable.t (revision 14568) |
|---|
| 4 | +++ t/07-renamevariable.t (working copy) |
|---|
| 5 | @@ -11,12 +11,12 @@ |
|---|
| 6 | |
|---|
| 7 | use PPI; |
|---|
| 8 | |
|---|
| 9 | -BEGIN { |
|---|
| 10 | - if ( $PPI::VERSION =~ /_/ ) { |
|---|
| 11 | - plan skip_all => "Need released version of PPI. You have $PPI::VERSION"; |
|---|
| 12 | - exit 0; |
|---|
| 13 | - } |
|---|
| 14 | -} |
|---|
| 15 | +#BEGIN { |
|---|
| 16 | +# if ( $PPI::VERSION =~ /_/ ) { |
|---|
| 17 | +# plan skip_all => "Need released version of PPI. You have $PPI::VERSION"; |
|---|
| 18 | +# exit 0; |
|---|
| 19 | +# } |
|---|
| 20 | +#} |
|---|
| 21 | |
|---|
| 22 | plan tests => 9; |
|---|
| 23 | |
|---|
| 24 | Index: t/04-renamepackage.t |
|---|
| 25 | =================================================================== |
|---|
| 26 | --- t/04-renamepackage.t (revision 14568) |
|---|
| 27 | +++ t/04-renamepackage.t (working copy) |
|---|
| 28 | @@ -10,12 +10,12 @@ |
|---|
| 29 | use Test::Differences; |
|---|
| 30 | use PPI; |
|---|
| 31 | |
|---|
| 32 | -BEGIN { |
|---|
| 33 | - if ( $PPI::VERSION =~ /_/ ) { |
|---|
| 34 | - plan skip_all => "Need released version of PPI. You have $PPI::VERSION"; |
|---|
| 35 | - exit 0; |
|---|
| 36 | - } |
|---|
| 37 | -} |
|---|
| 38 | +#BEGIN { |
|---|
| 39 | +# if ( $PPI::VERSION =~ /_/ ) { |
|---|
| 40 | +# plan skip_all => "Need released version of PPI. You have $PPI::VERSION"; |
|---|
| 41 | +# exit 0; |
|---|
| 42 | +# } |
|---|
| 43 | +#} |
|---|
| 44 | |
|---|
| 45 | plan tests => 5; |
|---|
| 46 | |
|---|
| 47 | Index: t/03-introducetemporaryvariable.t |
|---|
| 48 | =================================================================== |
|---|
| 49 | --- t/03-introducetemporaryvariable.t (revision 14568) |
|---|
| 50 | +++ t/03-introducetemporaryvariable.t (working copy) |
|---|
| 51 | @@ -10,12 +10,12 @@ |
|---|
| 52 | use Test::Differences; |
|---|
| 53 | use PPI; |
|---|
| 54 | |
|---|
| 55 | -BEGIN { |
|---|
| 56 | - if ( $PPI::VERSION =~ /_/ ) { |
|---|
| 57 | - plan skip_all => "Need released version of PPI. You have $PPI::VERSION"; |
|---|
| 58 | - exit 0; |
|---|
| 59 | - } |
|---|
| 60 | -} |
|---|
| 61 | +#BEGIN { |
|---|
| 62 | +# if ( $PPI::VERSION =~ /_/ ) { |
|---|
| 63 | +# plan skip_all => "Need released version of PPI. You have $PPI::VERSION"; |
|---|
| 64 | +# exit 0; |
|---|
| 65 | +# } |
|---|
| 66 | +#} |
|---|
| 67 | |
|---|
| 68 | plan tests => 10; |
|---|
| 69 | |
|---|
| 70 | Index: t/09-outline.t |
|---|
| 71 | =================================================================== |
|---|
| 72 | --- t/09-outline.t (revision 14568) |
|---|
| 73 | +++ t/09-outline.t (working copy) |
|---|
| 74 | @@ -11,12 +11,13 @@ |
|---|
| 75 | use PPI; |
|---|
| 76 | use PPIx::EditorTools::Outline; |
|---|
| 77 | |
|---|
| 78 | -BEGIN { |
|---|
| 79 | - if ( $PPI::VERSION =~ /_/ ) { |
|---|
| 80 | - plan skip_all => "Need released version of PPI. You have $PPI::VERSION"; |
|---|
| 81 | - exit 0; |
|---|
| 82 | - } |
|---|
| 83 | -} |
|---|
| 84 | +#BEGIN { |
|---|
| 85 | +# if ( $PPI::VERSION =~ /_/ ) { |
|---|
| 86 | +# plan skip_all => |
|---|
| 87 | +# "Need released version of PPI. You have $PPI::VERSION"; |
|---|
| 88 | +# exit 0; |
|---|
| 89 | +# } |
|---|
| 90 | +#} |
|---|
| 91 | |
|---|
| 92 | my @cases = ( |
|---|
| 93 | { file => 't/outline/Foo.pm', |
|---|
| 94 | @@ -198,6 +199,42 @@ |
|---|
| 95 | } |
|---|
| 96 | ] |
|---|
| 97 | }, |
|---|
| 98 | + { file => 't/outline/Moofirst.pm', |
|---|
| 99 | + expected => [ |
|---|
| 100 | + { 'attributes' => [ |
|---|
| 101 | + { 'line' => 7, |
|---|
| 102 | + 'name' => 'balance' |
|---|
| 103 | + }, |
|---|
| 104 | + { 'line' => 13, |
|---|
| 105 | + 'name' => 'overdraft' |
|---|
| 106 | + }, |
|---|
| 107 | + { 'line' => 23, |
|---|
| 108 | + 'name' => 'name' |
|---|
| 109 | + }, |
|---|
| 110 | + { 'line' => 25, |
|---|
| 111 | + 'name' => 'account' |
|---|
| 112 | + } |
|---|
| 113 | + ], |
|---|
| 114 | + 'line' => 3, |
|---|
| 115 | + 'methods' => [ |
|---|
| 116 | + { 'line' => 27, |
|---|
| 117 | + 'name' => '_build_overdraft' |
|---|
| 118 | + } |
|---|
| 119 | + ], |
|---|
| 120 | + 'modules' => [ |
|---|
| 121 | + { 'line' => 1, |
|---|
| 122 | + 'name' => 'MooseX::Declare' |
|---|
| 123 | + } |
|---|
| 124 | + ], |
|---|
| 125 | + 'name' => 'Moofirst', |
|---|
| 126 | + 'pragmata' => [ |
|---|
| 127 | + { 'line' => 5, |
|---|
| 128 | + 'name' => 'version' |
|---|
| 129 | + } |
|---|
| 130 | + ] |
|---|
| 131 | + } |
|---|
| 132 | + ] |
|---|
| 133 | + }, |
|---|
| 134 | ); |
|---|
| 135 | |
|---|
| 136 | plan tests => @cases * 1; |
|---|
| 137 | @@ -212,6 +249,6 @@ |
|---|
| 138 | my $outline = PPIx::EditorTools::Outline->new->find( code => $code ); |
|---|
| 139 | |
|---|
| 140 | #diag explain $outline; |
|---|
| 141 | - is_deeply $outline, $c->{expected} or diag explain $outline; |
|---|
| 142 | + is_deeply $outline, $c->{expected}; # or diag explain $outline; # removed for DC |
|---|
| 143 | } |
|---|
| 144 | |
|---|
| 145 | Index: t/10-lexer.t |
|---|
| 146 | =================================================================== |
|---|
| 147 | --- t/10-lexer.t (revision 14568) |
|---|
| 148 | +++ t/10-lexer.t (working copy) |
|---|
| 149 | @@ -1,21 +1,25 @@ |
|---|
| 150 | #!/usr/bin/perl |
|---|
| 151 | |
|---|
| 152 | use strict; |
|---|
| 153 | +use English '-no_match_vars'; |
|---|
| 154 | |
|---|
| 155 | BEGIN { |
|---|
| 156 | - $^W = 1; |
|---|
| 157 | + |
|---|
| 158 | + # $^W = 1; |
|---|
| 159 | + $WARNING = 1; |
|---|
| 160 | } |
|---|
| 161 | |
|---|
| 162 | use Test::More; |
|---|
| 163 | use Test::Differences; |
|---|
| 164 | use PPI; |
|---|
| 165 | +use Data::Dumper; |
|---|
| 166 | |
|---|
| 167 | -BEGIN { |
|---|
| 168 | - if ( $PPI::VERSION =~ /_/ ) { |
|---|
| 169 | - plan skip_all => "Need released version of PPI. You have $PPI::VERSION"; |
|---|
| 170 | - exit 0; |
|---|
| 171 | - } |
|---|
| 172 | -} |
|---|
| 173 | +#BEGIN { |
|---|
| 174 | +# if ( $PPI::VERSION =~ /_/ ) { |
|---|
| 175 | +# plan skip_all => "Need released version of PPI. You have $PPI::VERSION"; |
|---|
| 176 | +# exit 0; |
|---|
| 177 | +# } |
|---|
| 178 | +#} |
|---|
| 179 | |
|---|
| 180 | my @cases = ( |
|---|
| 181 | { code => <<'END_CODE', |
|---|
| 182 | @@ -29,183 +33,139 @@ |
|---|
| 183 | |
|---|
| 184 | END_CODE |
|---|
| 185 | expected => [ |
|---|
| 186 | - [ 'keyword', |
|---|
| 187 | - 1, |
|---|
| 188 | - 1, |
|---|
| 189 | - 3 |
|---|
| 190 | - ], |
|---|
| 191 | - [ 'Whitespace', |
|---|
| 192 | - 1, |
|---|
| 193 | - 4, |
|---|
| 194 | - 1 |
|---|
| 195 | - ], |
|---|
| 196 | - [ 'pragma', |
|---|
| 197 | - 1, |
|---|
| 198 | - 5, |
|---|
| 199 | - 6 |
|---|
| 200 | - ], |
|---|
| 201 | - [ 'Structure', |
|---|
| 202 | - 1, |
|---|
| 203 | - 11, |
|---|
| 204 | - 1 |
|---|
| 205 | - ], |
|---|
| 206 | - [ 'Whitespace', |
|---|
| 207 | - 1, |
|---|
| 208 | - 12, |
|---|
| 209 | - 1 |
|---|
| 210 | - ], |
|---|
| 211 | - [ 'keyword', |
|---|
| 212 | - 1, |
|---|
| 213 | - 13, |
|---|
| 214 | - 3 |
|---|
| 215 | - ], |
|---|
| 216 | - [ 'Whitespace', |
|---|
| 217 | - 1, |
|---|
| 218 | - 16, |
|---|
| 219 | - 1 |
|---|
| 220 | - ], |
|---|
| 221 | - [ 'pragma', |
|---|
| 222 | - 1, |
|---|
| 223 | - 17, |
|---|
| 224 | - 8 |
|---|
| 225 | - ], |
|---|
| 226 | - [ 'Structure', |
|---|
| 227 | - 1, |
|---|
| 228 | - 25, |
|---|
| 229 | - 1 |
|---|
| 230 | - ], |
|---|
| 231 | - [ 'Whitespace', |
|---|
| 232 | - 1, |
|---|
| 233 | - 26, |
|---|
| 234 | - 1 |
|---|
| 235 | - ], |
|---|
| 236 | - [ 'keyword', |
|---|
| 237 | - 2, |
|---|
| 238 | - 1, |
|---|
| 239 | - 3 |
|---|
| 240 | - ], |
|---|
| 241 | - [ 'Whitespace', |
|---|
| 242 | - 2, |
|---|
| 243 | - 4, |
|---|
| 244 | - 1 |
|---|
| 245 | - ], |
|---|
| 246 | - [ 'Word', |
|---|
| 247 | - 2, |
|---|
| 248 | - 5, |
|---|
| 249 | - 3 |
|---|
| 250 | - ], |
|---|
| 251 | - [ 'Structure', |
|---|
| 252 | - 2, |
|---|
| 253 | - 8, |
|---|
| 254 | - 1 |
|---|
| 255 | - ], |
|---|
| 256 | - [ 'Whitespace', |
|---|
| 257 | - 2, |
|---|
| 258 | - 9, |
|---|
| 259 | - 1 |
|---|
| 260 | - ], |
|---|
| 261 | - [ 'Whitespace', |
|---|
| 262 | - 3, |
|---|
| 263 | - 1, |
|---|
| 264 | - 1 |
|---|
| 265 | - ], |
|---|
| 266 | - [ 'keyword', |
|---|
| 267 | - 4, |
|---|
| 268 | - 1, |
|---|
| 269 | - 2 |
|---|
| 270 | - ], |
|---|
| 271 | - [ 'Whitespace', |
|---|
| 272 | - 4, |
|---|
| 273 | - 3, |
|---|
| 274 | - 1 |
|---|
| 275 | - ], |
|---|
| 276 | - [ 'Symbol', |
|---|
| 277 | - 4, |
|---|
| 278 | - 4, |
|---|
| 279 | - 7 |
|---|
| 280 | - ], |
|---|
| 281 | - [ 'Whitespace', |
|---|
| 282 | - 4, |
|---|
| 283 | - 11, |
|---|
| 284 | - 1 |
|---|
| 285 | - ], |
|---|
| 286 | - [ 'Operator', |
|---|
| 287 | - 4, |
|---|
| 288 | - 12, |
|---|
| 289 | - 1 |
|---|
| 290 | - ], |
|---|
| 291 | - [ 'Whitespace', |
|---|
| 292 | - 4, |
|---|
| 293 | - 13, |
|---|
| 294 | - 1 |
|---|
| 295 | - ], |
|---|
| 296 | - [ 'Number', |
|---|
| 297 | - 4, |
|---|
| 298 | - 14, |
|---|
| 299 | - 2 |
|---|
| 300 | - ], |
|---|
| 301 | - [ 'Structure', |
|---|
| 302 | - 4, |
|---|
| 303 | - 16, |
|---|
| 304 | - 1 |
|---|
| 305 | - ], |
|---|
| 306 | - [ 'Whitespace', |
|---|
| 307 | - 4, |
|---|
| 308 | - 17, |
|---|
| 309 | - 1 |
|---|
| 310 | - ], |
|---|
| 311 | - [ 'Whitespace', |
|---|
| 312 | - 5, |
|---|
| 313 | - 1, |
|---|
| 314 | - 1 |
|---|
| 315 | - ], |
|---|
| 316 | - [ 'keyword', |
|---|
| 317 | - 6, |
|---|
| 318 | - 1, |
|---|
| 319 | - 3 |
|---|
| 320 | - ], |
|---|
| 321 | - [ 'Whitespace', |
|---|
| 322 | - 6, |
|---|
| 323 | - 4, |
|---|
| 324 | - 1 |
|---|
| 325 | - ], |
|---|
| 326 | - [ 'Word', |
|---|
| 327 | - 6, |
|---|
| 328 | - 5, |
|---|
| 329 | - 4 |
|---|
| 330 | - ], |
|---|
| 331 | - [ 'Whitespace', |
|---|
| 332 | - 6, |
|---|
| 333 | - 9, |
|---|
| 334 | - 1 |
|---|
| 335 | - ], |
|---|
| 336 | - [ 'Structure', |
|---|
| 337 | - 6, |
|---|
| 338 | - 10, |
|---|
| 339 | - 1 |
|---|
| 340 | - ], |
|---|
| 341 | - [ 'Whitespace', |
|---|
| 342 | - 6, |
|---|
| 343 | - 11, |
|---|
| 344 | - 1 |
|---|
| 345 | - ], |
|---|
| 346 | - [ 'Structure', |
|---|
| 347 | - 7, |
|---|
| 348 | - 1, |
|---|
| 349 | - 1 |
|---|
| 350 | - ], |
|---|
| 351 | - [ 'Whitespace', |
|---|
| 352 | - 7, |
|---|
| 353 | - 2, |
|---|
| 354 | - 1 |
|---|
| 355 | - ], |
|---|
| 356 | - [ 'Whitespace', |
|---|
| 357 | - 8, |
|---|
| 358 | - 1, |
|---|
| 359 | - 1 |
|---|
| 360 | - ], |
|---|
| 361 | + [ 'keyword', 1, 1, 3 ], |
|---|
| 362 | + [ 'Whitespace', 1, 4, 1 ], |
|---|
| 363 | + [ 'pragma', 1, 5, 6 ], |
|---|
| 364 | + [ 'Structure', 1, 11, 1 ], |
|---|
| 365 | + [ 'Whitespace', 1, 12, 1 ], |
|---|
| 366 | + [ 'keyword', 1, 13, 3 ], |
|---|
| 367 | + [ 'Whitespace', 1, 16, 1 ], |
|---|
| 368 | + [ 'pragma', 1, 17, 8 ], |
|---|
| 369 | + [ 'Structure', 1, 25, 1 ], |
|---|
| 370 | + [ 'Whitespace', 1, 26, 1 ], |
|---|
| 371 | + [ 'keyword', 2, 1, 3 ], |
|---|
| 372 | + [ 'Whitespace', 2, 4, 1 ], |
|---|
| 373 | + [ 'Word', 2, 5, 3 ], |
|---|
| 374 | + [ 'Structure', 2, 8, 1 ], |
|---|
| 375 | + [ 'Whitespace', 2, 9, 1 ], |
|---|
| 376 | + [ 'Whitespace', 3, 1, 1 ], |
|---|
| 377 | + [ 'keyword', 4, 1, 2 ], |
|---|
| 378 | + [ 'Whitespace', 4, 3, 1 ], |
|---|
| 379 | + [ 'Symbol', 4, 4, 7 ], |
|---|
| 380 | + [ 'Whitespace', 4, 11, 1 ], |
|---|
| 381 | + [ 'Operator', 4, 12, 1 ], |
|---|
| 382 | + [ 'Whitespace', 4, 13, 1 ], |
|---|
| 383 | + [ 'Number', 4, 14, 2 ], |
|---|
| 384 | + [ 'Structure', 4, 16, 1 ], |
|---|
| 385 | + [ 'Whitespace', 4, 17, 1 ], |
|---|
| 386 | + [ 'Whitespace', 5, 1, 1 ], |
|---|
| 387 | + [ 'keyword', 6, 1, 3 ], |
|---|
| 388 | + [ 'Whitespace', 6, 4, 1 ], |
|---|
| 389 | + [ 'Word', 6, 5, 4 ], |
|---|
| 390 | + [ 'Whitespace', 6, 9, 1 ], |
|---|
| 391 | + [ 'Structure', 6, 10, 1 ], |
|---|
| 392 | + [ 'Whitespace', 6, 11, 1 ], |
|---|
| 393 | + [ 'Structure', 7, 1, 1 ], |
|---|
| 394 | + [ 'Whitespace', 7, 2, 1 ], |
|---|
| 395 | + [ 'Whitespace', 8, 1, 1 ], |
|---|
| 396 | + ], |
|---|
| 397 | + }, |
|---|
| 398 | + { code => <<'END_CODE', |
|---|
| 399 | +sub return func method before after around override augment |
|---|
| 400 | +END_CODE |
|---|
| 401 | + expected => [ |
|---|
| 402 | + [ 'keyword', 1, 1, 3 ], |
|---|
| 403 | + [ 'Whitespace', 1, 4, 1 ], |
|---|
| 404 | + [ 'keyword', 1, 5, 6 ], |
|---|
| 405 | + [ 'Whitespace', 1, 11, 1 ], |
|---|
| 406 | + [ 'Word', 1, 12, 4 ], |
|---|
| 407 | + [ 'Whitespace', 1, 16, 1 ], |
|---|
| 408 | + [ 'Word', 1, 17, 6 ], |
|---|
| 409 | + [ 'Whitespace', 1, 23, 1 ], |
|---|
| 410 | + [ 'Word', 1, 24, 6 ], |
|---|
| 411 | + [ 'Whitespace', 1, 30, 1 ], |
|---|
| 412 | + [ 'Word', 1, 31, 5 ], |
|---|
| 413 | + [ 'Whitespace', 1, 36, 1 ], |
|---|
| 414 | + [ 'Word', 1, 37, 6 ], |
|---|
| 415 | + [ 'Whitespace', 1, 43, 1 ], |
|---|
| 416 | + [ 'Word', 1, 44, 8 ], |
|---|
| 417 | + [ 'Whitespace', 1, 52, 1 ], |
|---|
| 418 | + [ 'Word', 1, 53, 7 ], |
|---|
| 419 | + [ 'Whitespace', 1, 60, 1 ], |
|---|
| 420 | + |
|---|
| 421 | + ], |
|---|
| 422 | + }, |
|---|
| 423 | + { code => <<'END_CODE', |
|---|
| 424 | +undef shift defined bless |
|---|
| 425 | +END_CODE |
|---|
| 426 | + expected => [ |
|---|
| 427 | + [ 'core', 1, 1, 5 ], |
|---|
| 428 | + [ 'Whitespace', 1, 6, 1 ], |
|---|
| 429 | + [ 'core', 1, 7, 5 ], |
|---|
| 430 | + [ 'Whitespace', 1, 12, 1 ], |
|---|
| 431 | + [ 'core', 1, 13, 7 ], |
|---|
| 432 | + [ 'Whitespace', 1, 20, 1 ], |
|---|
| 433 | + [ 'core', 1, 21, 5 ], |
|---|
| 434 | + [ 'Whitespace', 1, 26, 1 ], |
|---|
| 435 | + ], |
|---|
| 436 | + }, |
|---|
| 437 | + { code => <<'END_CODE', |
|---|
| 438 | +new |
|---|
| 439 | +END_CODE |
|---|
| 440 | + expected => [ [ 'Word', 1, 1, 3 ], [ 'Whitespace', 1, 4, 1 ], ], |
|---|
| 441 | + }, |
|---|
| 442 | + { code => <<'END_CODE', |
|---|
| 443 | +use no |
|---|
| 444 | +END_CODE |
|---|
| 445 | + expected => [ |
|---|
| 446 | + [ 'keyword', 1, 1, 3 ], |
|---|
| 447 | + [ 'Whitespace', 1, 4, 1 ], |
|---|
| 448 | + [ 'keyword', 1, 5, 2 ], |
|---|
| 449 | + [ 'Whitespace', 1, 7, 1 ], |
|---|
| 450 | + ], |
|---|
| 451 | + }, |
|---|
| 452 | + { code => <<'END_CODE', |
|---|
| 453 | +my local our |
|---|
| 454 | +END_CODE |
|---|
| 455 | + expected => [ |
|---|
| 456 | + [ 'keyword', 1, 1, 2 ], |
|---|
| 457 | + [ 'Whitespace', 1, 3, 1 ], |
|---|
| 458 | + [ 'keyword', 1, 4, 5 ], |
|---|
| 459 | + [ 'Whitespace', 1, 9, 1 ], |
|---|
| 460 | + [ 'keyword', 1, 10, 3 ], |
|---|
| 461 | + [ 'Whitespace', 1, 13, 1 ], |
|---|
| 462 | + |
|---|
| 463 | + ], |
|---|
| 464 | + }, |
|---|
| 465 | + |
|---|
| 466 | + { code => <<'END_CODE', |
|---|
| 467 | +if else elsif unless for foreach while my |
|---|
| 468 | +END_CODE |
|---|
| 469 | + expected => [ |
|---|
| 470 | + [ 'keyword', 1, 1, 2 ], |
|---|
| 471 | + [ 'Whitespace', 1, 3, 1 ], |
|---|
| 472 | + [ 'keyword', 1, 4, 4 ], |
|---|
| 473 | + [ 'Whitespace', 1, 8, 1 ], |
|---|
| 474 | + [ 'keyword', 1, 9, 5 ], |
|---|
| 475 | + [ 'Whitespace', 1, 14, 1 ], |
|---|
| 476 | + [ 'keyword', 1, 15, 6 ], |
|---|
| 477 | + [ 'Whitespace', 1, 21, 1 ], |
|---|
| 478 | + [ 'keyword', 1, 22, 3 ], |
|---|
| 479 | + [ 'Whitespace', 1, 25, 1 ], |
|---|
| 480 | + [ 'keyword', 1, 26, 7 ], |
|---|
| 481 | + [ 'Whitespace', 1, 33, 1 ], |
|---|
| 482 | + [ 'keyword', 1, 34, 5 ], |
|---|
| 483 | + [ 'Whitespace', 1, 39, 1 ], |
|---|
| 484 | + [ 'keyword', 1, 40, 2 ], |
|---|
| 485 | + [ 'Whitespace', 1, 42, 1 ], |
|---|
| 486 | + |
|---|
| 487 | ], |
|---|
| 488 | }, |
|---|
| 489 | + { code => <<'END_CODE', |
|---|
| 490 | +package |
|---|
| 491 | +END_CODE |
|---|
| 492 | + expected => [ [ 'keyword', 1, 1, 7 ], [ 'Whitespace', 1, 8, 1 ], ], |
|---|
| 493 | + }, |
|---|
| 494 | ); |
|---|
| 495 | |
|---|
| 496 | plan tests => @cases * 1; |
|---|
| 497 | @@ -215,15 +175,16 @@ |
|---|
| 498 | my @result; |
|---|
| 499 | foreach my $c (@cases) { |
|---|
| 500 | @result = (); |
|---|
| 501 | - PPIx::EditorTools::Lexer->new->lexer( code => $c->{code}, highlighter => \&highlighter ); |
|---|
| 502 | + PPIx::EditorTools::Lexer->new->lexer( |
|---|
| 503 | + code => $c->{code}, |
|---|
| 504 | + highlighter => \&highlighter |
|---|
| 505 | + ); |
|---|
| 506 | |
|---|
| 507 | #diag explain @result; |
|---|
| 508 | - is_deeply \@result, $c->{expected}; |
|---|
| 509 | + is_deeply \@result, $c->{expected}; # or diag explain @result; # removed for DC |
|---|
| 510 | } |
|---|
| 511 | |
|---|
| 512 | sub highlighter { |
|---|
| 513 | push @result, [@_]; |
|---|
| 514 | } |
|---|
| 515 | |
|---|
| 516 | - |
|---|
| 517 | - |
|---|
| 518 | Index: t/06-camelcasing.t |
|---|
| 519 | =================================================================== |
|---|
| 520 | --- t/06-camelcasing.t (revision 14568) |
|---|
| 521 | +++ t/06-camelcasing.t (working copy) |
|---|
| 522 | @@ -11,12 +11,12 @@ |
|---|
| 523 | |
|---|
| 524 | use PPI; |
|---|
| 525 | |
|---|
| 526 | -BEGIN { |
|---|
| 527 | - if ( $PPI::VERSION =~ /_/ ) { |
|---|
| 528 | - plan skip_all => "Need released version of PPI. You have $PPI::VERSION"; |
|---|
| 529 | - exit 0; |
|---|
| 530 | - } |
|---|
| 531 | -} |
|---|
| 532 | +#BEGIN { |
|---|
| 533 | +# if ( $PPI::VERSION =~ /_/ ) { |
|---|
| 534 | +# plan skip_all => "Need released version of PPI. You have $PPI::VERSION"; |
|---|
| 535 | +# exit 0; |
|---|
| 536 | +# } |
|---|
| 537 | +#} |
|---|
| 538 | |
|---|
| 539 | use PPIx::EditorTools::RenameVariable; |
|---|
| 540 | |
|---|
| 541 | Index: t/outline/Moofirst.pm |
|---|
| 542 | =================================================================== |
|---|
| 543 | --- t/outline/Moofirst.pm (revision 0) |
|---|
| 544 | +++ t/outline/Moofirst.pm (revision 0) |
|---|
| 545 | @@ -0,0 +1,30 @@ |
|---|
| 546 | +use MooseX::Declare; |
|---|
| 547 | + |
|---|
| 548 | +role Moofirst { |
|---|
| 549 | + requires '_build_overdraft'; |
|---|
| 550 | + use version; our $VERSION = version->new('1.0.1'); |
|---|
| 551 | + |
|---|
| 552 | + has 'balance' => ( |
|---|
| 553 | + isa => 'Num', |
|---|
| 554 | + is => 'rw', |
|---|
| 555 | + default => 0 |
|---|
| 556 | + ); |
|---|
| 557 | + |
|---|
| 558 | + has 'overdraft' => ( |
|---|
| 559 | + isa => 'Bool', |
|---|
| 560 | + is => 'rw', |
|---|
| 561 | + lazy_build => 1, |
|---|
| 562 | + init_arg => undef, |
|---|
| 563 | + ); |
|---|
| 564 | +} |
|---|
| 565 | + |
|---|
| 566 | +class Mooclass { |
|---|
| 567 | + |
|---|
| 568 | + has 'name' => ( isa => 'Str', is => 'rw', ); |
|---|
| 569 | + |
|---|
| 570 | + has qw(account) => ( is => 'rw', ); |
|---|
| 571 | + |
|---|
| 572 | + method _build_overdraft { |
|---|
| 573 | + return; |
|---|
| 574 | + } |
|---|
| 575 | +} |
|---|
| 576 | Index: t/00-ppix-editortools.t |
|---|
| 577 | =================================================================== |
|---|
| 578 | --- t/00-ppix-editortools.t (revision 0) |
|---|
| 579 | +++ t/00-ppix-editortools.t (revision 0) |
|---|
| 580 | @@ -0,0 +1,153 @@ |
|---|
| 581 | +#!/usr/bin/eval perl |
|---|
| 582 | + |
|---|
| 583 | +use strict; |
|---|
| 584 | +use English '-no_match_vars'; |
|---|
| 585 | + |
|---|
| 586 | +BEGIN { |
|---|
| 587 | + $WARNING = 1; |
|---|
| 588 | +} |
|---|
| 589 | +use Test::More tests => 34; |
|---|
| 590 | +use Test::Exception; |
|---|
| 591 | + |
|---|
| 592 | +###### |
|---|
| 593 | +# let's check our package. |
|---|
| 594 | +###### |
|---|
| 595 | +my $pet_obj; |
|---|
| 596 | +require PPIx::EditorTools; |
|---|
| 597 | +$pet_obj = new_ok('PPIx::EditorTools'); |
|---|
| 598 | + |
|---|
| 599 | +my @subs = |
|---|
| 600 | + qw( new code ppi process_doc find_unmatched_brace get_all_variable_declarations element_depth find_token_at_location find_variable_declaration ); |
|---|
| 601 | +use_ok( 'PPIx::EditorTools', @subs ); |
|---|
| 602 | + |
|---|
| 603 | +foreach my $subs (@subs) { |
|---|
| 604 | + can_ok( 'PPIx::EditorTools', $subs ); |
|---|
| 605 | +} |
|---|
| 606 | + |
|---|
| 607 | +#TODO need more pkg tests |
|---|
| 608 | +use PPIx::EditorTools; |
|---|
| 609 | +####### |
|---|
| 610 | +# Testing PPIx::EditorTools->process_doc() |
|---|
| 611 | +####### |
|---|
| 612 | +# Check that something died - we do not care why |
|---|
| 613 | +dies_ok { PPIx::EditorTools->process_doc() } 'expecting PPIx::EditorTools->process_doc() to die'; |
|---|
| 614 | + |
|---|
| 615 | +# check code to ppi |
|---|
| 616 | +my @test_files = ( |
|---|
| 617 | + { filename => 't/outline/Foo.pm', }, |
|---|
| 618 | + { filename => 't/outline/file1.pl', }, |
|---|
| 619 | + { filename => 't/outline/file2.pl', }, |
|---|
| 620 | + { filename => 't/outline/Mooclass.pm', }, |
|---|
| 621 | + { filename => 't/outline/Moorole.pm', }, |
|---|
| 622 | + { filename => 't/outline/Moofirst.pm', }, |
|---|
| 623 | +); |
|---|
| 624 | +my $obj = PPIx::EditorTools->new(); |
|---|
| 625 | +$obj->ppi(undef); |
|---|
| 626 | +$obj->code(undef); |
|---|
| 627 | +foreach my $file (@test_files) { |
|---|
| 628 | + my $code; |
|---|
| 629 | + if ( $file->{filename} ) { |
|---|
| 630 | + open my $file_handle, '<', $file->{filename} or die; |
|---|
| 631 | + local $INPUT_RECORD_SEPARATOR = undef; |
|---|
| 632 | + $code = <$file_handle>; |
|---|
| 633 | + } |
|---|
| 634 | + ok( $obj->process_doc( code => $code ), |
|---|
| 635 | + "process_doc(code) from $file->{filename}" |
|---|
| 636 | + ); |
|---|
| 637 | +} |
|---|
| 638 | + |
|---|
| 639 | +## check ppi source |
|---|
| 640 | +my %ppi = ( |
|---|
| 641 | + 'attributes' => [ |
|---|
| 642 | + { 'line' => 7, |
|---|
| 643 | + 'name' => 'balance', |
|---|
| 644 | + }, |
|---|
| 645 | + { 'line' => 13, |
|---|
| 646 | + 'name' => 'overdraft', |
|---|
| 647 | + }, |
|---|
| 648 | + { 'line' => 23, |
|---|
| 649 | + 'name' => 'name', |
|---|
| 650 | + }, |
|---|
| 651 | + { 'line' => 25, |
|---|
| 652 | + 'name' => 'account', |
|---|
| 653 | + }, |
|---|
| 654 | + ], |
|---|
| 655 | + 'line' => 3, |
|---|
| 656 | + 'methods' => [ |
|---|
| 657 | + { 'line' => 27, |
|---|
| 658 | + 'name' => '_build_overdraft', |
|---|
| 659 | + }, |
|---|
| 660 | + ], |
|---|
| 661 | + 'modules' => [ |
|---|
| 662 | + { 'line' => 1, |
|---|
| 663 | + 'name' => 'MooseX::Declare', |
|---|
| 664 | + }, |
|---|
| 665 | + ], |
|---|
| 666 | + 'name' => 'Moofirst', |
|---|
| 667 | + 'pragmata' => [ |
|---|
| 668 | + { 'line' => 5, |
|---|
| 669 | + 'name' => 'version', |
|---|
| 670 | + }, |
|---|
| 671 | + ], |
|---|
| 672 | +); |
|---|
| 673 | + |
|---|
| 674 | +$obj->ppi('PPI::Document'); |
|---|
| 675 | +$obj->code(undef); |
|---|
| 676 | +ok( $obj->process_doc(%ppi), 'process_doc(ppi)' ); |
|---|
| 677 | +## check neither ppi or code fails |
|---|
| 678 | +$obj->ppi(undef); |
|---|
| 679 | +$obj->code(undef); |
|---|
| 680 | +my %case = ( one => 'ppi', two => 'code', three => 'PPI::Document', ); |
|---|
| 681 | +throws_ok { $obj->process_doc(%case) } '/arguments ppi or code required/', 'arguments ppi or code required'; |
|---|
| 682 | + |
|---|
| 683 | +#TODO add more tests |
|---|
| 684 | +dies_ok { PPIx::EditorTools->find_unmatched_brace() } 'expecting PPIx::EditorTools->find_unmatched_brace() to die'; |
|---|
| 685 | + |
|---|
| 686 | +#TODO add more tests |
|---|
| 687 | +dies_ok { PPIx::EditorTools->get_all_variable_declarations() } |
|---|
| 688 | +'expecting PPIx::EditorTools->get_all_variable_declarations() to die'; |
|---|
| 689 | + |
|---|
| 690 | +#TODO add more tests |
|---|
| 691 | +dies_ok { PPIx::EditorTools->element_depth() } 'expecting PPIx::EditorTools->element_depth() to die'; |
|---|
| 692 | + |
|---|
| 693 | +#TODO add more tests |
|---|
| 694 | +dies_ok { PPIx::EditorTools->find_token_at_location() } 'expecting PPIx::EditorTools->find_token_at_location() to die'; |
|---|
| 695 | + |
|---|
| 696 | +#dies_ok { PPIx::EditorTools->find_variable_declaration() } 'expecting PPIx::EditorTools->find_variable_declaration() to die'; |
|---|
| 697 | +###### |
|---|
| 698 | +# let's check our lib's are here. |
|---|
| 699 | +###### |
|---|
| 700 | +my $test_object; |
|---|
| 701 | +require PPIx::EditorTools::FindUnmatchedBrace; |
|---|
| 702 | +$test_object = new_ok('PPIx::EditorTools::FindUnmatchedBrace'); |
|---|
| 703 | + |
|---|
| 704 | +require PPIx::EditorTools::FindVariableDeclaration; |
|---|
| 705 | +$test_object = new_ok('PPIx::EditorTools::FindVariableDeclaration'); |
|---|
| 706 | + |
|---|
| 707 | +require PPIx::EditorTools::IntroduceTemporaryVariable; |
|---|
| 708 | +$test_object = new_ok('PPIx::EditorTools::IntroduceTemporaryVariable'); |
|---|
| 709 | + |
|---|
| 710 | +require PPIx::EditorTools::RenamePackage; |
|---|
| 711 | +$test_object = new_ok('PPIx::EditorTools::RenamePackage'); |
|---|
| 712 | + |
|---|
| 713 | +require PPIx::EditorTools::RenamePackageFromPath; |
|---|
| 714 | +$test_object = new_ok('PPIx::EditorTools::RenamePackageFromPath'); |
|---|
| 715 | + |
|---|
| 716 | +require PPIx::EditorTools::RenameVariable; |
|---|
| 717 | +$test_object = new_ok('PPIx::EditorTools::RenameVariable'); |
|---|
| 718 | + |
|---|
| 719 | +require PPIx::EditorTools::FindUnmatchedBrace; |
|---|
| 720 | +$test_object = new_ok('PPIx::EditorTools::FindUnmatchedBrace'); |
|---|
| 721 | + |
|---|
| 722 | +require PPIx::EditorTools::Outline; |
|---|
| 723 | +$test_object = new_ok('PPIx::EditorTools::Outline'); |
|---|
| 724 | + |
|---|
| 725 | +require PPIx::EditorTools::Lexer; |
|---|
| 726 | +$test_object = new_ok('PPIx::EditorTools::Lexer'); |
|---|
| 727 | + |
|---|
| 728 | +require PPIx::EditorTools::ReturnObject; |
|---|
| 729 | +$test_object = new_ok('PPIx::EditorTools::ReturnObject'); |
|---|
| 730 | + |
|---|
| 731 | +done_testing(); |
|---|
| 732 | + |
|---|
| 733 | +#done_testing($number_of_tests); |
|---|
| 734 | Index: t/08-getallvariabledeclarations.t |
|---|
| 735 | =================================================================== |
|---|
| 736 | --- t/08-getallvariabledeclarations.t (revision 14568) |
|---|
| 737 | +++ t/08-getallvariabledeclarations.t (working copy) |
|---|
| 738 | @@ -10,7 +10,8 @@ |
|---|
| 739 | use PPI; |
|---|
| 740 | |
|---|
| 741 | use PPIx::EditorTools; |
|---|
| 742 | -diag "PPI version is $PPI::VERSION"; |
|---|
| 743 | + |
|---|
| 744 | +#diag "PPI version is $PPI::VERSION"; |
|---|
| 745 | |
|---|
| 746 | my $code = <<'END_OF_CODE'; |
|---|
| 747 | use warnings; |
|---|
| 748 | Index: t/05-renamepackagefrompath.t |
|---|
| 749 | =================================================================== |
|---|
| 750 | --- t/05-renamepackagefrompath.t (revision 14568) |
|---|
| 751 | +++ t/05-renamepackagefrompath.t (working copy) |
|---|
| 752 | @@ -10,12 +10,12 @@ |
|---|
| 753 | use Test::Differences; |
|---|
| 754 | use PPI; |
|---|
| 755 | |
|---|
| 756 | -BEGIN { |
|---|
| 757 | - if ( $PPI::VERSION =~ /_/ ) { |
|---|
| 758 | - plan skip_all => "Need released version of PPI. You have $PPI::VERSION"; |
|---|
| 759 | - exit 0; |
|---|
| 760 | - } |
|---|
| 761 | -} |
|---|
| 762 | +#BEGIN { |
|---|
| 763 | +# if ( $PPI::VERSION =~ /_/ ) { |
|---|
| 764 | +# plan skip_all => "Need released version of PPI. You have $PPI::VERSION"; |
|---|
| 765 | +# exit 0; |
|---|
| 766 | +# } |
|---|
| 767 | +#} |
|---|
| 768 | |
|---|
| 769 | plan tests => 4; |
|---|
| 770 | |
|---|
| 771 | Index: t/02-findvariabledeclaration.t |
|---|
| 772 | =================================================================== |
|---|
| 773 | --- t/02-findvariabledeclaration.t (revision 14568) |
|---|
| 774 | +++ t/02-findvariabledeclaration.t (working copy) |
|---|
| 775 | @@ -10,12 +10,12 @@ |
|---|
| 776 | use Test::Differences; |
|---|
| 777 | use PPI; |
|---|
| 778 | |
|---|
| 779 | -BEGIN { |
|---|
| 780 | - if ( $PPI::VERSION =~ /_/ ) { |
|---|
| 781 | - plan skip_all => "Need released version of PPI. You have $PPI::VERSION"; |
|---|
| 782 | - exit 0; |
|---|
| 783 | - } |
|---|
| 784 | -} |
|---|
| 785 | +#BEGIN { |
|---|
| 786 | +# if ( $PPI::VERSION =~ /_/ ) { |
|---|
| 787 | +# plan skip_all => "Need released version of PPI. You have $PPI::VERSION"; |
|---|
| 788 | +# exit 0; |
|---|
| 789 | +# } |
|---|
| 790 | +#} |
|---|
| 791 | |
|---|
| 792 | plan tests => 6; |
|---|
| 793 | |
|---|
| 794 | Index: t/01-findunmatchedbrace.t |
|---|
| 795 | =================================================================== |
|---|
| 796 | --- t/01-findunmatchedbrace.t (revision 14568) |
|---|
| 797 | +++ t/01-findunmatchedbrace.t (working copy) |
|---|
| 798 | @@ -10,12 +10,12 @@ |
|---|
| 799 | use Test::Differences; |
|---|
| 800 | use PPI; |
|---|
| 801 | |
|---|
| 802 | -BEGIN { |
|---|
| 803 | - if ( $PPI::VERSION =~ /_/ ) { |
|---|
| 804 | - plan skip_all => "Need released version of PPI. You have $PPI::VERSION"; |
|---|
| 805 | - exit 0; |
|---|
| 806 | - } |
|---|
| 807 | -} |
|---|
| 808 | +#BEGIN { |
|---|
| 809 | +# if ( $PPI::VERSION =~ /_/ ) { |
|---|
| 810 | +# plan skip_all => "Need released version of PPI. You have $PPI::VERSION"; |
|---|
| 811 | +# exit 0; |
|---|
| 812 | +# } |
|---|
| 813 | +#} |
|---|
| 814 | |
|---|
| 815 | plan tests => 6; |
|---|
| 816 | |
|---|