~vanvugt/compiz-core/fix-880707.2

« back to all changes in this revision

Viewing changes to tests/timer/diffs/test-timer-diffs.cpp

Committer: Daniel van Vugt
Date: 2012-01-12 06:48:58 UTC
mfrom: (2893.2.15 compiz-core)
Revision ID: vanvugt@gmail.com-20120112064858-xcu22jq1dlerirmp

Merge with upstream changes (lp:compiz-core).

files added:
cmake/EnableCoverageReport.cmake

cmake/FindLcov.cmake

cmake/Findgcovr.cmake

cmake/ParseArguments.cmake

include/core/global.h

include/core/logmessage.h

include/core/string.h

src/logmessage

src/logmessage/CMakeLists.txt

src/logmessage/include

src/logmessage/include/core

src/logmessage/include/core/logmessage.h

src/logmessage/src

src/logmessage/tests

src/logmessage/tests/CMakeLists.txt

src/logmessage/tests/test-logmessage.cpp

src/pluginclasshandler/CMakeLists.txt

src/pluginclasshandler/include

src/pluginclasshandler/include/core

src/pluginclasshandler/src

src/pluginclasshandler/tests

src/pluginclasshandler/tests/construct/src

src/pluginclasshandler/tests/get/src

src/pluginclasshandler/tests/indexes/src

src/pluginclasshandler/tests/typenames/src

src/string

src/string/CMakeLists.txt

src/string/include

src/string/src

src/string/tests

src/string/tests/CMakeLists.txt

src/string/tests/printf

src/string/tests/printf/src

src/string/tests/printf/src/test-string-printf.cpp

src/string/tests/test-string.cpp

src/string/tests/test-string.h

src/timer

src/timer/CMakeLists.txt

src/timer/include

src/timer/include/core

src/timer/src

src/timer/tests

src/timer/tests/callbacks/src

src/timer/tests/diffs/src

src/timer/tests/diffs/src/test-timer-diffs.cpp

src/timer/tests/set-values/src

src/timer/tests/while-calling/src

files removed:
include/compiz-common.h.in

include/compiz.h

tests

tests/CMakeLists.txt

tests/pluginclasshandler/construct/CMakeLists.txt

tests/pluginclasshandler/get/CMakeLists.txt

tests/pluginclasshandler/indexes/CMakeLists.txt

tests/pluginclasshandler/typenames/CMakeLists.txt

tests/timer

tests/timer/callbacks/CMakeLists.txt

tests/timer/diffs/CMakeLists.txt

tests/timer/diffs/test-timer-diffs.cpp

tests/timer/set-values/CMakeLists.txt

tests/timer/while-calling/CMakeLists.txt

files renamed:
src/logmessage.cpp => src/logmessage/src/logmessage.cpp

tests/pluginclasshandler/ => src/pluginclasshandler/

include/core/pluginclasses.h => src/pluginclasshandler/include/core/pluginclasses.h

include/core/pluginclasshandler.h => src/pluginclasshandler/include/core/pluginclasshandler.h

include/core/valueholder.h => src/pluginclasshandler/include/core/valueholder.h

src/pluginclasses.cpp => src/pluginclasshandler/src/pluginclasses.cpp

src/valueholder.cpp => src/pluginclasshandler/src/valueholder.cpp

src/valueholder.h => src/pluginclasshandler/src/valueholder.h

tests/pluginclasshandler/CMakeLists.txt => src/pluginclasshandler/tests/CMakeLists.txt

tests/pluginclasshandler/construct/ => src/pluginclasshandler/tests/construct/

tests/pluginclasshandler/construct/test-pch-construct.cpp => src/pluginclasshandler/tests/construct/src/test-pch-construct.cpp

tests/pluginclasshandler/get/ => src/pluginclasshandler/tests/get/

tests/pluginclasshandler/get/test-pch-get.cpp => src/pluginclasshandler/tests/get/src/test-pch-get.cpp

tests/pluginclasshandler/indexes/ => src/pluginclasshandler/tests/indexes/

tests/pluginclasshandler/indexes/test-pch-indexes.cpp => src/pluginclasshandler/tests/indexes/src/test-pch-indexes.cpp

tests/pluginclasshandler/test-pluginclasshandler.cpp => src/pluginclasshandler/tests/test-pluginclasshandler.cpp

tests/pluginclasshandler/test-pluginclasshandler.h => src/pluginclasshandler/tests/test-pluginclasshandler.h

tests/pluginclasshandler/typenames/ => src/pluginclasshandler/tests/typenames/

tests/pluginclasshandler/typenames/test-pch-typenames.cpp => src/pluginclasshandler/tests/typenames/src/test-pch-typenames.cpp

src/string.cpp => src/string/src/string.cpp

include/core/timeouthandler.h => src/timer/include/core/timeouthandler.h

include/core/timer.h => src/timer/include/core/timer.h

src/privatetimeouthandler.h => src/timer/src/privatetimeouthandler.h

src/privatetimeoutsource.h => src/timer/src/privatetimeoutsource.h

src/privatetimer.h => src/timer/src/privatetimer.h

src/timeouthandler.cpp => src/timer/src/timeouthandler.cpp

