Skip to content

fix tests, melhorias gerais #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 27, 2020
Merged

fix tests, melhorias gerais #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/validator-docs/Rules/InscricaoEstadual.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,19 @@

use Thiagocfn\InscricaoEstadual\Util\Validador;

use function mb_strtoupper;

final class InscricaoEstadual extends Sanitization
{
public function validateInscricaoEstadual($attribute, $value, $parameters)
{
if(empty($parameters[0]) || !is_string($parameters[0])) {
if (empty($parameters[0]) || !is_string($parameters[0])) {
return false;
}

$siglaUf = $this->sanitizeSiglaUf($parameters[0]);
$inscricaoEstadual = $this->sanitize($value);

return Validador::check($siglaUf, $inscricaoEstadual);
}

Expand All @@ -25,4 +29,4 @@ private function sanitizeSiglaUf($siglaUf)
{
return mb_strtoupper($siglaUf);
}
}
}
2 changes: 2 additions & 0 deletions src/validator-docs/Rules/Placa.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

namespace geekcom\ValidatorDocs\Rules;

use function preg_match;

final class Placa extends Sanitization
{
public function validatePlaca($attribute, $placa): bool
Expand Down
2 changes: 2 additions & 0 deletions src/validator-docs/Rules/Renavam.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

namespace geekcom\ValidatorDocs\Rules;

use function str_split;

class Renavam extends Sanitization
{
public function validateRenavam($attribute, $renavam): bool
Expand Down
6 changes: 3 additions & 3 deletions src/validator-docs/Validator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

namespace geekcom\ValidatorDocs;

use geekcom\ValidatorDocs\Rules\Placa;
use geekcom\ValidatorDocs\Rules\Renavam;
use Illuminate\Validation\Validator as BaseValidator;
use geekcom\ValidatorDocs\Rules\TituloEleitoral;
use geekcom\ValidatorDocs\Rules\Cns;
Expand All @@ -15,6 +13,8 @@
use geekcom\ValidatorDocs\Rules\Cnh;
use geekcom\ValidatorDocs\Rules\Certidao;
use geekcom\ValidatorDocs\Rules\InscricaoEstadual;
use geekcom\ValidatorDocs\Rules\Placa;
use geekcom\ValidatorDocs\Rules\Renavam;

use function preg_match;

Expand Down Expand Up @@ -113,7 +113,7 @@ protected function validateInscricaoEstadual($attribute, $value, $parameters): b

return $inscricaoEstadual->validateInscricaoEstadual($attribute, $value, $parameters);
}

protected function validateRenavam($attribute, $value): bool
{
$renavam = new Renavam();
Expand Down
119 changes: 60 additions & 59 deletions tests/TestValidator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,65 +307,65 @@ public function inscricoesEstaduais()
}

return $inscricoesEstaduaisValidas + [
// válidas
'válida sem formatação' => [
'data' => '82679341',
'rules' => 'inscricao_estadual:BA',
'assert' => 'passes'
],
'válida com estado (UF) em letras minúsculas' => [
'data' => '82679341',
'rules' => 'inscricao_estadual:ba',
'assert' => 'passes'
],
'válida com formatação' => [
'data' => '826793-41',
'rules' => 'inscricao_estadual:BA',
'assert' => 'passes'
],
'válida com formatação qualquer não-numérica' => [
'data' => '8 2__6-7*9.3/41',
'rules' => 'inscricao_estadual:BA',
'assert' => 'passes'
],

// inválidas
'inválida cálculo errado' => [
'data' => '82679342', // último digito deveria ser 1
'rules' => 'inscricao_estadual:BA',
'assert' => 'fails'
],
'inválida se estado (UF) errado' => [
'data' => '82679341',
'rules' => 'inscricao_estadual:SP', // deveria ser BA
'assert' => 'fails'
],
'inválida se estado (UF) inexistente' => [
'data' => '82679341',
'rules' => 'inscricao_estadual:ZA',
'assert' => 'fails'
],
'inválida se estado (UF) invalido (maior)' => [
'data' => '82679341',
'rules' => 'inscricao_estadual:askdjahsd',
'assert' => 'fails'
],
'inválida se estado (UF) invalido (menor)' => [
'data' => '82679341',
'rules' => 'inscricao_estadual:y',
'assert' => 'fails'
],
'inválida se estado (UF) invalido (numerico)' => [
'data' => '82679341',
'rules' => 'inscricao_estadual:12',
'assert' => 'fails'
],
'inválida se estado (UF) não informado' => [
'data' => '82679341',
'rules' => 'inscricao_estadual',
'assert' => 'fails'
],
];
// válidas
'válida sem formatação' => [
'data' => '82679341',
'rules' => 'inscricao_estadual:BA',
'assert' => 'passes'
],
'válida com estado (UF) em letras minúsculas' => [
'data' => '82679341',
'rules' => 'inscricao_estadual:ba',
'assert' => 'passes'
],
'válida com formatação' => [
'data' => '826793-41',
'rules' => 'inscricao_estadual:BA',
'assert' => 'passes'
],
'válida com formatação qualquer não-numérica' => [
'data' => '8 2__6-7*9.3/41',
'rules' => 'inscricao_estadual:BA',
'assert' => 'passes'
],

// inválidas
'inválida cálculo errado' => [
'data' => '82679342', // último digito deveria ser 1
'rules' => 'inscricao_estadual:BA',
'assert' => 'fails'
],
'inválida se estado (UF) errado' => [
'data' => '82679341',
'rules' => 'inscricao_estadual:SP', // deveria ser BA
'assert' => 'fails'
],
'inválida se estado (UF) inexistente' => [
'data' => '82679341',
'rules' => 'inscricao_estadual:ZA',
'assert' => 'fails'
],
'inválida se estado (UF) invalido (maior)' => [
'data' => '82679341',
'rules' => 'inscricao_estadual:askdjahsd',
'assert' => 'fails'
],
'inválida se estado (UF) invalido (menor)' => [
'data' => '82679341',
'rules' => 'inscricao_estadual:y',
'assert' => 'fails'
],
'inválida se estado (UF) invalido (numerico)' => [
'data' => '82679341',
'rules' => 'inscricao_estadual:12',
'assert' => 'fails'
],
'inválida se estado (UF) não informado' => [
'data' => '82679341',
'rules' => 'inscricao_estadual',
'assert' => 'fails'
],
];
}

/**
Expand Down Expand Up @@ -408,6 +408,7 @@ public function formatoRenavam()
$this->assertTrue($correct->passes());
}

/** @test **/
public function placa()
{
$correct = Validator::make(
Expand Down