Permalink
Browse files

remove OS X specific items. fix import paths

  • Loading branch information...
1 parent 2288fba commit b8c89af0ab9ea77bc6549df7edde81f6969ea60e @zmcartor committed Feb 21, 2013
View
@@ -1,48 +0,0 @@
-//
-// ILTestImage.h
-//
-// Created by Claus Broch on 21/04/12.
-// Copyright 2012 Infinite Loop. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification, are permitted
-// provided that the following conditions are met:
-//
-// - Redistributions of source code must retain the above copyright notice, this list of conditions
-// and the following disclaimer.
-// - Redistributions in binary form must reproduce the above copyright notice, this list of
-// conditions and the following disclaimer in the documentation and/or other materials provided
-// with the distribution.
-// - Neither the name of Infinite Loop nor the names of its contributors may be used to endorse or
-// promote products derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
-// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-// WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-
-#import <Foundation/Foundation.h>
-
-typedef void (^ValidateDrawInRect)(NSRect drawRect, NSRect fromRect, NSCompositingOperation operation, CGFloat fraction);
-
-@interface ILTestImage : NSObject {
- NSSize _size;
- ValidateDrawInRect _validateDrawInRect;
-}
-
-// NSImage properties
-@property (assign, nonatomic) NSSize size;
-
-// Test properties - perform validation in the block passed
-@property (assign, nonatomic) ValidateDrawInRect validateDrawInRect;
-
-- (id)initWithSize:(NSSize)size;
-- (void)setSize:(NSSize)aSize;
-- (NSSize)size;
-- (void)drawInRect:(NSRect)rect fromRect:(NSRect)fromRect operation:(NSCompositingOperation)op fraction:(CGFloat)delta;
-
-@end
View
@@ -1,56 +0,0 @@
-//
-// ILTestImage.m
-//
-// Created by Claus Broch on 21/04/12.
-// Copyright 2012 Infinite Loop. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification, are permitted
-// provided that the following conditions are met:
-//
-// - Redistributions of source code must retain the above copyright notice, this list of conditions
-// and the following disclaimer.
-// - Redistributions in binary form must reproduce the above copyright notice, this list of
-// conditions and the following disclaimer in the documentation and/or other materials provided
-// with the distribution.
-// - Neither the name of Infinite Loop nor the names of its contributors may be used to endorse or
-// promote products derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
-// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-// WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-
-#import "ILTestImage.h"
-
-@implementation ILTestImage
-@synthesize size=_size;
-@synthesize validateDrawInRect=_validateDrawInRect;
-
-- (id)initWithSize:(NSSize)size {
- self = [super init];
- if(self) {
- _size = size;
- }
- return self;
-}
-
-- (void)setSize:(NSSize)aSize {
- _size = aSize;
-}
-
-- (NSSize)size {
- return _size;
-}
-
-- (void)drawInRect:(NSRect)rect fromRect:(NSRect)fromRect operation:(NSCompositingOperation)op fraction:(CGFloat)delta {
- if(_validateDrawInRect) {
- _validateDrawInRect(rect, fromRect, op, delta);
- }
-}
-
-@end
@@ -25,7 +25,7 @@
// WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
-#import <OCHamcrest/HCAssertThat.h>
+#import <OCHamcrestIOS/HCAssertThat.h>
#import "ILDispatchQueueAssert.h"
@@ -25,7 +25,7 @@
// WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
-#import <OCHamcrest/HCBaseMatcher.h>
+#import <OCHamcrestIOS/HCBaseMatcher.h>
OBJC_EXPORT id<HCMatcher> HC_equalToDispatchQueue(dispatch_queue_t targetQueue);
@@ -26,7 +26,7 @@
//
#import "ILDispatchQueueMatcher.h"
-#import <OCHamcrest/HCIsEqual.h>
+#import <OCHamcrestIOS/HCIsEqual.h>
OBJC_EXPORT id<HCMatcher> HC_equalToDispatchQueue(dispatch_queue_t targetQueue) {
return [HCIsEqual isEqualTo:[NSValue value:&targetQueue withObjCType:@encode(dispatch_queue_t)]];

0 comments on commit b8c89af

Please sign in to comment.