Skip to content

Commit

Permalink
Make minimumFractionDigits = maximumFractionDigits
Browse files Browse the repository at this point in the history
Make minimumFractionDigits equal to maximumFractionDigits while
roundingIncrement != 1 to sync with latest spec change in
tc39/proposal-intl-numberformat-v3#85
which landed to spec text in Feb 22, 2022
  • Loading branch information
FrankYFTang authored and rwaldron committed Apr 25, 2022
1 parent 8a1ec2f commit 576c0c0
Show file tree
Hide file tree
Showing 15 changed files with 148 additions and 147 deletions.
3 changes: 2 additions & 1 deletion test/intl402/NumberFormat/constructor-roundingIncrement.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ for (const [value, expected] of values) {
get roundingIncrement() {
callOrder.push("roundingIncrement");
return value;
}
},
minimumFractionDigits: 3
});
const resolvedOptions = nf.resolvedOptions();
assert("roundingIncrement" in resolvedOptions, "has property for value " + value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ var numberingSystems = ['arab', 'latn', 'thai', 'hanidec'];
testNumberFormat(
locales,
numberingSystems,
{roundingIncrement: 10, maximumFractionDigits: 2},
{roundingIncrement: 10, maximumFractionDigits: 2, minimumFractionDigits: 2},
{
'1.100': '1.1',
'1.125': '1.1',
'1.150': '1.2',
'1.175': '1.2',
'1.200': '1.2',
'1.100': '1.10',
'1.125': '1.10',
'1.150': '1.20',
'1.175': '1.20',
'1.200': '1.20',
}
);

testNumberFormat(
locales,
numberingSystems,
{roundingIncrement: 10, maximumFractionDigits: 3},
{roundingIncrement: 10, maximumFractionDigits: 3, minimumFractionDigits: 3},
{
'1.0100': '1.01',
'1.0125': '1.01',
'1.0150': '1.02',
'1.0175': '1.02',
'1.0200': '1.02',
'1.0100': '1.010',
'1.0125': '1.010',
'1.0150': '1.020',
'1.0175': '1.020',
'1.0200': '1.020',
}
);
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ var numberingSystems = ['arab', 'latn', 'thai', 'hanidec'];
testNumberFormat(
locales,
numberingSystems,
{roundingIncrement: 100, maximumFractionDigits: 3},
{roundingIncrement: 100, maximumFractionDigits: 3, minimumFractionDigits: 3},
{
'1.100': '1.1',
'1.125': '1.1',
'1.150': '1.2',
'1.175': '1.2',
'1.200': '1.2',
'1.100': '1.100',
'1.125': '1.100',
'1.150': '1.200',
'1.175': '1.200',
'1.200': '1.200',
}
);

testNumberFormat(
locales,
numberingSystems,
{roundingIncrement: 100, maximumFractionDigits: 4},
{roundingIncrement: 100, maximumFractionDigits: 4, minimumFractionDigits: 4},
{
'1.0100': '1.01',
'1.0125': '1.01',
'1.0150': '1.02',
'1.0175': '1.02',
'1.0200': '1.02',
'1.0100': '1.0100',
'1.0125': '1.0100',
'1.0150': '1.0200',
'1.0175': '1.0200',
'1.0200': '1.0200',
}
);
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ var numberingSystems = ['arab', 'latn', 'thai', 'hanidec'];
testNumberFormat(
locales,
numberingSystems,
{roundingIncrement: 1000, maximumFractionDigits: 4},
{roundingIncrement: 1000, maximumFractionDigits: 4, minimumFractionDigits: 4},
{
'1.100': '1.1',
'1.125': '1.1',
'1.150': '1.2',
'1.175': '1.2',
'1.200': '1.2',
'1.100': '1.1000',
'1.125': '1.1000',
'1.150': '1.2000',
'1.175': '1.2000',
'1.200': '1.2000',
}
);

testNumberFormat(
locales,
numberingSystems,
{roundingIncrement: 1000, maximumFractionDigits: 5},
{roundingIncrement: 1000, maximumFractionDigits: 5, minimumFractionDigits: 5},
{
'1.0100': '1.01',
'1.0125': '1.01',
'1.0150': '1.02',
'1.0175': '1.02',
'1.0200': '1.02',
'1.0100': '1.01000',
'1.0125': '1.01000',
'1.0150': '1.02000',
'1.0175': '1.02000',
'1.0200': '1.02000',
}
);
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ var numberingSystems = ['arab', 'latn', 'thai', 'hanidec'];
testNumberFormat(
locales,
numberingSystems,
{roundingIncrement: 2, maximumFractionDigits: 1},
{roundingIncrement: 2, maximumFractionDigits: 1, minimumFractionDigits: 1},
{
'1.20': '1.2',
'1.25': '1.2',
Expand All @@ -28,7 +28,7 @@ testNumberFormat(
testNumberFormat(
locales,
numberingSystems,
{roundingIncrement: 2, maximumFractionDigits: 2},
{roundingIncrement: 2, maximumFractionDigits: 2, minimumFractionDigits: 2},
{
'1.020': '1.02',
'1.025': '1.02',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ var numberingSystems = ['arab', 'latn', 'thai', 'hanidec'];
testNumberFormat(
locales,
numberingSystems,
{roundingIncrement: 20, maximumFractionDigits: 2},
{roundingIncrement: 20, maximumFractionDigits: 2, minimumFractionDigits: 2},
{
'1.20': '1.2',
'1.25': '1.2',
'1.30': '1.4',
'1.35': '1.4',
'1.40': '1.4',
'1.20': '1.20',
'1.25': '1.20',
'1.30': '1.40',
'1.35': '1.40',
'1.40': '1.40',
}
);

testNumberFormat(
locales,
numberingSystems,
{roundingIncrement: 20, maximumFractionDigits: 3},
{roundingIncrement: 20, maximumFractionDigits: 3, minimumFractionDigits: 3},
{
'1.020': '1.02',
'1.025': '1.02',
'1.030': '1.04',
'1.035': '1.04',
'1.040': '1.04',
'1.020': '1.020',
'1.025': '1.020',
'1.030': '1.040',
'1.035': '1.040',
'1.040': '1.040',
}
);
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ var numberingSystems = ['arab', 'latn', 'thai', 'hanidec'];
testNumberFormat(
locales,
numberingSystems,
{roundingIncrement: 200, maximumFractionDigits: 3},
{roundingIncrement: 200, maximumFractionDigits: 3, minimumFractionDigits: 3},
{
'1.20': '1.2',
'1.25': '1.2',
'1.30': '1.4',
'1.35': '1.4',
'1.40': '1.4',
'1.20': '1.200',
'1.25': '1.200',
'1.30': '1.400',
'1.35': '1.400',
'1.40': '1.400',
}
);

testNumberFormat(
locales,
numberingSystems,
{roundingIncrement: 200, maximumFractionDigits: 4},
{roundingIncrement: 200, maximumFractionDigits: 4, minimumFractionDigits: 4},
{
'1.020': '1.02',
'1.025': '1.02',
'1.030': '1.04',
'1.035': '1.04',
'1.040': '1.04',
'1.020': '1.0200',
'1.025': '1.0200',
'1.030': '1.0400',
'1.035': '1.0400',
'1.040': '1.0400',
}
);
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ var numberingSystems = ['arab', 'latn', 'thai', 'hanidec'];
testNumberFormat(
locales,
numberingSystems,
{roundingIncrement: 2000, maximumFractionDigits: 4},
{roundingIncrement: 2000, maximumFractionDigits: 4, minimumFractionDigits: 4},
{
'1.20': '1.2',
'1.25': '1.2',
'1.30': '1.4',
'1.35': '1.4',
'1.40': '1.4',
'1.20': '1.2000',
'1.25': '1.2000',
'1.30': '1.4000',
'1.35': '1.4000',
'1.40': '1.4000',
}
);

testNumberFormat(
locales,
numberingSystems,
{roundingIncrement: 2000, maximumFractionDigits: 5},
{roundingIncrement: 2000, maximumFractionDigits: 5, minimumFractionDigits: 5},
{
'1.020': '1.02',
'1.025': '1.02',
'1.030': '1.04',
'1.035': '1.04',
'1.040': '1.04',
'1.020': '1.02000',
'1.025': '1.02000',
'1.030': '1.04000',
'1.035': '1.04000',
'1.040': '1.04000',
}
);
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ var numberingSystems = ['arab', 'latn', 'thai', 'hanidec'];
testNumberFormat(
locales,
numberingSystems,
{roundingIncrement: 25, maximumFractionDigits: 2, minimumFractionDigits: 1},
{roundingIncrement: 25, maximumFractionDigits: 2, minimumFractionDigits: 2},
{
'1.2500': '1.25',
'1.3125': '1.25',
'1.3750': '1.5',
'1.4375': '1.5',
'1.5000': '1.5',
'1.3750': '1.50',
'1.4375': '1.50',
'1.5000': '1.50',
}
);

testNumberFormat(
locales,
numberingSystems,
{roundingIncrement: 25, maximumFractionDigits: 3},
{roundingIncrement: 25, maximumFractionDigits: 3, minimumFractionDigits: 3},
{
'1.02500': '1.025',
'1.03125': '1.025',
'1.03750': '1.05',
'1.04375': '1.05',
'1.05000': '1.05',
'1.03750': '1.050',
'1.04375': '1.050',
'1.05000': '1.050',
}
);
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ var numberingSystems = ['arab', 'latn', 'thai', 'hanidec'];
testNumberFormat(
locales,
numberingSystems,
{roundingIncrement: 250, maximumFractionDigits: 3, minimumFractionDigits: 1},
{roundingIncrement: 250, maximumFractionDigits: 3, minimumFractionDigits: 3},
{
'1.2500': '1.25',
'1.3125': '1.25',
'1.3750': '1.5',
'1.4375': '1.5',
'1.5000': '1.5',
'1.2500': '1.250',
'1.3125': '1.250',
'1.3750': '1.500',
'1.4375': '1.500',
'1.5000': '1.500',
}
);

testNumberFormat(
locales,
numberingSystems,
{roundingIncrement: 250, maximumFractionDigits: 4},
{roundingIncrement: 250, maximumFractionDigits: 4, minimumFractionDigits: 4},
{
'1.02500': '1.025',
'1.03125': '1.025',
'1.03750': '1.05',
'1.04375': '1.05',
'1.05000': '1.05',
'1.02500': '1.0250',
'1.03125': '1.0250',
'1.03750': '1.0500',
'1.04375': '1.0500',
'1.05000': '1.0500',
}
);
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ var numberingSystems = ['arab', 'latn', 'thai', 'hanidec'];
testNumberFormat(
locales,
numberingSystems,
{roundingIncrement: 2500, maximumFractionDigits: 4, minimumFractionDigits: 1},
{roundingIncrement: 2500, maximumFractionDigits: 4, minimumFractionDigits: 4},
{
'1.2500': '1.25',
'1.3125': '1.25',
'1.3750': '1.5',
'1.4375': '1.5',
'1.5000': '1.5',
'1.2500': '1.2500',
'1.3125': '1.2500',
'1.3750': '1.5000',
'1.4375': '1.5000',
'1.5000': '1.5000',
}
);

testNumberFormat(
locales,
numberingSystems,
{roundingIncrement: 2500, maximumFractionDigits: 5},
{roundingIncrement: 2500, maximumFractionDigits: 5, minimumFractionDigits: 5},
{
'1.02500': '1.025',
'1.03125': '1.025',
'1.03750': '1.05',
'1.04375': '1.05',
'1.05000': '1.05',
'1.02500': '1.02500',
'1.03125': '1.02500',
'1.03750': '1.05000',
'1.04375': '1.05000',
'1.05000': '1.05000',
}
);
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ testNumberFormat(
testNumberFormat(
locales,
numberingSystems,
{roundingIncrement: 5, maximumFractionDigits: 2},
{roundingIncrement: 5, maximumFractionDigits: 2, minimumFractionDigits: 2},
{
'1.0500': '1.05',
'1.0625': '1.05',
'1.0750': '1.1',
'1.0875': '1.1',
'1.1000': '1.1',
'1.0750': '1.10',
'1.0875': '1.10',
'1.1000': '1.10',
}
);

0 comments on commit 576c0c0

Please sign in to comment.