X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali%2Futc-Dali-Font.cpp;h=1d1ea6281916e8ed9a3fdb40977a30bcd2fac7ae;hb=a2eb3fd9ac9aedb2532c0a7a2795be1d23b8b773;hp=eb12005b20d3a892941c45b5e4dd8530c7b1320e;hpb=8f2c5571c924479b6a07a2c2187dedd9c685baf0;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/automated-tests/src/dali/utc-Dali-Font.cpp b/automated-tests/src/dali/utc-Dali-Font.cpp index eb12005..1d1ea62 100644 --- a/automated-tests/src/dali/utc-Dali-Font.cpp +++ b/automated-tests/src/dali/utc-Dali-Font.cpp @@ -1,24 +1,25 @@ -// -// Copyright (c) 2014 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.0 (the License); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://floralicense.org/license/ -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an AS IS BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// +/* + * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ #include #include #include -#include +#include #include using namespace Dali; @@ -332,8 +333,7 @@ int UtcFontMeasureText(void) DALI_TEST_EQUALS(size.height, 7.5868f, Math::MACHINE_EPSILON_1000, TEST_LOCATION); - Text text = Text(std::string("t"))[0]; - Character c = text[0]; + Character c = Text(std::string("t"))[0]; size = font.MeasureText(c); // character size is square @@ -407,8 +407,7 @@ int UtcFontAllGlyphsSupported(void) application.GetPlatform().ResetTrace(); - Text text = Text(std::string("t"))[0]; - Character c = text[0]; + Character c = Text(std::string("t"))[0]; font.AllGlyphsSupported(c); DALI_TEST_CHECK(application.GetPlatform().WasCalled(TestPlatformAbstraction::AllGlyphsSupportedFunc));