huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ignore case on handlerVersion (#941)

This commit is contained in:
Justin Kotalik 2018-06-20 09:11:19 -07:00 committed by GitHub
parent 0a97bf9ae8
commit 1e823d88e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 61 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AspNetCoreModuleV2/CommonLib/config_utility.h
View File

@ -68,7 +68,7 @@ public:
} }
if (strHandlerName.Equals(CS_ASPNETCORE_HANDLER_VERSION)) if (strHandlerName.Equals(CS_ASPNETCORE_HANDLER_VERSION, TRUE))
{ {
hr = strHandlerVersionValue->Copy(strHandlerValue); hr = strHandlerVersionValue->Copy(strHandlerValue);
goto Finished; goto Finished;

121
test/CommonLibTests/ConfigUtilityTests.cpp
View File

@ -8,75 +8,69 @@ using ::testing::NiceMock;
namespace ConfigUtilityTests namespace ConfigUtilityTests
{ {
TEST(ConfigUtilityTest, HandlerVersionSet) using ::testing::Test;
class ConfigUtilityTest : public Test
{ {
IAppHostElement* retElement = NULL; protected:
void Test(std::wstring key, std::wstring value, std::wstring expected)
{
IAppHostElement* retElement = NULL;
STRU handlerVersion; STRU handlerVersion;
BSTR bstrKey = SysAllocString(key.c_str());
BSTR bstrValue = SysAllocString(value.c_str());
// NiceMock removes warnings about "uninteresting calls", // NiceMock removes warnings about "uninteresting calls",
auto element = std::make_unique<NiceMock<MockElement>>(); auto element = std::make_unique<NiceMock<MockElement>>();
auto innerElement = std::make_unique<NiceMock<MockElement>>(); auto innerElement = std::make_unique<NiceMock<MockElement>>();
auto collection = std::make_unique<NiceMock<MockCollection>>(); auto collection = std::make_unique<NiceMock<MockCollection>>();
auto nameElement = std::make_unique<NiceMock<MockElement>>(); auto nameElement = std::make_unique<NiceMock<MockElement>>();
auto mockProperty = std::make_unique<NiceMock<MockProperty>>(); auto mockProperty = std::make_unique<NiceMock<MockProperty>>();
ON_CALL(*element, GetElementByName(_, _)) ON_CALL(*element, GetElementByName(_, _))
.WillByDefault(DoAll(testing::SetArgPointee<1>(innerElement.get()), testing::Return(S_OK))); .WillByDefault(DoAll(testing::SetArgPointee<1>(innerElement.get()), testing::Return(S_OK)));
ON_CALL(*innerElement, get_Collection(_)) ON_CALL(*innerElement, get_Collection(_))
.WillByDefault(testing::DoAll(testing::SetArgPointee<0>(collection.get()), testing::Return(S_OK))); .WillByDefault(testing::DoAll(testing::SetArgPointee<0>(collection.get()), testing::Return(S_OK)));
ON_CALL(*collection, get_Count(_)) ON_CALL(*collection, get_Count(_))
.WillByDefault(DoAll(testing::SetArgPointee<0>(1), testing::Return(S_OK))); .WillByDefault(DoAll(testing::SetArgPointee<0>(1), testing::Return(S_OK)));
ON_CALL(*collection, get_Item(_, _)) ON_CALL(*collection, get_Item(_, _))
.WillByDefault(DoAll(testing::SetArgPointee<1>(nameElement.get()), testing::Return(S_OK))); .WillByDefault(DoAll(testing::SetArgPointee<1>(nameElement.get()), testing::Return(S_OK)));
ON_CALL(*nameElement, GetPropertyByName(_, _)) ON_CALL(*nameElement, GetPropertyByName(_, _))
.WillByDefault(DoAll(testing::SetArgPointee<1>(mockProperty.get()), testing::Return(S_OK))); .WillByDefault(DoAll(testing::SetArgPointee<1>(mockProperty.get()), testing::Return(S_OK)));
EXPECT_CALL(*mockProperty, get_StringValue(_)) EXPECT_CALL(*mockProperty, get_StringValue(_))
.WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"handlerVersion")), testing::Return(S_OK))) .WillOnce(DoAll(testing::SetArgPointee<0>(bstrKey), testing::Return(S_OK)))
.WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"value")), testing::Return(S_OK))); .WillOnce(DoAll(testing::SetArgPointee<0>(bstrValue), testing::Return(S_OK)));
HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), &handlerVersion); HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), &handlerVersion);
EXPECT_STREQ(handlerVersion.QueryStr(), L"value"); EXPECT_STREQ(handlerVersion.QueryStr(), expected.c_str());
SysFreeString(bstrKey);
SysFreeString(bstrValue);
}
};
TEST_F(ConfigUtilityTest, CheckHandlerVersionKeysAndValues)
{
Test(L"handlerVersion", L"value", L"value");
Test(L"handlerversion", L"value", L"value");
Test(L"HandlerversioN", L"value", L"value");
Test(L"randomvalue", L"value", L"");
Test(L"", L"value", L"");
Test(L"", L"", L"");
} }
TEST(ConfigUtilityTest, NoHandlerVersion) TEST(ConfigUtilityTestSingle, MultipleElements)
{
IAppHostElement* retElement = NULL;
STRU handlerVersion;
// NiceMock removes warnings about "uninteresting calls",
auto element = std::make_unique<NiceMock<MockElement>>();
auto innerElement = std::make_unique<NiceMock<MockElement>>();
auto collection = std::make_unique<NiceMock<MockCollection>>();
auto nameElement = std::make_unique<NiceMock<MockElement>>();
auto mockProperty = std::make_unique<NiceMock<MockProperty>>();
ON_CALL(*element, GetElementByName(_, _))
.WillByDefault(DoAll(testing::SetArgPointee<1>(innerElement.get()), testing::Return(S_OK)));
ON_CALL(*innerElement, get_Collection(_))
.WillByDefault(testing::DoAll(testing::SetArgPointee<0>(collection.get()), testing::Return(S_OK)));
ON_CALL(*collection, get_Count(_))
.WillByDefault(DoAll(testing::SetArgPointee<0>(1), testing::Return(S_OK)));
ON_CALL(*collection, get_Item(_, _))
.WillByDefault(DoAll(testing::SetArgPointee<1>(nameElement.get()), testing::Return(S_OK)));
ON_CALL(*nameElement, GetPropertyByName(_, _))
.WillByDefault(DoAll(testing::SetArgPointee<1>(mockProperty.get()), testing::Return(S_OK)));
EXPECT_CALL(*mockProperty, get_StringValue(_))
.WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"randomvalue")), testing::Return(S_OK)))
.WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"value")), testing::Return(S_OK)));
HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), &handlerVersion);
EXPECT_STREQ(handlerVersion.QueryStr(), L"");
}
TEST(ConfigUtilityTest, MultipleElements)
{ {
IAppHostElement* retElement = NULL; IAppHostElement* retElement = NULL;
STRU handlerVersion; STRU handlerVersion;
BSTR bstrKey = SysAllocString(L"key");
BSTR bstrValue = SysAllocString(L"value");
BSTR bstrKey2 = SysAllocString(L"handlerVersion");
BSTR bstrValue2 = SysAllocString(L"value2");
auto element = std::make_unique<NiceMock<MockElement>>(); auto element = std::make_unique<NiceMock<MockElement>>();
auto innerElement = std::make_unique<NiceMock<MockElement>>(); auto innerElement = std::make_unique<NiceMock<MockElement>>();
auto collection = std::make_unique<NiceMock<MockCollection>>(); auto collection = std::make_unique<NiceMock<MockCollection>>();
@ -94,13 +88,18 @@ namespace ConfigUtilityTests
ON_CALL(*nameElement, GetPropertyByName(_, _)) ON_CALL(*nameElement, GetPropertyByName(_, _))
.WillByDefault(DoAll(testing::SetArgPointee<1>(mockProperty.get()), testing::Return(S_OK))); .WillByDefault(DoAll(testing::SetArgPointee<1>(mockProperty.get()), testing::Return(S_OK)));
EXPECT_CALL(*mockProperty, get_StringValue(_)) EXPECT_CALL(*mockProperty, get_StringValue(_))
.WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"key")), testing::Return(S_OK))) .WillOnce(DoAll(testing::SetArgPointee<0>(bstrKey), testing::Return(S_OK)))
.WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"value")), testing::Return(S_OK))) .WillOnce(DoAll(testing::SetArgPointee<0>(bstrValue), testing::Return(S_OK)))
.WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"handlerVersion")), testing::Return(S_OK))) .WillOnce(DoAll(testing::SetArgPointee<0>(bstrKey2), testing::Return(S_OK)))
.WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"value2")), testing::Return(S_OK))); .WillOnce(DoAll(testing::SetArgPointee<0>(bstrValue2), testing::Return(S_OK)));
HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), &handlerVersion); HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), &handlerVersion);
EXPECT_STREQ(handlerVersion.QueryStr(), L"value2"); EXPECT_STREQ(handlerVersion.QueryStr(), L"value2");
SysFreeString(bstrKey);
SysFreeString(bstrValue);
SysFreeString(bstrKey2);
SysFreeString(bstrValue2);
} }
} }