summaryrefslogtreecommitdiff
path: root/platform/darwin
diff options
context:
space:
mode:
authorIvo van Dongen <info@ivovandongen.nl>2016-11-29 17:38:34 +0200
committerJesse Bounds <jesse@rebounds.net>2016-12-02 11:28:34 -0800
commitd44d1c8401f38982905bce3166eaad8431661263 (patch)
tree3083c4acec0ddaa853d51ec4a267c11b09bc9fe1 /platform/darwin
parent2c4e7ae70f68eecf56707f0ebd9810340f41e6a3 (diff)
downloadqtlocation-mapboxgl-d44d1c8401f38982905bce3166eaad8431661263.tar.gz
[ios, macos] renamed MGLStyleLayerTests to MGLMapViewTests
Diffstat (limited to 'platform/darwin')
-rw-r--r--platform/darwin/src/MGLRuntimeStylingTests.m.ejs4
-rw-r--r--platform/darwin/test/MGLBackgroundStyleLayerTests.m4
-rw-r--r--platform/darwin/test/MGLCircleStyleLayerTests.m4
-rw-r--r--platform/darwin/test/MGLFillStyleLayerTests.m4
-rw-r--r--platform/darwin/test/MGLFilterTests.mm4
-rw-r--r--platform/darwin/test/MGLLineStyleLayerTests.m4
-rw-r--r--platform/darwin/test/MGLMapViewTests.h (renamed from platform/darwin/test/MGLStyleLayerTests.h)2
-rw-r--r--platform/darwin/test/MGLMapViewTests.m (renamed from platform/darwin/test/MGLStyleLayerTests.m)6
-rw-r--r--platform/darwin/test/MGLMapViewTests.xib (renamed from platform/darwin/test/MGLStyleLayerTests.xib)4
-rw-r--r--platform/darwin/test/MGLRasterStyleLayerTests.m4
-rw-r--r--platform/darwin/test/MGLSymbolStyleLayerTests.m4
11 files changed, 22 insertions, 22 deletions
diff --git a/platform/darwin/src/MGLRuntimeStylingTests.m.ejs b/platform/darwin/src/MGLRuntimeStylingTests.m.ejs
index 720ee4547e..c1492167b4 100644
--- a/platform/darwin/src/MGLRuntimeStylingTests.m.ejs
+++ b/platform/darwin/src/MGLRuntimeStylingTests.m.ejs
@@ -6,9 +6,9 @@
// This file is generated.
// Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`.
-#import "MGLStyleLayerTests.h"
+#import "MGLMapViewTests.h"
-@interface MGL<%- camelize(type) %>LayerTests : MGLStyleLayerTests
+@interface MGL<%- camelize(type) %>LayerTests : MGLMapViewTests
@end
@implementation MGL<%- camelize(type) %>LayerTests
diff --git a/platform/darwin/test/MGLBackgroundStyleLayerTests.m b/platform/darwin/test/MGLBackgroundStyleLayerTests.m
index 09bed76654..56e4297c2e 100644
--- a/platform/darwin/test/MGLBackgroundStyleLayerTests.m
+++ b/platform/darwin/test/MGLBackgroundStyleLayerTests.m
@@ -1,9 +1,9 @@
// This file is generated.
// Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`.
-#import "MGLStyleLayerTests.h"
+#import "MGLMapViewTests.h"
-@interface MGLBackgroundLayerTests : MGLStyleLayerTests
+@interface MGLBackgroundLayerTests : MGLMapViewTests
@end
@implementation MGLBackgroundLayerTests
diff --git a/platform/darwin/test/MGLCircleStyleLayerTests.m b/platform/darwin/test/MGLCircleStyleLayerTests.m
index 432d3ffa79..2a8d5432d9 100644
--- a/platform/darwin/test/MGLCircleStyleLayerTests.m
+++ b/platform/darwin/test/MGLCircleStyleLayerTests.m
@@ -1,9 +1,9 @@
// This file is generated.
// Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`.
-#import "MGLStyleLayerTests.h"
+#import "MGLMapViewTests.h"
-@interface MGLCircleLayerTests : MGLStyleLayerTests
+@interface MGLCircleLayerTests : MGLMapViewTests
@end
@implementation MGLCircleLayerTests
diff --git a/platform/darwin/test/MGLFillStyleLayerTests.m b/platform/darwin/test/MGLFillStyleLayerTests.m
index 87846302ea..44319e8018 100644
--- a/platform/darwin/test/MGLFillStyleLayerTests.m
+++ b/platform/darwin/test/MGLFillStyleLayerTests.m
@@ -1,9 +1,9 @@
// This file is generated.
// Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`.
-#import "MGLStyleLayerTests.h"
+#import "MGLMapViewTests.h"
-@interface MGLFillLayerTests : MGLStyleLayerTests
+@interface MGLFillLayerTests : MGLMapViewTests
@end
@implementation MGLFillLayerTests
diff --git a/platform/darwin/test/MGLFilterTests.mm b/platform/darwin/test/MGLFilterTests.mm
index b18400f83a..3e19a73f4c 100644
--- a/platform/darwin/test/MGLFilterTests.mm
+++ b/platform/darwin/test/MGLFilterTests.mm
@@ -1,10 +1,10 @@
-#import "MGLStyleLayerTests.h"
+#import "MGLMapViewTests.h"
#import "NSPredicate+MGLAdditions.h"
#import "MGLValueEvaluator.h"
-@interface MGLFilterTests : MGLStyleLayerTests {
+@interface MGLFilterTests : MGLMapViewTests {
MGLGeoJSONSource *source;
MGLLineStyleLayer *layer;
}
diff --git a/platform/darwin/test/MGLLineStyleLayerTests.m b/platform/darwin/test/MGLLineStyleLayerTests.m
index 95983b1f52..521efe4de3 100644
--- a/platform/darwin/test/MGLLineStyleLayerTests.m
+++ b/platform/darwin/test/MGLLineStyleLayerTests.m
@@ -1,9 +1,9 @@
// This file is generated.
// Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`.
-#import "MGLStyleLayerTests.h"
+#import "MGLMapViewTests.h"
-@interface MGLLineLayerTests : MGLStyleLayerTests
+@interface MGLLineLayerTests : MGLMapViewTests
@end
@implementation MGLLineLayerTests
diff --git a/platform/darwin/test/MGLStyleLayerTests.h b/platform/darwin/test/MGLMapViewTests.h
index f81e075e03..da94281165 100644
--- a/platform/darwin/test/MGLStyleLayerTests.h
+++ b/platform/darwin/test/MGLMapViewTests.h
@@ -2,7 +2,7 @@
#import "MGLRuntimeStylingHelper.h"
#import <XCTest/XCTest.h>
-@interface MGLStyleLayerTests : XCTestCase <MGLMapViewDelegate>
+@interface MGLMapViewTests : XCTestCase <MGLMapViewDelegate>
@property (nonatomic) IBOutlet MGLMapView *mapView;
@property (nonatomic) XCTestExpectation *expectation;
diff --git a/platform/darwin/test/MGLStyleLayerTests.m b/platform/darwin/test/MGLMapViewTests.m
index 74c6b2f906..63ff3501ca 100644
--- a/platform/darwin/test/MGLStyleLayerTests.m
+++ b/platform/darwin/test/MGLMapViewTests.m
@@ -1,6 +1,6 @@
-#import "MGLStyleLayerTests.h"
+#import "MGLMapViewTests.h"
-@implementation MGLStyleLayerTests
+@implementation MGLMapViewTests
- (void)setUp {
[super setUp];
@@ -14,7 +14,7 @@
_mapView.delegate = self;
#else
[MGLAccountManager setAccessToken:@"pk.feedcafedeadbeefbadebede"];
- NSWindowController *windowController = [[NSWindowController alloc] initWithWindowNibName:@"MGLStyleLayerTests" owner:self];
+ NSWindowController *windowController = [[NSWindowController alloc] initWithWindowNibName:@"MGLMapViewTests" owner:self];
[windowController showWindow:nil];
#endif
}
diff --git a/platform/darwin/test/MGLStyleLayerTests.xib b/platform/darwin/test/MGLMapViewTests.xib
index 23ad22e7e3..cc336191ef 100644
--- a/platform/darwin/test/MGLStyleLayerTests.xib
+++ b/platform/darwin/test/MGLMapViewTests.xib
@@ -4,14 +4,14 @@
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
</dependencies>
<objects>
- <customObject id="-2" userLabel="File's Owner" customClass="MGLStyleLayerTests">
+ <customObject id="-2" userLabel="File's Owner" customClass="MGLMapViewTests">
<connections>
<outlet property="mapView" destination="6RL-d9-juy" id="0ch-aR-Um6"/>
</connections>
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
- <window title="MGLStyleLayerTests" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" animationBehavior="default" id="QvC-M9-y7g">
+ <window title="MGLMapViewTests" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" animationBehavior="default" id="QvC-M9-y7g">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="196" y="240" width="256" height="256"/>
diff --git a/platform/darwin/test/MGLRasterStyleLayerTests.m b/platform/darwin/test/MGLRasterStyleLayerTests.m
index 84fd0fe3e5..4d37495e9a 100644
--- a/platform/darwin/test/MGLRasterStyleLayerTests.m
+++ b/platform/darwin/test/MGLRasterStyleLayerTests.m
@@ -1,9 +1,9 @@
// This file is generated.
// Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`.
-#import "MGLStyleLayerTests.h"
+#import "MGLMapViewTests.h"
-@interface MGLRasterLayerTests : MGLStyleLayerTests
+@interface MGLRasterLayerTests : MGLMapViewTests
@end
@implementation MGLRasterLayerTests
diff --git a/platform/darwin/test/MGLSymbolStyleLayerTests.m b/platform/darwin/test/MGLSymbolStyleLayerTests.m
index e77c4f6f39..036a88fc1a 100644
--- a/platform/darwin/test/MGLSymbolStyleLayerTests.m
+++ b/platform/darwin/test/MGLSymbolStyleLayerTests.m
@@ -1,9 +1,9 @@
// This file is generated.
// Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`.
-#import "MGLStyleLayerTests.h"
+#import "MGLMapViewTests.h"
-@interface MGLSymbolLayerTests : MGLStyleLayerTests
+@interface MGLSymbolLayerTests : MGLMapViewTests
@end
@implementation MGLSymbolLayerTests