Skip to content
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

Separate functions to trim whitespace and normalize domain name #1316

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
+81 −36
Open

Separate functions to trim whitespace and normalize domain name #1316

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2bc844b
Add strictures
mattias-p Dec 21, 2023
e8751bb
Improved unit test
mattias-p Dec 21, 2023
0fb2404
Split out trim_space() from normalize_name()
mattias-p Dec 21, 2023
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
Next Next commit
Add strictures 
Also, fix resulting compilation errors and make iteration order deterministic.
@mattias-p
mattias-p committed Jan 8, 2024
commit 2bc844b7a8faa4cb870a479e52aa284965796f04
22 changes: 13 additions & 9 deletions t/normalization.t
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
use Test::More;
use Test::Exception;

#!perl
use strict;
use utf8;
use warnings;
use Test::More;

BEGIN { use_ok( 'Zonemaster::Engine::Normalization' ); }
use Test::Exception;
use Zonemaster::Engine::Normalization qw( normalize_name );

sub char_to_hex_esc {
my ($char) = @_;
@@ -83,10 +85,11 @@ subtest 'Valid domains' => sub {
"aḍ\x{0307}a" => 'xn--aa-rub587y',
);

while (($domain, $expected_output) = each (%input_domains)) {
for my $domain ( sort keys %input_domains ) {
my $expected_output = $input_domains{$domain};
my $safe_domain = to_hex_esc($domain);
subtest "Domain: '$safe_domain'" => sub {
my $errors, $final_domain;
my ( $errors, $final_domain );
lives_ok(sub {
($errors, $final_domain) = normalize_name($domain);
}, 'correct domain should live');
@@ -126,16 +129,17 @@ subtest 'Bad domains' => sub {
'İ.example.com' => 'AMBIGUOUS_DOWNCASING',
);

while (($domain, $error) = each (%input_domains)) {
for my $domain ( sort keys %input_domains ) {
my $error = $input_domains{$domain};
my $safe_domain = to_hex_esc($domain);
subtest "Domain: '$safe_domain' ($error)" => sub {
my $output, $messages, $domain;
my ( $errors, $final_domain );
lives_ok(sub {
($errors, $final_domain) = normalize_name($domain);
}, 'incorrect domain should live');

is($final_domain, undef, 'No domain returned') or diag($final_domain);
is($errors->[0]->tag, $error, 'Correct error is returned') or diag($errors[0]);
is($errors->[0]->tag, $error, 'Correct error is returned') or diag($errors->[0]);
note(to_hex_esc($errors->[0]))
}
}