Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable every drawing test manually instead of using exit(0). #1434

Merged
merged 1 commit into from
Nov 21, 2016
Merged

Disable every drawing test manually instead of using exit(0). #1434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions tests/UnitTests/CoreGraphics.drawing/CGContextDrawingTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@

#include "DrawingTest.h"

DRAW_TEST_F(CGContext, RedBox, UIKitMimicTest) {
DISABLED_DRAW_TEST_F(CGContext, RedBox, UIKitMimicTest) {
CGContextRef context = GetDrawingContext();
CGRect bounds = GetDrawingBounds();

CGContextSetRGBFillColor(context, 1.0, 0.0, 0.0, 1.0);
CGContextFillRect(context, CGRectInset(bounds, 10, 10));
}

DRAW_TEST_F(CGContext, FillThenStrokeIsSameAsDrawFillStroke, WhiteBackgroundTest) {
DISABLED_DRAW_TEST_F(CGContext, FillThenStrokeIsSameAsDrawFillStroke, WhiteBackgroundTest) {
CGContextRef context = GetDrawingContext();
CGRect bounds = GetDrawingBounds();

Expand Down Expand Up @@ -62,7 +62,7 @@ static void _drawThreeCirclesInContext(CGContextRef context, CGRect bounds) {
}
}

DRAW_TEST_F(CGContext, OverlappingCirclesColorAlpha, WhiteBackgroundTest) {
DISABLED_DRAW_TEST_F(CGContext, OverlappingCirclesColorAlpha, WhiteBackgroundTest) {
CGContextRef context = GetDrawingContext();
CGRect bounds = GetDrawingBounds();

Expand All @@ -73,7 +73,7 @@ DRAW_TEST_F(CGContext, OverlappingCirclesColorAlpha, WhiteBackgroundTest) {
_drawThreeCirclesInContext(context, bounds);
}

DRAW_TEST_F(CGContext, OverlappingCirclesGlobalAlpha, WhiteBackgroundTest) {
DISABLED_DRAW_TEST_F(CGContext, OverlappingCirclesGlobalAlpha, WhiteBackgroundTest) {
CGContextRef context = GetDrawingContext();
CGRect bounds = GetDrawingBounds();

Expand All @@ -86,7 +86,7 @@ DRAW_TEST_F(CGContext, OverlappingCirclesGlobalAlpha, WhiteBackgroundTest) {
_drawThreeCirclesInContext(context, bounds);
}

DRAW_TEST_F(CGContext, OverlappingCirclesGlobalAlphaStackedWithColorAlpha, WhiteBackgroundTest) {
DISABLED_DRAW_TEST_F(CGContext, OverlappingCirclesGlobalAlphaStackedWithColorAlpha, WhiteBackgroundTest) {
CGContextRef context = GetDrawingContext();
CGRect bounds = GetDrawingBounds();

Expand Down Expand Up @@ -119,7 +119,7 @@ DISABLED_DRAW_TEST_F(CGContext, OverlappingCirclesTransparencyLayerAlpha, WhiteB
// This test proves that the path is stored fully transformed;
// changing the CTM before stroking it does not cause it to scale!
// However, the stroke width _is_ scaled (!)
DRAW_TEST_F(CGContext, ChangeCTMAfterCreatingPath, WhiteBackgroundTest) {
DISABLED_DRAW_TEST_F(CGContext, ChangeCTMAfterCreatingPath, WhiteBackgroundTest) {
CGContextRef context = GetDrawingContext();
CGRect bounds = GetDrawingBounds();

Expand Down
3 changes: 0 additions & 3 deletions tests/UnitTests/CoreGraphics.drawing/EntryPoint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ using namespace Microsoft::WRL::Wrappers;
#endif

int main(int argc, char** argv) {
// TODO GH#1124 When we have a bitmap context, enable all these tests.
exit(0);

#ifdef WIN32
// Initialize the windows runtime, with uninitialized upon destructor invocation.
RoInitializeWrapper initialize(RO_INIT_MULTITHREADED);
Expand Down
8 changes: 4 additions & 4 deletions tests/unittests/CoreGraphics.Drawing/CGContextDrawing_FillTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include "DrawingTest.h"

DRAW_TEST_F(CGContextFill, ConcentricCirclesWinding, WhiteBackgroundTest) {
DISABLED_DRAW_TEST_F(CGContextFill, ConcentricCirclesWinding, WhiteBackgroundTest) {
CGContextRef context = GetDrawingContext();
CGRect bounds = GetDrawingBounds();

Expand All @@ -38,7 +38,7 @@ DRAW_TEST_F(CGContextFill, ConcentricCirclesWinding, WhiteBackgroundTest) {
CGPathRelease(concentricCirclesPath);
}

DRAW_TEST_F(CGContextFill, ConcentricCirclesEvenOdd, WhiteBackgroundTest) {
DISABLED_DRAW_TEST_F(CGContextFill, ConcentricCirclesEvenOdd, WhiteBackgroundTest) {
CGContextRef context = GetDrawingContext();
CGRect bounds = GetDrawingBounds();

Expand All @@ -60,7 +60,7 @@ DRAW_TEST_F(CGContextFill, ConcentricCirclesEvenOdd, WhiteBackgroundTest) {
CGPathRelease(concentricCirclesPath);
}

DRAW_TEST_F(CGContextFill, ConcentricRectsWinding, WhiteBackgroundTest) {
DISABLED_DRAW_TEST_F(CGContextFill, ConcentricRectsWinding, WhiteBackgroundTest) {
CGContextRef context = GetDrawingContext();
CGRect bounds = GetDrawingBounds();

Expand All @@ -82,7 +82,7 @@ DRAW_TEST_F(CGContextFill, ConcentricRectsWinding, WhiteBackgroundTest) {
CGPathRelease(path);
}

DRAW_TEST_F(CGContextFill, ConcentricRectsEvenOdd, WhiteBackgroundTest) {
DISABLED_DRAW_TEST_F(CGContextFill, ConcentricRectsEvenOdd, WhiteBackgroundTest) {
CGContextRef context = GetDrawingContext();
CGRect bounds = GetDrawingBounds();

Expand Down
4 changes: 2 additions & 2 deletions tests/unittests/CoreGraphics.Drawing/CGContextDrawing_ShadowTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include "DrawingTest.h"

DRAW_TEST_F(CGContext, Shadow, WhiteBackgroundTest) {
DISABLED_DRAW_TEST_F(CGContext, Shadow, WhiteBackgroundTest) {
CGContextRef context = GetDrawingContext();
CGRect bounds = GetDrawingBounds();

Expand All @@ -31,7 +31,7 @@ DRAW_TEST_F(CGContext, Shadow, WhiteBackgroundTest) {
CGContextStrokeRect(context, rect);
}

DRAW_TEST_F(CGContext, ShadowWithRotatedCTM, WhiteBackgroundTest) {
DISABLED_DRAW_TEST_F(CGContext, ShadowWithRotatedCTM, WhiteBackgroundTest) {
CGContextRef context = GetDrawingContext();
CGRect bounds = GetDrawingBounds();

Expand Down
16 changes: 8 additions & 8 deletions tests/unittests/CoreGraphics.Drawing/CGPathDrawingTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include "DrawingTest.h"

DRAW_TEST_F(CGPath, AddCurveToPoint, UIKitMimicTest) {
DISABLED_DRAW_TEST_F(CGPath, AddCurveToPoint, UIKitMimicTest) {
CGContextRef context = GetDrawingContext();
CGRect bounds = GetDrawingBounds();

Expand All @@ -36,7 +36,7 @@ DRAW_TEST_F(CGPath, AddCurveToPoint, UIKitMimicTest) {
CGPathRelease(thepath);
}

DRAW_TEST_F(CGPath, AddEllipse, UIKitMimicTest) {
DISABLED_DRAW_TEST_F(CGPath, AddEllipse, UIKitMimicTest) {
CGContextRef context = GetDrawingContext();
CGRect bounds = GetDrawingBounds();

Expand All @@ -58,7 +58,7 @@ DRAW_TEST_F(CGPath, AddEllipse, UIKitMimicTest) {
CGPathRelease(thepath);
}

DRAW_TEST_F(CGPath, AddLineToPoint, UIKitMimicTest) {
DISABLED_DRAW_TEST_F(CGPath, AddLineToPoint, UIKitMimicTest) {
CGContextRef context = GetDrawingContext();
CGRect bounds = GetDrawingBounds();

Expand Down Expand Up @@ -116,7 +116,7 @@ DISABLED_DRAW_TEST_F(CGPath, AddPath, UIKitMimicTest) {
CGPathRelease(theSecondPath);
}

DRAW_TEST_F(CGPath, AddQuadCurveToPoint, UIKitMimicTest) {
DISABLED_DRAW_TEST_F(CGPath, AddQuadCurveToPoint, UIKitMimicTest) {
CGContextRef context = GetDrawingContext();
CGRect bounds = GetDrawingBounds();

Expand All @@ -141,7 +141,7 @@ DRAW_TEST_F(CGPath, AddQuadCurveToPoint, UIKitMimicTest) {
CGPathRelease(thePath);
}

DRAW_TEST_F(CGPath, AddRect, UIKitMimicTest) {
DISABLED_DRAW_TEST_F(CGPath, AddRect, UIKitMimicTest) {
CGContextRef context = GetDrawingContext();
CGRect bounds = GetDrawingBounds();

Expand All @@ -159,7 +159,7 @@ DRAW_TEST_F(CGPath, AddRect, UIKitMimicTest) {
CGPathRelease(thePath);
}

DRAW_TEST_F(CGPath, Apply, UIKitMimicTest) {
DISABLED_DRAW_TEST_F(CGPath, Apply, UIKitMimicTest) {
CGContextRef context = GetDrawingContext();
CGRect bounds = GetDrawingBounds();

Expand Down Expand Up @@ -196,7 +196,7 @@ DRAW_TEST_F(CGPath, Apply, UIKitMimicTest) {
CGPathRelease(thepath);
}

DRAW_TEST_F(CGPath, CloseSubpath, UIKitMimicTest) {
DISABLED_DRAW_TEST_F(CGPath, CloseSubpath, UIKitMimicTest) {
CGContextRef context = GetDrawingContext();
CGRect bounds = GetDrawingBounds();

Expand All @@ -223,7 +223,7 @@ DRAW_TEST_F(CGPath, CloseSubpath, UIKitMimicTest) {
CGPathRelease(thePath);
}

DRAW_TEST_F(CGPath, GetBoundingBox, UIKitMimicTest) {
DISABLED_DRAW_TEST_F(CGPath, GetBoundingBox, UIKitMimicTest) {
CGContextRef context = GetDrawingContext();
CGRect bounds = GetDrawingBounds();

Expand Down
2 changes: 1 addition & 1 deletion tests/unittests/CoreGraphics.drawing/CGContextBlendModeTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ TEST_P(CGContextBlendMode, OverlappedEllipses) {
CGContextFillEllipseInRect(context, _CGRectCenteredOnPoint({ bounds.size.height, bounds.size.height }, secondEllipseCenter));
}

INSTANTIATE_TEST_CASE_P(CompositionModes,
INSTANTIATE_TEST_CASE_P(DISABLED_CompositionModes,
CGContextBlendMode,
::testing::Combine(::testing::ValuesIn(alphas), ::testing::ValuesIn(compositionModes)));

Expand Down