From 42124b3691197c3c4f52f069775fa0390a8ff942 Mon Sep 17 00:00:00 2001 From: dmaclach Date: Fri, 7 Oct 2016 12:10:23 -0400 Subject: First cut at pruning things/updating things. Remove a bunch of code that Google stopped using/maintaining rather than trying to update it it. Some would be hard to update, some actually has system provided replacements; others are patterns that just don't seem as common now. Prune out the code related to macOS <= 10.5, start pruning some of the really old iOS support also. Get the projects mostly limping again with modern Xcodes so tests can be run. If someone ends up on this commit via history for something they still find as useful, feel free to do a pull request to bring the snippet of code back to life and update it for current SDKs. --- AppKit/GTMNSColor+LuminanceTest.m | 60 ++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 33 deletions(-) (limited to 'AppKit/GTMNSColor+LuminanceTest.m') diff --git a/AppKit/GTMNSColor+LuminanceTest.m b/AppKit/GTMNSColor+LuminanceTest.m index 82eb014..8907623 100644 --- a/AppKit/GTMNSColor+LuminanceTest.m +++ b/AppKit/GTMNSColor+LuminanceTest.m @@ -6,9 +6,9 @@ // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy // of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, WITHOUT // WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the @@ -25,7 +25,7 @@ @interface GTMNSColor_LuminanceTest : GTMTestCase @end - + @implementation GTMNSColor_LuminanceTest - (void)testLuminance { @@ -34,37 +34,31 @@ NSColor *lighter = [midtone gtm_colorAdjustedFor:GTMColorationBaseHighlight]; NSColor *lightest = [midtone gtm_colorAdjustedFor:GTMColorationLightHighlight]; NSColor *darkest = [midtone gtm_colorAdjustedFor:GTMColorationDarkShadow]; - + // The relationships of the other values are not set, so we don't test them yet - STAssertGreaterThanOrEqual([lightest gtm_luminance], - [lighter gtm_luminance], nil); - STAssertGreaterThanOrEqual([lighter gtm_luminance], - [midtone gtm_luminance], nil); - STAssertGreaterThanOrEqual([midtone gtm_luminance], - [darker gtm_luminance], nil); - STAssertGreaterThanOrEqual([darker gtm_luminance], - [darkest gtm_luminance], nil); - STAssertGreaterThanOrEqual([[NSColor whiteColor] gtm_luminance], - (CGFloat)0.95, nil); - STAssertGreaterThanOrEqual([[NSColor yellowColor] gtm_luminance], - (CGFloat)0.90, nil); - STAssertEqualsWithAccuracy([[NSColor blueColor] gtm_luminance], - (CGFloat)0.35, 0.10, nil); - STAssertEqualsWithAccuracy([[NSColor redColor] gtm_luminance], - (CGFloat)0.50, 0.10, nil); - STAssertLessThanOrEqual([[NSColor blackColor] gtm_luminance], - (CGFloat)0.30, nil); - STAssertTrue([[NSColor blackColor] gtm_isDarkColor], nil); - STAssertTrue([[NSColor blueColor] gtm_isDarkColor], nil); - STAssertTrue([[NSColor redColor] gtm_isDarkColor], nil); - STAssertTrue(![[NSColor whiteColor] gtm_isDarkColor], nil); - STAssertTrue(![[NSColor yellowColor] gtm_isDarkColor], nil); - STAssertGreaterThanOrEqual([[[NSColor blackColor] gtm_legibleTextColor] - gtm_luminance], - [[NSColor grayColor] gtm_luminance], nil); - STAssertLessThanOrEqual([[[NSColor whiteColor] gtm_legibleTextColor] - gtm_luminance], - [[NSColor grayColor] gtm_luminance], nil); + XCTAssertGreaterThanOrEqual([lightest gtm_luminance], [lighter gtm_luminance]); + XCTAssertGreaterThanOrEqual([lighter gtm_luminance], [midtone gtm_luminance]); + XCTAssertGreaterThanOrEqual([midtone gtm_luminance], [darker gtm_luminance]); + XCTAssertGreaterThanOrEqual([darker gtm_luminance], [darkest gtm_luminance]); + XCTAssertGreaterThanOrEqual([[NSColor whiteColor] gtm_luminance], (CGFloat)0.95); + XCTAssertGreaterThanOrEqual([[NSColor yellowColor] gtm_luminance], (CGFloat)0.90); + XCTAssertEqualWithAccuracy([[NSColor blueColor] gtm_luminance], + (CGFloat)0.35, 0.10); + XCTAssertEqualWithAccuracy([[NSColor redColor] gtm_luminance], + (CGFloat)0.50, 0.10); + XCTAssertLessThanOrEqual([[NSColor blackColor] gtm_luminance], + (CGFloat)0.30); + XCTAssertTrue([[NSColor blackColor] gtm_isDarkColor]); + XCTAssertTrue([[NSColor blueColor] gtm_isDarkColor]); + XCTAssertTrue([[NSColor redColor] gtm_isDarkColor]); + XCTAssertTrue(![[NSColor whiteColor] gtm_isDarkColor]); + XCTAssertTrue(![[NSColor yellowColor] gtm_isDarkColor]); + XCTAssertGreaterThanOrEqual([[[NSColor blackColor] gtm_legibleTextColor] + gtm_luminance], + [[NSColor grayColor] gtm_luminance]); + XCTAssertLessThanOrEqual([[[NSColor whiteColor] gtm_legibleTextColor] + gtm_luminance], + [[NSColor grayColor] gtm_luminance]); } @end -- cgit v1.2.3