yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5

Browse Source
This commit is contained in:
Shannon
2014-08-20 18:04:11 -06:00
parent de1b69d5ae 03358ca1ca
commit fc558198d2
2 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Umbraco.Core/PropertyEditors/ValueConverters/YesNoValueConverter.cs
View File

@@ -16,12 +16,34 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
{
// in xml a boolean is: string
// in the database a boolean is: string "1" or "0" or empty
// the converter does not need to handle anything else ("true"...)
// typically the converter does not need to handle anything else ("true"...)
// however there are cases where the value passed to the converter could be a non-string object, e.g. int, bool
if (source is string)
{
var str = (string)source;
if (str == null || str.Length == 0 || str == "0")
return false;
if (str == "1")
return true;
bool result;
if (bool.TryParse(str, out result))
return result;
return false;
}
if (source is int)
return (int)source == 1;
if (source is bool)
return (bool)source;
// default value is: false
var sourceString = source as string;
if (sourceString == null) return false;
return sourceString == "1";
return false;
}
// default ConvertSourceToObject just returns source ie a boolean value
@@ -29,7 +51,7 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
public override object ConvertSourceToXPath(PublishedPropertyType propertyType, object source, bool preview)
{
// source should come from ConvertSource and be a boolean already
return (bool) source ? "1" : "0";
return (bool)source ? "1" : "0";
}
}
}

36
src/Umbraco.Tests/PropertyEditors/PropertyEditorValueConverterTests.cs
View File

@@ -36,27 +36,27 @@ namespace Umbraco.Tests.PropertyEditors
Assert.AreNotEqual(dateTime.Date, ((DateTime)result).Date);
}
// see the notes in the converter
// values such as "true" are NOT expected here
//[TestCase("TRUE", true)]
//[TestCase("True", true)]
//[TestCase("true", true)]
[TestCase("1", true)]
//[TestCase("FALSE", false)]
//[TestCase("False", false)]
//[TestCase("false", false)]
[TestCase("0", false)]
[TestCase("", false)]
[TestCase("true", false)]
[TestCase("TRUE", true)]
[TestCase("True", true)]
[TestCase("true", true)]
[TestCase("1", true)]
[TestCase(1, true)]
[TestCase(true, true)]
[TestCase("FALSE", false)]
[TestCase("False", false)]
[TestCase("false", false)]
[TestCase("0", false)]
[TestCase(0, false)]
[TestCase(false, false)]
[TestCase("", false)]
[TestCase(null, false)]
[TestCase("blah", false)]
public void CanConvertYesNoPropertyEditor(string value, bool expected)
{
var converter = new YesNoValueConverter();
public void CanConvertYesNoPropertyEditor(object value, bool expected)
{
var converter = new YesNoValueConverter();
var result = converter.ConvertDataToSource(null, value, false); // does not use type for conversion
Assert.AreEqual(expected, result);
}
Assert.AreEqual(expected, result);
}
}
}