← Back to branch summary

~townsend/compiz/fix-auto-vp-switch-0.9.10

« back to all changes in this revision

Viewing changes to plugins/expo/src/wall_offset/tests/test-expo-wall-offset.cpp

  • Committer: Chris Townsend
  • Date: 2013-08-21 19:59:10 UTC
  • mto: This revision was merged to the branch mainline in revision 3783.
  • Revision ID: christopher.townsend@canonical.com-20130821195910-rfvh9j8c1h21q2tk
https://launchpad.net/bugs/1031710
Removed logic in the calculateWallOffset() function in the Expo plugin that only accounted for offsetting the expo animation on the left-most and top-most monitor.
Also removed the TestNoOffsetIfOutputIsNotOrigin test since this test is now invalid.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/expo/src/wall_offset/tests/test-expo-wall-offset.cpp
232
232
    EXPECT_FLOAT_EQ (worldScaleFactorY, offset.animationParameters[index].worldScaleFactorY);
233
233
}
234
234
 
235
 
TEST_F (ExpoWallOffsetTest, TestNoOffsetIfOutputIsNotOrigin)
236
 
{
237
 
    compiz::expo::calculateWallOffset (CompRect (1,
238
 
                                                 1,
239
 
                                                 100,
240
 
                                                 100),
241
 
                                       CompPoint (100,
242
 
                                                  100),
243
 
                                       CompPoint (1,
244
 
                                                  1),
245
 
                                       CompSize (100,
246
 
                                                 100),
247
 
                                       offsetInWorldX,
248
 
                                       offsetInWorldY,
249
 
                                       worldScaleFactorX,
250
 
                                       worldScaleFactorY,
251
 
                                       1.0);
252
 
 
253
 
    EXPECT_FLOAT_EQ (offsetInWorldX, 0.0f);
254
 
    EXPECT_FLOAT_EQ (offsetInWorldY, 0.0f);
255
 
    EXPECT_FLOAT_EQ (worldScaleFactorX, 1.0f);
256
 
    EXPECT_FLOAT_EQ (worldScaleFactorY, 1.0f);
257
 
}
258
 
 
259
235
INSTANTIATE_TEST_CASE_P (ExpoAnimationOffsetTest,
260
236
                         ExpoWallOffsetTestAnimations,
261
237
                         Combine (ValuesIn (testingOffsetParameters),