From 7ce8a193622b8554642f87acb8be81b2315d7974 Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Tue, 12 Nov 2019 15:17:10 +0900 Subject: [PATCH 1/1] Revert "(Automated Tests) Updates after addition of rotation gesture" This reverts commit fd7cd9e8206bddcd164d0eaa4cfbe664008acc89. Change-Id: Iae6fb45f334e21912ededf0a87d4cbb095c4ecc1 --- .../test-gesture-generator.cpp | 32 ---------------------- .../dali-test-suite-utils/test-gesture-generator.h | 20 -------------- 2 files changed, 52 deletions(-) diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gesture-generator.cpp b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gesture-generator.cpp index c0b55ce..a0ac206 100644 --- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gesture-generator.cpp +++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gesture-generator.cpp @@ -161,36 +161,4 @@ void TestGenerateTwoPointTap( TestApplication& application, float x1, float y1, application.ProcessEvent( GenerateDoubleTouch( PointState::UP, Vector2( x1, y1 ), PointState::UP, Vector2( x2, y2 ), time_down + 20 ) ); } -void TestGenerateRotation( TestApplication& application ) -{ - application.ProcessEvent( GenerateDoubleTouch( PointState::DOWN, Vector2( 20.0f, 20.0f ), PointState::DOWN, Vector2( 20.0f, 90.0f ), 150 ) ); - application.ProcessEvent( GenerateDoubleTouch( PointState::MOTION, Vector2( 20.0f, 20.0f ), PointState::MOTION, Vector2( 25.0f, 95.0f ), 160 ) ); - application.ProcessEvent( GenerateDoubleTouch( PointState::MOTION, Vector2( 20.0f, 20.0f ), PointState::MOTION, Vector2( 30.0f, 100.0f ), 170 ) ); - application.ProcessEvent( GenerateDoubleTouch( PointState::MOTION, Vector2( 20.0f, 20.0f ), PointState::MOTION, Vector2( 35.0f, 105.0f ), 180 ) ); - application.ProcessEvent( GenerateDoubleTouch( PointState::MOTION, Vector2( 20.0f, 20.0f ), PointState::MOTION, Vector2( 40.0f, 110.0f ), 190 ) ); - application.ProcessEvent( GenerateDoubleTouch( PointState::UP, Vector2( 20.0f, 20.0f ), PointState::UP, Vector2( 45.0f, 115.0f ), 200 ) ); -} - -void TestStartRotation( TestApplication& application, Vector2 a1, Vector2 b1, Vector2 a2, Vector2 b2, uint32_t time ) -{ - application.ProcessEvent( GenerateDoubleTouch( PointState::DOWN, a1, PointState::DOWN, b1, time ) ); - application.ProcessEvent( GenerateDoubleTouch( PointState::MOTION, a2, PointState::MOTION, b2, time + 50 ) ); - application.ProcessEvent( GenerateDoubleTouch( PointState::MOTION, a2, PointState::MOTION, b2, time + 100 ) ); - application.ProcessEvent( GenerateDoubleTouch( PointState::MOTION, a2, PointState::MOTION, b2, time + 150 ) ); -} - -void TestContinueRotation( TestApplication& application, Vector2 a1, Vector2 b1, Vector2 a2, Vector2 b2, uint32_t time ) -{ - application.ProcessEvent( GenerateDoubleTouch( PointState::MOTION, a1, PointState::MOTION, b1, time ) ); - application.ProcessEvent( GenerateDoubleTouch( PointState::MOTION, a1, PointState::MOTION, b1, time + 50 ) ); - application.ProcessEvent( GenerateDoubleTouch( PointState::MOTION, a2, PointState::MOTION, b2, time + 100 ) ); - application.ProcessEvent( GenerateDoubleTouch( PointState::MOTION, a2, PointState::MOTION, b2, time +150 ) ); -} - -void TestEndRotation( TestApplication& application, Vector2 a1, Vector2 b1, Vector2 a2, Vector2 b2, uint32_t time ) -{ - application.ProcessEvent( GenerateDoubleTouch( PointState::MOTION, a1, PointState::MOTION, b1, time ) ); - application.ProcessEvent( GenerateDoubleTouch( PointState::UP, a2, PointState::UP, b2, time +50 ) ); -} - } // namespace Dali diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gesture-generator.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gesture-generator.h index 18051cf..80611a0 100644 --- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gesture-generator.h +++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gesture-generator.h @@ -103,26 +103,6 @@ void TestGenerateTap( TestApplication& application, float x = 20.0f, float y = 2 */ void TestGenerateTwoPointTap( TestApplication& application, float x1, float y1, float x2, float y2, uint32_t time_down ); -/** - * Produces a rotation gesture. - */ -void TestGenerateRotation( TestApplication& application ); - -/** - * Produces the gesture started event of a rotation, using 4 touches, 50ms apart, starting with 1, ending at 2 - */ -void TestStartRotation( TestApplication& application, Vector2 a1, Vector2 b1, Vector2 a2, Vector2 b2, uint32_t time ); - -/** - * Produces a gesture continuing event of a rotation, using 4 touches, 50ms apart, starting with 1, ending at 2 - */ -void TestContinueRotation( TestApplication& application, Vector2 a1, Vector2 b1, Vector2 a2, Vector2 b2, uint32_t time ); - -/** - * Produces a gesture finished event of a rotation, using 2 touches, 50ms apart - */ -void TestEndRotation( TestApplication& application, Vector2 a1, Vector2 b1, Vector2 a2, Vector2 b2, uint32_t time ); - } // namespace Dali #endif // DALI_TEST_GESTURE_GENERATOR_H -- 2.7.4