diff --git a/src/tests/unit_tests/uihtml_tests.cpp b/src/tests/unit_tests/uihtml_tests.cpp index b2e1a9ea5..3f58f51e5 100644 --- a/src/tests/unit_tests/uihtml_tests.cpp +++ b/src/tests/unit_tests/uihtml_tests.cpp @@ -244,7 +244,8 @@ UTEST( UIHTML, redditOldThreadWebViewSmoke ) { ContextSettings( false, 0, 0, GLv_default, true, false ) ); FileSystem::changeWorkingDirectory( Sys::getProcessPath() ); - if ( !FileSystem::fileExists( "assets/html/reddit_old_thread_files/reddit.ETA_etA2z5U.css" ) ) { + if ( !FileSystem::fileExists( Sys::getProcessPath() + + "assets/html/reddit_old_thread_files/reddit.ETA_etA2z5U.css" ) ) { Engine::destroySingleton(); UTEST_SKIP( "old Reddit fixture CSS asset is not readable" ); @@ -411,125 +412,6 @@ UTEST( UIHTML, redditOldThreadWebViewSmoke ) { Vector2f commentContentPolicyPos = commentContentPolicy->asType()->convertToWorldSpace( { 0, 0 } ); Vector2f commentEditPos = commentEdit->asType()->convertToWorldSpace( { 0, 0 } ); - -/* Vector2f sidePos = side->asType()->convertToWorldSpace( { 0, 0 } ); - Vector2f entryPos = entry->asType()->convertToWorldSpace( { 0, 0 } ); - Vector2f contentPos = content->convertToWorldSpace( { 0, 0 } ); - Vector2f redesignButtonPos = - redesignButton->asType()->convertToWorldSpace( { 0, 0 } ); - Vector2f dropChoicesPos = dropChoices->asType()->convertToWorldSpace( { 0, 0 } ); - Vector2f selftextMdPos = selftextMd->asType()->convertToWorldSpace( { 0, 0 } ); - Vector2f selftextFirstPPos = - selftextFirstP->asType()->convertToWorldSpace( { 0, 0 } ); - Vector2f postTitlePos = postTitle->asType()->convertToWorldSpace( { 0, 0 } ); - Vector2f postTaglinePos = postTagline->asType()->convertToWorldSpace( { 0, 0 } ); - Vector2f postExpandoPos = postExpando->asType()->convertToWorldSpace( { 0, 0 } ); - Vector2f postUsertextPos = postUsertext->asType()->convertToWorldSpace( { 0, 0 } ); - Vector2f commentAreaPos = commentArea->asType()->convertToWorldSpace( { 0, 0 } ); - Vector2f commentFormPos = commentForm->asType()->convertToWorldSpace( { 0, 0 } ); - Vector2f commentTextareaPos = - commentTextarea->asType()->convertToWorldSpace( { 0, 0 } ); - - auto fontSizeOf = []( Node* node ) -> Uint32 { - return node->isType( UI_TYPE_RICHTEXT ) ? node->asType()->getFontSize() : 0; - }; - - std::cerr << "old reddit rects: " - << "side=(" << sidePos.x << "," << sidePos.y << " " - << side->asType()->getPixelsSize().getWidth() << "x" - << side->asType()->getPixelsSize().getHeight() << ") " - << "content=(" << contentPos.x << "," << contentPos.y << " " - << content->getPixelsSize().getWidth() << "x" << content->getPixelsSize().getHeight() - << ") " - << "midcol=(" << midcolPos.x << "," << midcolPos.y << " " - << midcol->asType()->getPixelsSize().getWidth() << "x" - << midcol->asType()->getPixelsSize().getHeight() << ") " - << "entry=(" << entryPos.x << "," << entryPos.y << " " - << entry->asType()->getPixelsSize().getWidth() << "x" - << entry->asType()->getPixelsSize().getHeight() << ") " - << "arrow=(" << arrowPos.x << "," << arrowPos.y << " " - << arrow->asType()->getPixelsSize().getWidth() << "x" - << arrow->asType()->getPixelsSize().getHeight() << ") " - << "srHeader=(" << srHeaderPos.x << "," << srHeaderPos.y << " " - << srHeader->asType()->getPixelsSize().getWidth() << "x" - << srHeader->asType()->getPixelsSize().getHeight() << ") " - << "redesignButton=(" << redesignButtonPos.x << "," << redesignButtonPos.y << " " - << redesignButton->asType()->getPixelsSize().getWidth() << "x" - << redesignButton->asType()->getPixelsSize().getHeight() << ") " - << "srDrop=(" << srDropPos.x << "," << srDropPos.y << " " - << srDrop->asType()->getPixelsSize().getWidth() << "x" - << srDrop->asType()->getPixelsSize().getHeight() << " float=" - << CSSFloatHelper::toString( srDrop->asType()->getCSSFloat() ) << ") " - << "srList=(" << srListPos.x << "," << srListPos.y << " " - << srList->asType()->getPixelsSize().getWidth() << "x" - << srList->asType()->getPixelsSize().getHeight() - << " lines=" << srList->asType()->getRichTextPtr()->getLines().size() - << " wrap=" << srList->asType()->getLineWrap() << ") " - << "headerBottomLeft=(" << headerBottomLeftPos.x << "," << headerBottomLeftPos.y - << " " << headerBottomLeft->asType()->getPixelsSize().getWidth() << "x" - << headerBottomLeft->asType()->getPixelsSize().getHeight() << ") " - << "headerBottomRight=(" << headerBottomRightPos.x << "," << headerBottomRightPos.y - << " " << headerBottomRight->asType()->getPixelsSize().getWidth() << "x" - << headerBottomRight->asType()->getPixelsSize().getHeight() << " position=" - << CSSPositionHelper::toString( - headerBottomRight->asType()->getCSSPosition() ) - << ") " - << "header=(" << headerPos.x << "," << headerPos.y << " " - << header->asType()->getPixelsSize().getWidth() << "x" - << header->asType()->getPixelsSize().getHeight() - << " offset=" << header->asType()->getPixelsContentOffset().Left << "," - << header->asType()->getPixelsContentOffset().Top << "," - << header->asType()->getPixelsContentOffset().Right << "," - << header->asType()->getPixelsContentOffset().Bottom << ") " - << "dropChoices=(" << dropChoicesPos.x << "," << dropChoicesPos.y << " " - << dropChoices->asType()->getPixelsSize().getWidth() << "x" - << dropChoices->asType()->getPixelsSize().getHeight() - << " visible=" << dropChoices->asType()->isVisible() << " display=" - << CSSDisplayHelper::toString( dropChoices->asType()->getDisplay() ) - << ") " - << "selftextMd=(" << selftextMdPos.x << "," << selftextMdPos.y << " " - << selftextMd->asType()->getPixelsSize().getWidth() << "x" - << selftextMd->asType()->getPixelsSize().getHeight() - << " font=" << fontSizeOf( selftextMd ) << ") " - << "selftextFirstP=(" << selftextFirstPPos.x << "," << selftextFirstPPos.y << " " - << selftextFirstP->asType()->getPixelsSize().getWidth() << "x" - << selftextFirstP->asType()->getPixelsSize().getHeight() - << " font=" << fontSizeOf( selftextFirstP ) << ") " - << "postTitle=(" << postTitlePos.x << "," << postTitlePos.y << " " - << postTitle->asType()->getPixelsSize().getWidth() << "x" - << postTitle->asType()->getPixelsSize().getHeight() - << " font=" << fontSizeOf( postTitle ) << ") " - << "postTagline=(" << postTaglinePos.x << "," << postTaglinePos.y << " " - << postTagline->asType()->getPixelsSize().getWidth() << "x" - << postTagline->asType()->getPixelsSize().getHeight() - << " font=" << fontSizeOf( postTagline ) << ") " - << "postExpando=(" << postExpandoPos.x << "," << postExpandoPos.y << " " - << postExpando->asType()->getPixelsSize().getWidth() << "x" - << postExpando->asType()->getPixelsSize().getHeight() << ") " - << "postUsertext=(" << postUsertextPos.x << "," << postUsertextPos.y << " " - << postUsertext->asType()->getPixelsSize().getWidth() << "x" - << postUsertext->asType()->getPixelsSize().getHeight() << ") " - << "commentArea=(" << commentAreaPos.x << "," << commentAreaPos.y << " " - << commentArea->asType()->getPixelsSize().getWidth() << "x" - << commentArea->asType()->getPixelsSize().getHeight() << ") " - << "commentForm=(" << commentFormPos.x << "," << commentFormPos.y << " " - << commentForm->asType()->getPixelsSize().getWidth() << "x" - << commentForm->asType()->getPixelsSize().getHeight() << ") " - << "commentEdit=(" << commentEditPos.x << "," << commentEditPos.y << " " - << commentEdit->asType()->getPixelsSize().getWidth() << "x" - << commentEdit->asType()->getPixelsSize().getHeight() << ") " - << "commentTextarea=(" << commentTextareaPos.x << "," << commentTextareaPos.y << " " - << commentTextarea->asType()->getPixelsSize().getWidth() << "x" - << commentTextarea->asType()->getPixelsSize().getHeight() << ") " - << "commentContentPolicy=(" << commentContentPolicyPos.x << "," - << commentContentPolicyPos.y << " " - << commentContentPolicy->asType()->getPixelsSize().getWidth() << "x" - << commentContentPolicy->asType()->getPixelsSize().getHeight() << ") " - << "commentHelpToggle=(" << commentHelpTogglePos.x << "," << commentHelpTogglePos.y - << " " << commentHelpToggle->asType()->getPixelsSize().getWidth() << "x" - << commentHelpToggle->asType()->getPixelsSize().getHeight() << ")" - << std::endl; - */ const Float midcolCenter = midcolPos.x + midcol->asType()->getPixelsSize().getWidth() / 2.f; const Float arrowCenter =