Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-04 18:26:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

[fxcop] image resizer ui (#6841)

Browse Source 
* adjustments

* Settings fixed

* Getting resizing tests operational again

* fixed default vs loading from settings

* one small tewak
This commit is contained in:
Clint Rutkas
2020-10-01 11:33:23 -07:00
committed by GitHub
parent 19b519638f
commit c219fe0d1d
21 changed files with 141 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/imageresizer/tests/Models/ResizeBatchTests.cs
View File

@@ -62,7 +62,7 @@ namespace ImageResizer.Models
batch.Files.Add("Image1.jpg");
batch.Files.Add("Image2.jpg");
var errors = batch.Process(CancellationToken.None, (_, __) => { }).ToList();
var errors = batch.Process((_, __) => { }, CancellationToken.None).ToList();
Assert.Equal(2, errors.Count);
@@ -89,8 +89,8 @@ namespace ImageResizer.Models
var calls = new ConcurrentBag<(int i, double count)>();
batch.Process(
CancellationToken.None,
(i, count) => calls.Add((i, count)));
(i, count) => calls.Add((i, count)),
CancellationToken.None);
Assert.Equal(2, calls.Count);
Assert.Contains(calls, c => c.i == 1 && c.count == 2);

20
src/modules/imageresizer/tests/Models/ResizeOperationTests.cs
View File

@@ -430,19 +430,19 @@ namespace ImageResizer.Models
private static Settings Settings(Action<Settings> action = null)
{
var settings = new Settings
var settings = new Settings()
{
Sizes = new ObservableCollection<ResizeSize>
{
new ResizeSize
{
Name = "Test",
Width = 96,
Height = 96,
},
},
SelectedSizeIndex = 0,
};
settings.Sizes.Clear();
settings.Sizes.Add(new ResizeSize
{
Name = "Test",
Width = 96,
Height = 96,
});
action?.Invoke(settings);
return settings;

20
src/modules/imageresizer/tests/Properties/SettingsTests.cs
View File

@@ -30,9 +30,10 @@ namespace ImageResizer.Properties
{
var settings = new Settings
{
Sizes = new ObservableCollection<ResizeSize>(),
CustomSize = new CustomSize(),
};
settings.Sizes.Clear();
var ncc = (INotifyCollectionChanged)settings.AllSizes;
var result = AssertEx.Raises<NotifyCollectionChangedEventArgs>(
@@ -48,10 +49,10 @@ namespace ImageResizer.Properties
{
var settings = new Settings
{
Sizes = new ObservableCollection<ResizeSize>(),
CustomSize = new CustomSize(),
};
settings.Sizes.Clear();
Assert.PropertyChanged(
(INotifyPropertyChanged)settings.AllSizes,
"Item[]",
@@ -63,10 +64,10 @@ namespace ImageResizer.Properties
{
var settings = new Settings
{
Sizes = new ObservableCollection<ResizeSize> { new ResizeSize() },
CustomSize = new CustomSize(),
};
settings.Sizes.Add(new ResizeSize());
Assert.Contains(settings.Sizes[0], settings.AllSizes);
}
@@ -75,9 +76,9 @@ namespace ImageResizer.Properties
{
var settings = new Settings
{
Sizes = new ObservableCollection<ResizeSize>(),
CustomSize = new CustomSize(),
};
settings.Sizes.Clear();
Assert.Contains(settings.CustomSize, settings.AllSizes);
}
@@ -88,9 +89,10 @@ namespace ImageResizer.Properties
var originalCustomSize = new CustomSize();
var settings = new Settings
{
Sizes = new ObservableCollection<ResizeSize>(),
CustomSize = originalCustomSize,
};
settings.Sizes.Clear();
var ncc = (INotifyCollectionChanged)settings.AllSizes;
var result = AssertEx.Raises<NotifyCollectionChangedEventArgs>(
@@ -126,9 +128,9 @@ namespace ImageResizer.Properties
var settings = new Settings
{
SelectedSizeIndex = index,
Sizes = new ObservableCollection<ResizeSize>(),
CustomSize = new CustomSize(),
};
settings.Sizes.Clear();
var result = settings.SelectedSize;
@@ -141,12 +143,9 @@ namespace ImageResizer.Properties
var settings = new Settings
{
SelectedSizeIndex = 0,
Sizes = new ObservableCollection<ResizeSize>
{
new ResizeSize(),
},
};
settings.Sizes.Add(new ResizeSize());
var result = settings.SelectedSize;
Assert.Same(settings.Sizes[0], result);
@@ -265,7 +264,6 @@ namespace ImageResizer.Properties
Assert.PropertyChanged(settings, "PngInterlaceOption", action);
Assert.PropertyChanged(settings, "TiffCompressOption", action);
Assert.PropertyChanged(settings, "FileName", action);
Assert.PropertyChanged(settings, "Sizes", action);
Assert.PropertyChanged(settings, "KeepDateModified", action);
Assert.PropertyChanged(settings, "FallbackEncoder", action);
Assert.PropertyChanged(settings, "CustomSize", action);