Skip to content

Commit f57cd2d

Browse files
author
Sean Henry
committed
Removes unused code
1 parent c8b7002 commit f57cd2d

File tree

11 files changed

+7
-64
lines changed

11 files changed

+7
-64
lines changed

‎EndToEndTests/EndToEndTests.swift‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ import XCTest
33

44
class EndToEndTests: MockGeneratorBaseTestCase {
55

6-
override func setUp() {
7-
super.setUp()
8-
Preferences().platform = "macosx"
9-
}
10-
116
func test_generatesSimpleMock() {
127
assertMockGeneratesExpected("SimpleProtocolMock")
138
}
@@ -164,12 +159,6 @@ class EndToEndTests: MockGeneratorBaseTestCase {
164159
assertMockGeneratesExpected("AugmentedClassSubscriptMock")
165160
}
166161

167-
func test_returnsErrorWhenPlatformIsNil() {
168-
let preferences = Preferences()
169-
preferences.platform = nil
170-
assertMockGeneratesError(fileName: "SimpleProtocolMock", "No platform has been selected. Choose one in the companion app.")
171-
}
172-
173162
func test_returnsErrorWhenProjectURLDoesNotExist() {
174163
let preferences = Preferences()
175164
preferences.automaticallyDetectProjectPath = false

‎MockGenerator.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,10 @@
4242
142B0213216FA39E005DE573 /* libIndexer.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 1425EB8721528F8F00009D60 /* libIndexer.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
4343
142B0214216FA39E005DE573 /* libParser.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 196F975020EEFA12009A5FD6 /* libParser.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
4444
142B0215216FA39E005DE573 /* libResolver.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 196F975420EEFA12009A5FD6 /* libResolver.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
45-
142B0216216FA39E005DE573 /* libSourceKittenRequests.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 196F975820EEFA12009A5FD6 /* libSourceKittenRequests.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
4645
142B0217216FA39E005DE573 /* libSwiftLexer.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 196F975A20EEFA12009A5FD6 /* libSwiftLexer.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
4746
142B0218216FA3A7005DE573 /* MockGenerator.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 14276C611F4F312E00EA7753 /* MockGenerator.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
48-
142B022A21709979005DE573 /* SourceKittenFramework.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 142B02252170994B005DE573 /* SourceKittenFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
49-
142B022B21709979005DE573 /* SWXMLHash.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 142B02222170994A005DE573 /* SWXMLHash.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
50-
142B022C21709979005DE573 /* Yams.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 142B02242170994B005DE573 /* Yams.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
5147
142B023021709A97005DE573 /* UseCases.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 142B022F21709A85005DE573 /* UseCases.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
5248
142B023121709AFF005DE573 /* UseCases.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 142B022F21709A85005DE573 /* UseCases.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
53-
142B023621709AFF005DE573 /* SourceKittenFramework.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 142B02252170994B005DE573 /* SourceKittenFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
54-
142B023721709B00005DE573 /* SWXMLHash.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 142B02222170994A005DE573 /* SWXMLHash.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
55-
142B023821709B00005DE573 /* Yams.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 142B02242170994B005DE573 /* Yams.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
5649
142B023A21709BFB005DE573 /* libGRMustache7-MacOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 142B023921709BC5005DE573 /* libGRMustache7-MacOS.a */; };
5750
14354103232E4FF80019615B /* Lexer in Frameworks */ = {isa = PBXBuildFile; productRef = 14354102232E4FF80019615B /* Lexer */; };
5851
14354104232E4FF80019615B /* Lexer in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 14354102232E4FF80019615B /* Lexer */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
@@ -73,7 +66,6 @@
7366
1497FE7E215E147200CD670B /* libIndexer.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1425EB8721528F8F00009D60 /* libIndexer.dylib */; };
7467
1497FE7F215E147200CD670B /* libParser.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 196F975020EEFA12009A5FD6 /* libParser.dylib */; };
7568
1497FE80215E147200CD670B /* libResolver.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 196F975420EEFA12009A5FD6 /* libResolver.dylib */; };
76-
1497FE81215E147200CD670B /* libSourceKittenRequests.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 196F975820EEFA12009A5FD6 /* libSourceKittenRequests.dylib */; };
7769
1497FE82215E147200CD670B /* libSwiftLexer.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 196F975A20EEFA12009A5FD6 /* libSwiftLexer.dylib */; };
7870
1497FEC8215E200100CD670B /* libAlgorithms.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 196F974C20EEFA12009A5FD6 /* libAlgorithms.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
7971
1497FEC9215E200100CD670B /* libAST.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 196F974020EEFA12009A5FD6 /* libAST.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
@@ -84,7 +76,6 @@
8476
1497FECE215E200100CD670B /* libIndexer.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1425EB8721528F8F00009D60 /* libIndexer.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
8577
1497FECF215E200100CD670B /* libParser.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 196F975020EEFA12009A5FD6 /* libParser.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
8678
1497FED0215E200100CD670B /* libResolver.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 196F975420EEFA12009A5FD6 /* libResolver.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
87-
1497FED1215E200100CD670B /* libSourceKittenRequests.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 196F975820EEFA12009A5FD6 /* libSourceKittenRequests.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
8879
1497FED2215E200100CD670B /* libSwiftLexer.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 196F975A20EEFA12009A5FD6 /* libSwiftLexer.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
8980
149CF7B3217B115B005892B4 /* partial.mustache in Resources */ = {isa = PBXBuildFile; fileRef = 149CF792217B115A005892B4 /* partial.mustache */; };
9081
149CF7B5217B1301005892B4 /* PartialSpyCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 149CF7B4217B1301005892B4 /* PartialSpyCommand.swift */; };
@@ -516,13 +507,6 @@
516507
remoteGlobalIDString = 19821CE020EE2C260084C6C1;
517508
remoteInfo = ResolverTests;
518509
};
519-
196F975720EEFA12009A5FD6 /* PBXContainerItemProxy */ = {
520-
isa = PBXContainerItemProxy;
521-
containerPortal = 196F972C20EEFA12009A5FD6 /* SwiftToolkit.xcodeproj */;
522-
proxyType = 2;
523-
remoteGlobalIDString = 19821D1E20EE2C5D0084C6C1;
524-
remoteInfo = SourceKittenRequests;
525-
};
526510
196F975920EEFA12009A5FD6 /* PBXContainerItemProxy */ = {
527511
isa = PBXContainerItemProxy;
528512
containerPortal = 196F972C20EEFA12009A5FD6 /* SwiftToolkit.xcodeproj */;
@@ -634,9 +618,6 @@
634618
files = (
635619
14D345DF234DC20700054682 /* libCommandLine.dylib in Embed Frameworks */,
636620
142B023021709A97005DE573 /* UseCases.framework in Embed Frameworks */,
637-
142B022A21709979005DE573 /* SourceKittenFramework.framework in Embed Frameworks */,
638-
142B022B21709979005DE573 /* SWXMLHash.framework in Embed Frameworks */,
639-
142B022C21709979005DE573 /* Yams.framework in Embed Frameworks */,
640621
1497FEC8215E200100CD670B /* libAlgorithms.dylib in Embed Frameworks */,
641622
14354104232E4FF80019615B /* Lexer in Embed Frameworks */,
642623
1497FEC9215E200100CD670B /* libAST.dylib in Embed Frameworks */,
@@ -647,7 +628,6 @@
647628
1497FECE215E200100CD670B /* libIndexer.dylib in Embed Frameworks */,
648629
1497FECF215E200100CD670B /* libParser.dylib in Embed Frameworks */,
649630
1497FED0215E200100CD670B /* libResolver.dylib in Embed Frameworks */,
650-
1497FED1215E200100CD670B /* libSourceKittenRequests.dylib in Embed Frameworks */,
651631
1497FED2215E200100CD670B /* libSwiftLexer.dylib in Embed Frameworks */,
652632
14887ABC20FB859B00D50A73 /* MockGenerator.framework in Embed Frameworks */,
653633
);
@@ -703,9 +683,6 @@
703683
files = (
704684
1485244A234E5B19007F3D26 /* libCommandLine.dylib in Copy Frameworks */,
705685
142B023121709AFF005DE573 /* UseCases.framework in Copy Frameworks */,
706-
142B023621709AFF005DE573 /* SourceKittenFramework.framework in Copy Frameworks */,
707-
142B023721709B00005DE573 /* SWXMLHash.framework in Copy Frameworks */,
708-
142B023821709B00005DE573 /* Yams.framework in Copy Frameworks */,
709686
142B0218216FA3A7005DE573 /* MockGenerator.framework in Copy Frameworks */,
710687
1435412B232E50610019615B /* Lexer in Copy Frameworks */,
711688
142B020D216FA39E005DE573 /* libAlgorithms.dylib in Copy Frameworks */,
@@ -717,7 +694,6 @@
717694
142B0213216FA39E005DE573 /* libIndexer.dylib in Copy Frameworks */,
718695
142B0214216FA39E005DE573 /* libParser.dylib in Copy Frameworks */,
719696
142B0215216FA39E005DE573 /* libResolver.dylib in Copy Frameworks */,
720-
142B0216216FA39E005DE573 /* libSourceKittenRequests.dylib in Copy Frameworks */,
721697
142B0217216FA39E005DE573 /* libSwiftLexer.dylib in Copy Frameworks */,
722698
);
723699
name = "Copy Frameworks";
@@ -885,7 +861,6 @@
885861
1497FE7E215E147200CD670B /* libIndexer.dylib in Frameworks */,
886862
1497FE7F215E147200CD670B /* libParser.dylib in Frameworks */,
887863
1497FE80215E147200CD670B /* libResolver.dylib in Frameworks */,
888-
1497FE81215E147200CD670B /* libSourceKittenRequests.dylib in Frameworks */,
889864
1497FE82215E147200CD670B /* libSwiftLexer.dylib in Frameworks */,
890865
);
891866
runOnlyForDeploymentPostprocessing = 0;
@@ -1227,7 +1202,6 @@
12271202
196F975420EEFA12009A5FD6 /* libResolver.dylib */,
12281203
196F975620EEFA12009A5FD6 /* ResolverTests.xctest */,
12291204
1425EB8D21528F8F00009D60 /* ResolverPerfTests.xctest */,
1230-
196F975820EEFA12009A5FD6 /* libSourceKittenRequests.dylib */,
12311205
196F975A20EEFA12009A5FD6 /* libSwiftLexer.dylib */,
12321206
196F975C20EEFA12009A5FD6 /* SwiftLexerTests.xctest */,
12331207
196F975E20EEFA12009A5FD6 /* libTestHelper.dylib */,
@@ -1887,13 +1861,6 @@
18871861
remoteRef = 196F975520EEFA12009A5FD6 /* PBXContainerItemProxy */;
18881862
sourceTree = BUILT_PRODUCTS_DIR;
18891863
};
1890-
196F975820EEFA12009A5FD6 /* libSourceKittenRequests.dylib */ = {
1891-
isa = PBXReferenceProxy;
1892-
fileType = archive.ar;
1893-
path = libSourceKittenRequests.dylib;
1894-
remoteRef = 196F975720EEFA12009A5FD6 /* PBXContainerItemProxy */;
1895-
sourceTree = BUILT_PRODUCTS_DIR;
1896-
};
18971864
196F975A20EEFA12009A5FD6 /* libSwiftLexer.dylib */ = {
18981865
isa = PBXReferenceProxy;
18991866
fileType = archive.ar;

‎MockGeneratorTests/MemberTransformingVisitorTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class MemberTransformingVisitorTests: XCTestCase {
1313

1414
override func setUp() {
1515
super.setUp()
16-
resolver = ResolverFactory.createResolver(filePaths: [], platform: "macosx")
16+
resolver = ResolverFactory.createResolver(filePaths: [])
1717
visitor = MemberTransformingVisitor(resolver: resolver)
1818
}
1919

‎MockGeneratorTests/MockGeneratorTests.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ class MockGeneratorTests: XCTestCase {
227227
} while contentsLineColumn.lineColumn != nil
228228
XCTAssertGreaterThan(caretLineColumns.count, 0)
229229
caretLineColumns.forEach { lineColumn in
230-
let (lines, error) = Generator(fromFileContents: contentsLineColumn.contents, projectURL: URL(fileURLWithPath: testProject), platform: "macosx", line: lineColumn.line, column: lineColumn.column, templateName: "spy", useTabsForIndentation: false, indentationWidth: 4).generateMock()
230+
let (lines, error) = Generator(fromFileContents: contentsLineColumn.contents, projectURL: URL(fileURLWithPath: testProject), line: lineColumn.line, column: lineColumn.column, templateName: "spy", useTabsForIndentation: false, indentationWidth: 4).generateMock()
231231
XCTAssertNotNil(error, "Should not be generating a mock from caret at line: \(lineColumn.line) column: \(lineColumn.column)")
232232
XCTAssertNil(lines)
233233
}
@@ -276,7 +276,6 @@ class MockGeneratorTests: XCTestCase {
276276
let result = CaretTestHelper.findCaretLineColumn(mock)
277277
let (instructions, error) = Generator(fromFileContents: result.contents,
278278
projectURL: URL(fileURLWithPath: testProject),
279-
platform: "macosx",
280279
line: result.lineColumn!.line,
281280
column: result.lineColumn!.column,
282281
templateName: templateName,

‎MockGeneratorTests/TypeDeclarationTransformingVisitorTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class TypeDeclarationTransformingVisitorTests: XCTestCase {
1212

1313
override func setUp() {
1414
super.setUp()
15-
resolver = ResolverFactory.createResolver(filePaths: [], platform: "macosx")
15+
resolver = ResolverFactory.createResolver(filePaths: [])
1616
}
1717

1818
override func tearDown() {

‎MockGeneratorTests/VariableTypeResolverTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ class VariableTypeResolverTests: XCTestCase {
143143
struct StructType {}
144144
enum EnumType {}
145145
"""
146-
return VariableTypeResolver.resolve(try parse(fullText), resolver: ResolverFactory.createResolver(filePaths: [], platform: "macosx"))
146+
return VariableTypeResolver.resolve(try parse(fullText), resolver: ResolverFactory.createResolver(filePaths: []))
147147
}
148148

149149
private func parse(_ text: String) throws -> Element {

‎MockGeneratorXPC/MockGeneratorXPC.swift‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,4 @@ import MockGenerator
2020
}
2121
reply(transformed, error)
2222
}
23-
24-
#if DEBUG
25-
func crash() {
26-
fatalError()
27-
}
28-
#endif
2923
}

‎MockGeneratorXPC/MockGeneratorXPCProtocol.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ NS_ASSUME_NONNULL_BEGIN
99
- (void)generateMockFrom:(XPCMockGeneratorModel *)model
1010
withReply:(void (^)(XPCBufferInstructions *_Nullable, NSError *_Nullable))reply;
1111

12-
#ifdef DEBUG
13-
14-
- (void)crash;
15-
16-
#endif
17-
1812
NS_ASSUME_NONNULL_END
1913

2014
@end

‎config/Debug.xcconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "../SwiftToolkit/config/Debug.xcconfig"
22
#include "Shared.xcconfig"
33

4-
FRAMEWORK_SEARCH_PATHS = $DEVELOPER_FRAMEWORKS_DIR $PROJECT_DIR/SwiftToolkit/Frameworks/Debug $PROJECT_DIR/lib/Debug
4+
FRAMEWORK_SEARCH_PATHS = $DEVELOPER_FRAMEWORKS_DIR $PROJECT_DIR/lib/Debug
55
HEADER_SEARCH_PATHS = $PROJECT_DIR/lib/Debug/include/GRMustache
66
LIBRARY_SEARCH_PATHS = $PROJECT_DIR/lib/Debug
77
OTHER_SWIFT_FLAGS = -Xcc -fmodule-map-file=$PROJECT_DIR/lib/Debug/include/GRMustache/module.modulemap

‎config/Profile.xcconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "../SwiftToolkit/config/Profile.xcconfig"
22
#include "Shared.xcconfig"
33

4-
FRAMEWORK_SEARCH_PATHS = $DEVELOPER_FRAMEWORKS_DIR $PROJECT_DIR/SwiftToolkit/Frameworks/Release $PROJECT_DIR/lib/Release
4+
FRAMEWORK_SEARCH_PATHS = $DEVELOPER_FRAMEWORKS_DIR $PROJECT_DIR/lib/Release
55
HEADER_SEARCH_PATHS = $PROJECT_DIR/lib/Release/include/GRMustache
66
LIBRARY_SEARCH_PATHS = $PROJECT_DIR/lib/Release
77
OTHER_SWIFT_FLAGS = -Xcc -fmodule-map-file=$PROJECT_DIR/lib/Release/include/GRMustache/module.modulemap

0 commit comments

Comments
 (0)