Skip to content

Commit

Permalink
fix(slider): correct maxValue setter for android (#4346)
Browse files Browse the repository at this point in the history 
The setter should invoke setNativeValuesSilently with the new value and
max value respectively.

fixes #4343
  • Loading branch information
@sis0k0
sis0k0 committed Jun 9, 2017
1 parent 9bba250 commit 6184338
Show file tree
Hide file tree
Showing 2 changed files with 106 additions and 32 deletions.
133 changes: 104 additions & 29 deletions tests/app/ui/slider/slider-tests.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,15 @@ import { Slider } from "tns-core-modules/ui/slider";
// exports.pageLoaded = pageLoaded;
// << article-binding-slider-properties

const TEST_VALUE = 5;
interface SliderValues {
min?: number,
max?: number,
value?: number,
}

const TEST_VALUE = 50;
const MAX_TEST_VALUE = 70;
const MIN_TEST_VALUE = 10;
const VALUE_EVENT = "valueChange";
const MIN_VALUE_EVENT = "minValueChange";
const MAX_VALUE_EVENT = "maxValueChange";
Expand Down Expand Up @@ -131,12 +139,90 @@ export function test_default_native_values() {
helper.buildUIAndRunTest(slider, testAction);
}

export function test_set_min_max_value() {
const slider = new Slider();
slider.minValue = MIN_TEST_VALUE;
slider.maxValue = MAX_TEST_VALUE;
slider.value = TEST_VALUE;

function testAction(views: Array<View>) {
assertSliderValuesDefault(slider);
};

helper.buildUIAndRunTest(slider, testAction);
}

export function test_set_min_value_max() {
const slider = new Slider();
slider.minValue = MIN_TEST_VALUE;
slider.value = TEST_VALUE;
slider.maxValue = MAX_TEST_VALUE;

function testAction(views: Array<View>) {
assertSliderValuesDefault(slider);
};

helper.buildUIAndRunTest(slider, testAction);
}

export function test_set_max_min_value() {
const slider = new Slider();
slider.maxValue = MAX_TEST_VALUE;
slider.minValue = MIN_TEST_VALUE;
slider.value = TEST_VALUE;

function testAction(views: Array<View>) {
assertSliderValuesDefault(slider);
};

helper.buildUIAndRunTest(slider, testAction);
}

export function test_set_max_value_min() {
const slider = new Slider();
slider.maxValue = MAX_TEST_VALUE;
slider.value = TEST_VALUE;
slider.minValue = MIN_TEST_VALUE;

function testAction(views: Array<View>) {
assertSliderValuesDefault(slider);
};

helper.buildUIAndRunTest(slider, testAction);
}

export function test_set_value_min_max() {
const slider = new Slider();
slider.value = TEST_VALUE;
slider.minValue = MIN_TEST_VALUE;
slider.maxValue = MAX_TEST_VALUE;

function testAction(views: Array<View>) {
assertSliderValuesDefault(slider);
};

helper.buildUIAndRunTest(slider, testAction);
}

export function test_set_value_max_min() {
const slider = new Slider();
slider.value = TEST_VALUE;
slider.maxValue = MAX_TEST_VALUE;
slider.minValue = MIN_TEST_VALUE;

function testAction(views: Array<View>) {
assertSliderValuesDefault(slider);
};

helper.buildUIAndRunTest(slider, testAction);
}

export function test_set_value_less_than_min_should_set_value_to_min() {
const slider = new Slider();

function testAction(views: Array<View>) {
slider.value = -10;
TKUnit.assertEqual(slider.value, 0, "slider.value");
assertSliderValues(slider, { value: 0 });
};

helper.buildUIAndRunTest(slider, testAction);
Expand All @@ -148,7 +234,7 @@ export function test_set_value_greater_than_max_should_set_value_to_max() {
function testAction(views: Array<View>) {
slider.maxValue = 10;
slider.value = 20;
TKUnit.assertEqual(slider.value, 10, "slider.value");
assertSliderValues(slider, { value: 10 });
};

helper.buildUIAndRunTest(slider, testAction);
Expand Down Expand Up @@ -181,10 +267,7 @@ export function test_set_maxValue_should_adjust_value_but_respect_minValue() {

function testAction(views: Array<View>) {
slider.maxValue = 30;

TKUnit.assertEqual(slider.maxValue, 50, "slider.maxValue");
TKUnit.assertEqual(slider.minValue, 50, "slider.minValue");
TKUnit.assertEqual(slider.value, 50, "slider.value");
assertSliderValues(slider, { min: 50, max: 50, value: 50 });
};

helper.buildUIAndRunTest(slider, testAction);
Expand All @@ -198,9 +281,7 @@ export function test_set_minValue_should_adjust_value() {

function testAction(views: Array<View>) {
slider.minValue = 60;

TKUnit.assertEqual(slider.minValue, 60, "slider.minValue");
TKUnit.assertEqual(slider.value, 60, "slider.value");
assertSliderValues(slider, { min: 60, value: 60 });
};

helper.buildUIAndRunTest(slider, testAction);
Expand All @@ -213,11 +294,9 @@ export function test_set_minValue_should_adjust_value_and_maxValue() {
slider.minValue = 0;

function testAction(views: Array<View>) {
slider.minValue = 120;

TKUnit.assertEqual(slider.minValue, 120, "slider.minValue");
TKUnit.assertEqual(slider.maxValue, 120, "slider.maxValue");
TKUnit.assertEqual(slider.value, 120, "slider.value");
const newMin = 120;
slider.minValue = newMin;
assertSliderValues(slider, { min: newMin, max: newMin, value: newMin });
};

helper.buildUIAndRunTest(slider, testAction);
Expand Down Expand Up @@ -381,26 +460,22 @@ export function test_binding_value_to_bindingContext() {
helper.buildUIAndRunTest(slider, testAction);
}

export function test_set_value_min_max_have_correct_values_after_load() {
const slider = new Slider();
slider.minValue = 10;
slider.maxValue = 300;
slider.value = 250;

function testAction(views: Array<View>) {
TKUnit.assertEqual(slider.minValue, 10, "slider.minValue");
TKUnit.assertEqual(slider.value, 250, "slider.value");
TKUnit.assertEqual(slider.maxValue, 300, "slider.maxValue");
};
function assertSliderValuesDefault(slider: Slider) {
return assertSliderValues(slider, { min: MIN_TEST_VALUE, max: MAX_TEST_VALUE, value: TEST_VALUE });
}

helper.buildUIAndRunTest(slider, testAction);
function assertSliderValues(slider: Slider, { min, max, value }: SliderValues) {
// tslint:disable
min !== undefined && TKUnit.assertEqual(slider.minValue, min, "slider.minValue");
max !== undefined && TKUnit.assertEqual(slider.maxValue, max, "slider.maxValue");
value !== undefined && TKUnit.assertEqual(slider.value, value, "slider.value");
// tslint:enable
}

function getNativeValue(slider: Slider): number {
if (slider.android) {
return slider.android.getProgress();
}
else if (slider.ios) {
} else if (slider.ios) {
return slider.ios.value;
}
}
Expand Down
5 changes: 2 additions & 3 deletions tns-core-modules/ui/slider/slider.android.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ export class Slider extends SliderBase {
try {
nativeView.setMax(newMaxValue);
nativeView.setProgress(newValue);
}
finally {
} finally {
this._supressNativeValue = false;
}
}
Expand All @@ -102,7 +101,7 @@ export class Slider extends SliderBase {
return 100;
}
[maxValueProperty.setNative](value: number) {
this.nativeView.setMax(value - this.minValue);
this.setNativeValuesSilently(value - this.minValue, value);
}

[colorProperty.getDefault](): number {
Expand Down

0 comments on commit 6184338

Please sign in to comment.