Fix master (#3069)

realm · Feb 3, 2020 · 5d3403a · 5d3403a
1 parent be44017
commit 5d3403a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/SwiftLint.xcodeproj/project.pbxproj b/SwiftLint.xcodeproj/project.pbxproj
@@ -365,6 +365,7 @@
 		D4DDFF9822396D62006C3629 /* ContainsOverFirstNotNilRuleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4DDFF9722396D62006C3629 /* ContainsOverFirstNotNilRuleTests.swift */; };
 		D4DE9133207B4750000FFAA8 /* UnavailableFunctionRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4DE9131207B4731000FFAA8 /* UnavailableFunctionRule.swift */; };
 		D4E2BA851F6CD77B00E8E184 /* ArrayInitRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4E2BA841F6CD77B00E8E184 /* ArrayInitRule.swift */; };
+		D4E4FB5223E7A1A300746FCD /* LineEndingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4E4FB5123E7A1A300746FCD /* LineEndingTests.swift */; };
 		D4E92D1F2137B4C9002EDD48 /* IdenticalOperandsRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4E92D1E2137B4C9002EDD48 /* IdenticalOperandsRule.swift */; };
 		D4EA77C81F817FD200C315FB /* UnneededBreakInSwitchRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4EA77C71F817FD200C315FB /* UnneededBreakInSwitchRule.swift */; };
 		D4EA77CA1F81FACC00C315FB /* LiteralExpressionEndIdentationRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4EA77C91F81FACC00C315FB /* LiteralExpressionEndIdentationRule.swift */; };
@@ -890,6 +891,7 @@
 		D4DDFF9722396D62006C3629 /* ContainsOverFirstNotNilRuleTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContainsOverFirstNotNilRuleTests.swift; sourceTree = "<group>"; };
 		D4DE9131207B4731000FFAA8 /* UnavailableFunctionRule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnavailableFunctionRule.swift; sourceTree = "<group>"; };
 		D4E2BA841F6CD77B00E8E184 /* ArrayInitRule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayInitRule.swift; sourceTree = "<group>"; };
+		D4E4FB5123E7A1A300746FCD /* LineEndingTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LineEndingTests.swift; sourceTree = "<group>"; };
 		D4E92D1E2137B4C9002EDD48 /* IdenticalOperandsRule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IdenticalOperandsRule.swift; sourceTree = "<group>"; };
 		D4EA77C71F817FD200C315FB /* UnneededBreakInSwitchRule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnneededBreakInSwitchRule.swift; sourceTree = "<group>"; };
 		D4EA77C91F81FACC00C315FB /* LiteralExpressionEndIdentationRule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiteralExpressionEndIdentationRule.swift; sourceTree = "<group>"; };
@@ -1563,6 +1565,7 @@
 				E832F10C1B17E725003F265F /* IntegrationTests.swift */,
 				3B63D46C1E1F05160057BE35 /* LineLengthConfigurationTests.swift */,
 				3B63D46E1E1F09DF0057BE35 /* LineLengthRuleTests.swift */,
+				D4E4FB5123E7A1A300746FCD /* LineEndingTests.swift */,
 				D4C27BFF1E12DFF500DF713E /* LinterCacheTests.swift */,
 				F90DBD802092EA81002CC310 /* MissingDocsRuleConfigurationTests.swift */,
 				1EB7C8521F0C45C2004BAD22 /* ModifierOrderTests.swift */,
@@ -2396,6 +2399,7 @@
 				821F70B7210720C700E2C84F /* FileTypesOrderRuleTests.swift in Sources */,
 				3B3A9A331EA3DFD90075B121 /* IdentifierNameRuleTests.swift in Sources */,
 				62329C2B1F30B2310035737E /* DiscouragedDirectInitRuleTests.swift in Sources */,
+				D4E4FB5223E7A1A300746FCD /* LineEndingTests.swift in Sources */,
 				C25EBBE221078D5F00E27603 /* GlobTests.swift in Sources */,
 				E86396C71BADAFE6002C9E88 /* ReporterTests.swift in Sources */,
 				BCB68283216213130078E4C3 /* CompilerProtocolInitRuleTests.swift in Sources */,

diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift
@@ -397,6 +397,17 @@ extension EnumCaseAssociatedValuesLengthRuleTests {
     ]
 }
 
+extension ExampleTests {
+    static var allTests: [(String, (ExampleTests) -> () throws -> Void)] = [
+        ("testEquatableDoesNotLookAtFile", testEquatableDoesNotLookAtFile),
+        ("testEquatableDoesNotLookAtLine", testEquatableDoesNotLookAtLine),
+        ("testEquatableLooksAtCode", testEquatableLooksAtCode),
+        ("testRemovingViolationMarkers", testRemovingViolationMarkers),
+        ("testComparable", testComparable),
+        ("testWithCode", testWithCode)
+    ]
+}
+
 extension ExpiringTodoRuleTests {
     static var allTests: [(String, (ExpiringTodoRuleTests) -> () throws -> Void)] = [
         ("testExpiringTodo", testExpiringTodo),
@@ -1691,6 +1702,7 @@ XCTMain([
     testCase(EmptyStringRuleTests.allTests),
     testCase(EmptyXCTestMethodRuleTests.allTests),
     testCase(EnumCaseAssociatedValuesLengthRuleTests.allTests),
+    testCase(ExampleTests.allTests),
     testCase(ExpiringTodoRuleTests.allTests),
     testCase(ExplicitACLRuleTests.allTests),
     testCase(ExplicitEnumRawValueRuleTests.allTests),

diff --git a/Tests/SwiftLintFrameworkTests/LineEndingTests.swift b/Tests/SwiftLintFrameworkTests/LineEndingTests.swift
@@ -5,7 +5,7 @@ class LineEndingTests: XCTestCase {
     func testCarriageReturnDoesNotCauseError() {
         XCTAssert(
             violations(
-                "//swiftlint:disable all\r\nprint(123)\r\n"
+                Example("//swiftlint:disable all\r\nprint(123)\r\n")
             ).isEmpty
         )
     }