aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--AppKit/GTMLinearRGBShadingTest.m12
-rw-r--r--AppKit/GTMNSWorkspace+ThemeTest.m3
-rw-r--r--Foundation/GTMNSData+zlibTest.m37
3 files changed, 27 insertions, 25 deletions
diff --git a/AppKit/GTMLinearRGBShadingTest.m b/AppKit/GTMLinearRGBShadingTest.m
index 6407e71..70b67b7 100644
--- a/AppKit/GTMLinearRGBShadingTest.m
+++ b/AppKit/GTMLinearRGBShadingTest.m
@@ -17,10 +17,10 @@
//
#import <SenTestingKit/SenTestingKit.h>
+#import "GTMSenTestCase.h"
#import "GTMLinearRGBShading.h"
#import "GTMNSColor+Theme.h"
-
@interface GTMLinearRGBShadingTest : SenTestCase
@end
@@ -35,7 +35,7 @@
toColor:blue
fromSpaceNamed:NSDeviceRGBColorSpace];
STAssertNotNil(theShading,nil);
- STAssertTrue([theShading stopCount] == 2, nil);
+ STAssertEquals([theShading stopCount], 2U, nil);
float *theColor = (float*)[theShading valueAtPosition: 0.5];
STAssertTrue(theColor[0] == [purple redComponent] &&
theColor[1] == [purple greenComponent] &&
@@ -77,8 +77,8 @@
atPositions:nil
count:0];
CGFunctionRef theFunction = [theShading shadeFunction];
- STAssertTrue(nil != theFunction, nil);
- STAssertTrue(CFGetTypeID(theFunction) == CGFunctionGetTypeID(), nil);
+ STAssertNotNULL(theFunction, nil);
+ STAssertEquals(CFGetTypeID(theFunction), CGFunctionGetTypeID(), nil);
}
- (void)testColorSpace {
@@ -88,7 +88,7 @@
atPositions:nil
count:0];
CGColorSpaceRef theColorSpace = [theShading colorSpace];
- STAssertTrue(nil != theColorSpace, nil);
- STAssertTrue(CFGetTypeID(theColorSpace) == CGColorSpaceGetTypeID(), nil);
+ STAssertNotNULL(theColorSpace, nil);
+ STAssertEquals(CFGetTypeID(theColorSpace), CGColorSpaceGetTypeID(), nil);
}
@end
diff --git a/AppKit/GTMNSWorkspace+ThemeTest.m b/AppKit/GTMNSWorkspace+ThemeTest.m
index 213de22..ae1cb66 100644
--- a/AppKit/GTMNSWorkspace+ThemeTest.m
+++ b/AppKit/GTMNSWorkspace+ThemeTest.m
@@ -17,6 +17,7 @@
//
#import <SenTestingKit/SenTestingKit.h>
+#import "GTMSenTestCase.h"
#import "GTMNSWorkspace+Theme.h"
@interface GTMNSWorkspace_ThemeTest : SenTestCase
@@ -32,6 +33,6 @@
- (void)testThemeScrollBarArrowStyle {
ThemeScrollBarArrowStyle style = [[NSWorkspace sharedWorkspace] gtm_themeScrollBarArrowStyle];
- STAssertTrue(style <= kThemeScrollBarArrowsDouble, nil);
+ STAssertLessThanOrEqual(style, (ThemeScrollBarArrowStyle)kThemeScrollBarArrowsDouble, nil);
}
@end
diff --git a/Foundation/GTMNSData+zlibTest.m b/Foundation/GTMNSData+zlibTest.m
index f18735d..0d863d5 100644
--- a/Foundation/GTMNSData+zlibTest.m
+++ b/Foundation/GTMNSData+zlibTest.m
@@ -16,12 +16,13 @@
// the License.
//
+#import <SenTestingKit/SenTestingKit.h>
+#import "GTMSenTestCase.h"
+
#import "GTMNSData+zlib.h"
#import <stdlib.h> // for randiom/srandomdev
#import <zlib.h>
-#import <SenTestingKit/SenTestingKit.h>
-
@interface GTMNSData_zlibTest : SenTestCase
@end
@@ -68,21 +69,21 @@ static BOOL HasGzipHeader(NSData *data) {
// w/ *Bytes apis, default level
NSData *deflated = [NSData gtm_dataByDeflatingBytes:[data bytes] length:[data length]];
STAssertNotNil(deflated, @"failed to deflate data block");
- STAssertTrue([deflated length] > 0, @"failed to deflate data block");
+ STAssertGreaterThan([deflated length], 0U, @"failed to deflate data block");
STAssertFalse(HasGzipHeader(deflated), @"has gzip header on zlib data");
NSData *dataPrime = [NSData gtm_dataByInflatingBytes:[deflated bytes] length:[deflated length]];
STAssertNotNil(dataPrime, @"failed to inflate data block");
- STAssertTrue([dataPrime length] > 0, @"failed to inflate data block");
+ STAssertGreaterThan([dataPrime length], 0U, @"failed to inflate data block");
STAssertEqualObjects(data, dataPrime, @"failed to round trip via *Bytes apis");
// w/ *Data apis, default level
deflated = [NSData gtm_dataByDeflatingData:data];
STAssertNotNil(deflated, @"failed to deflate data block");
- STAssertTrue([deflated length] > 0, @"failed to deflate data block");
+ STAssertGreaterThan([deflated length], 0U, @"failed to deflate data block");
STAssertFalse(HasGzipHeader(deflated), @"has gzip header on zlib data");
dataPrime = [NSData gtm_dataByInflatingData:deflated];
STAssertNotNil(dataPrime, @"failed to inflate data block");
- STAssertTrue([dataPrime length] > 0, @"failed to inflate data block");
+ STAssertGreaterThan([dataPrime length], 0U, @"failed to inflate data block");
STAssertEqualObjects(data, dataPrime, @"failed to round trip via *Data apis");
// loop over the compression levels
@@ -92,21 +93,21 @@ static BOOL HasGzipHeader(NSData *data) {
length:[data length]
compressionLevel:level];
STAssertNotNil(deflated, @"failed to deflate data block");
- STAssertTrue([deflated length] > 0, @"failed to deflate data block");
+ STAssertGreaterThan([deflated length], 0U, @"failed to deflate data block");
STAssertFalse(HasGzipHeader(deflated), @"has gzip header on zlib data");
dataPrime = [NSData gtm_dataByInflatingBytes:[deflated bytes] length:[deflated length]];
STAssertNotNil(dataPrime, @"failed to inflate data block");
- STAssertTrue([dataPrime length] > 0, @"failed to inflate data block");
+ STAssertGreaterThan([dataPrime length], 0U, @"failed to inflate data block");
STAssertEqualObjects(data, dataPrime, @"failed to round trip via *Bytes apis");
// w/ *Data apis, using our level
deflated = [NSData gtm_dataByDeflatingData:data compressionLevel:level];
STAssertNotNil(deflated, @"failed to deflate data block");
- STAssertTrue([deflated length] > 0, @"failed to deflate data block");
+ STAssertGreaterThan([deflated length], 0U, @"failed to deflate data block");
STAssertFalse(HasGzipHeader(deflated), @"has gzip header on zlib data");
dataPrime = [NSData gtm_dataByInflatingData:deflated];
STAssertNotNil(dataPrime, @"failed to inflate data block");
- STAssertTrue([dataPrime length] > 0, @"failed to inflate data block");
+ STAssertGreaterThan([dataPrime length], 0U, @"failed to inflate data block");
STAssertEqualObjects(data, dataPrime, @"failed to round trip via *Data apis");
}
@@ -133,21 +134,21 @@ static BOOL HasGzipHeader(NSData *data) {
// w/ *Bytes apis, default level
NSData *gzipped = [NSData gtm_dataByGzippingBytes:[data bytes] length:[data length]];
STAssertNotNil(gzipped, @"failed to gzip data block");
- STAssertTrue([gzipped length] > 0, @"failed to gzip data block");
+ STAssertGreaterThan([gzipped length], 0U, @"failed to gzip data block");
STAssertTrue(HasGzipHeader(gzipped), @"doesn't have gzip header on gzipped data");
NSData *dataPrime = [NSData gtm_dataByInflatingBytes:[gzipped bytes] length:[gzipped length]];
STAssertNotNil(dataPrime, @"failed to inflate data block");
- STAssertTrue([dataPrime length] > 0, @"failed to inflate data block");
+ STAssertGreaterThan([dataPrime length], 0U, @"failed to inflate data block");
STAssertEqualObjects(data, dataPrime, @"failed to round trip via *Bytes apis");
// w/ *Data apis, default level
gzipped = [NSData gtm_dataByGzippingData:data];
STAssertNotNil(gzipped, @"failed to gzip data block");
- STAssertTrue([gzipped length] > 0, @"failed to gzip data block");
+ STAssertGreaterThan([gzipped length], 0U, @"failed to gzip data block");
STAssertTrue(HasGzipHeader(gzipped), @"doesn't have gzip header on gzipped data");
dataPrime = [NSData gtm_dataByInflatingData:gzipped];
STAssertNotNil(dataPrime, @"failed to inflate data block");
- STAssertTrue([dataPrime length] > 0, @"failed to inflate data block");
+ STAssertGreaterThan([dataPrime length], 0U, @"failed to inflate data block");
STAssertEqualObjects(data, dataPrime, @"failed to round trip via *Data apis");
// loop over the compression levels
@@ -157,21 +158,21 @@ static BOOL HasGzipHeader(NSData *data) {
length:[data length]
compressionLevel:level];
STAssertNotNil(gzipped, @"failed to gzip data block");
- STAssertTrue([gzipped length] > 0, @"failed to gzip data block");
+ STAssertGreaterThan([gzipped length], 0U, @"failed to gzip data block");
STAssertTrue(HasGzipHeader(gzipped), @"doesn't have gzip header on gzipped data");
dataPrime = [NSData gtm_dataByInflatingBytes:[gzipped bytes] length:[gzipped length]];
STAssertNotNil(dataPrime, @"failed to inflate data block");
- STAssertTrue([dataPrime length] > 0, @"failed to inflate data block");
+ STAssertGreaterThan([dataPrime length], 0U, @"failed to inflate data block");
STAssertEqualObjects(data, dataPrime, @"failed to round trip via *Bytes apis");
// w/ *Data apis, using our level
gzipped = [NSData gtm_dataByGzippingData:data compressionLevel:level];
STAssertNotNil(gzipped, @"failed to gzip data block");
- STAssertTrue([gzipped length] > 0, @"failed to gzip data block");
+ STAssertGreaterThan([gzipped length], 0U, @"failed to gzip data block");
STAssertTrue(HasGzipHeader(gzipped), @"doesn't have gzip header on gzipped data");
dataPrime = [NSData gtm_dataByInflatingData:gzipped];
STAssertNotNil(dataPrime, @"failed to inflate data block");
- STAssertTrue([dataPrime length] > 0, @"failed to inflate data block");
+ STAssertGreaterThan([dataPrime length], 0U, @"failed to inflate data block");
STAssertEqualObjects(data, dataPrime, @"failed to round trip via *Data apis");
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-19 19:43:17 +0000