src/timer.cpp => src/timer/src/timer.cpp

tests/timer/CMakeLists.txt => src/timer/tests/CMakeLists.txt

tests/timer/callbacks/ => src/timer/tests/callbacks/

tests/timer/callbacks/test-timer-callbacks.cpp => src/timer/tests/callbacks/src/test-timer-callbacks.cpp

tests/timer/diffs/ => src/timer/tests/diffs/

tests/timer/set-values/ => src/timer/tests/set-values/

tests/timer/set-values/test-timer-set-values.cpp => src/timer/tests/set-values/src/test-timer-set-values.cpp

tests/timer/test-timer.cpp => src/timer/tests/test-timer.cpp

tests/timer/test-timer.h => src/timer/tests/test-timer.h

tests/timer/while-calling/ => src/timer/tests/while-calling/

tests/timer/while-calling/test-timer-set-times-while-calling.cpp => src/timer/tests/while-calling/src/test-timer-set-times-while-calling.cpp

files modified:
CMakeLists.txt

cmake/CompizCommon.cmake

cmake/CompizPlugin.cmake

gtk/window-decorator/metacity.c

include/CMakeLists.txt

include/core/CMakeLists.txt

include/core/core.h

include/core/match.h

include/core/option.h

include/core/plugin.h

include/core/region.h

include/core/session.h

kde/window-decorator-kde4/window.cpp

metadata/CMakeLists.txt

plugins/CMakeLists.txt

plugins/composite/src/screen.cpp

plugins/decor/src/decor.cpp

plugins/decor/src/decor.h

plugins/kde/src/dispatcher.cpp

plugins/move/src/move.cpp

plugins/opengl/include/opengl/opengl.h

plugins/opengl/src/matrix.cpp

plugins/opengl/src/privates.h

plugins/opengl/src/screen.cpp

plugins/opengl/src/texture.cpp

po/POTFILES.in

src/CMakeLists.txt

src/action.cpp

src/main.cpp

src/privatescreen.h

src/region.cpp

src/screen.cpp

src/session.cpp

src/window.cpp

Show diffs side-by-side

added added

removed removed

tests/timer/diffs/test-timer-diffs.cpp

* Permission to use, copy, modify, distribute, and sell this software

* and its documentation for any purpose is hereby granted without

* fee, provided that the above copyright notice appear in all copies

* and that both that copyright notice and this permission notice

* appear in supporting documentation, and that the name of

* Canonical Ltd. not be used in advertising or publicity pertaining to

* distribution of the software without specific, written prior permission.

* Canonical Ltd. makes no representations about the suitability of this

* software for any purpose. It is provided "as is" without express or

* implied warranty.

* CANONICAL, LTD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN

* NO EVENT SHALL CANONICAL, LTD. BE LIABLE FOR ANY SPECIAL, INDIRECT OR

* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS

* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

* Authored by: Sam Spilsbury <sam.spilsbury@canonical.com>

#include "test-timer.h"

bool

CompTimerTestDiffs::cb (int timernum, CompTimer *t1, CompTimer *t2, CompTimer *t3)

{

if (timernum == 1 || timernum == 2 || timernum == 3)

{

std::cout << "INFO: executing timer " << timernum << std::endl;

std::cout << "INFO: t1->minLeft " << t1->minLeft () << std::endl << \

"INFO: t1->maxLeft " << t1->maxLeft () << std::endl << \

"INFO: t1->minTime " << t1->minTime () << std::endl << \

"INFO: t1->maxTime " << t1->maxTime () << std::endl;

std::cout << "INFO: t2->minLeft " << t2->minLeft () << std::endl << \

"INFO: t2->maxLeft " << t2->maxLeft () << std::endl << \

"INFO: t2->minTime " << t2->minTime () << std::endl << \

"INFO: t2->maxTime " << t2->maxTime () << std::endl;

std::cout << "INFO: t3->minLeft " << t3->minLeft () << std::endl << \

"INFO: t3->maxLeft " << t3->maxLeft () << std::endl << \

"INFO: t3->minTime " << t3->minTime () << std::endl << \

"INFO: t3->maxTime " << t3->maxTime () << std::endl;

}

if (timernum == 3)

ml->quit ();

std::cout << "return false" << std::endl;

return false;

}

void

CompTimerTestDiffs::precallback ()

{

CompTimer *t1, *t2, *t3;

std::cout << "-= TEST: checking timeout diff" << std::endl;

t1 = new CompTimer ();

t2 = new CompTimer ();

t3 = new CompTimer ();

timers.push_back (t1);

timers.push_back (t2);

timers.push_back (t3);

t1->setCallback (boost::bind (&CompTimerTestDiffs::cb, this, 1, t1, t2, t3));

t1->setTimes (1000, 1100);

t1->start ();

t2->setCallback (boost::bind (&CompTimerTestDiffs::cb, this, 2, t1, t2, t3));

t2->setTimes (2000, 2100);

t2->start ();

t3->setCallback (boost::bind (&CompTimerTestDiffs::cb, this, 3, t1, t2, t3));

t3->setTimes (3000, 3100);

t3->start ();

}

Older »