Merge pull request #4 from agoda-com/update-custom-rules

Update rules
agoda-com · Jul 5, 2022 · 6796df8 · 6796df8
2 parents 10f7636 + 1ffec48
commit 6796df8
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 29 deletions.
diff --git a/Source/SwiftLintFramework/Rules/Idiomatic/XCTMissingSuperSetUpTearDownRule.swift b/Source/SwiftLintFramework/Rules/Idiomatic/XCTMissingSuperSetUpTearDownRule.swift
@@ -11,7 +11,7 @@ public struct XCTMissingSuperSetUpTearDownRule: OptInRule, ConfigurationProvider
         description: "XCTestCase that overrides setUp() or tearDown() methods should call super.",
         kind: .idiomatic,
         nonTriggeringExamples: [
-            """
+            Example("""
             class TestCase: XCTestCase {
               override func setUp() {
                 super.setUp()
@@ -20,11 +20,11 @@ public struct XCTMissingSuperSetUpTearDownRule: OptInRule, ConfigurationProvider
                 super.tearDown()
               }
             }
-            """,
-            """
+            """),
+            Example("""
             class TestCase: XCTestCase {}
-            """,
-            """
+            """),
+            Example("""
             struct MyStruct {
               func setUp() {
                 print("setUp")
@@ -33,10 +33,10 @@ public struct XCTMissingSuperSetUpTearDownRule: OptInRule, ConfigurationProvider
                 print("tearDown")
               }
             }
-            """
+            """)
         ],
         triggeringExamples: [
-            """
+            Example("""
             class TestCase: XCTestCase {
             override func ↓setUp() {
               print("setUp")
@@ -50,7 +50,7 @@ public struct XCTMissingSuperSetUpTearDownRule: OptInRule, ConfigurationProvider
             override class func ↓tearDown() {
               print("tearDown")
             }
-            """
+            """)
         ]
     )
 

diff --git a/Source/SwiftLintFramework/Rules/Idiomatic/XCTNullifyStoredPropertiesRule.swift b/Source/SwiftLintFramework/Rules/Idiomatic/XCTNullifyStoredPropertiesRule.swift
@@ -12,7 +12,7 @@ public struct XCTNullifyStoredPropertiesRule: OptInRule, ConfigurationProviderRu
         description: "XCTestCase should nullify all stored properties in tearDown().",
         kind: .idiomatic,
         nonTriggeringExamples: [
-            """
+            Example("""
             class TestCase: XCTestCase {
               var api: API!
               var data: String? = "data"
@@ -29,10 +29,10 @@ public struct XCTNullifyStoredPropertiesRule: OptInRule, ConfigurationProviderRu
                 super.tearDown()
               }
             }
-            """
+            """)
         ],
         triggeringExamples: [
-            """
+            Example("""
             class TestCase: XCTestCase {
               var ↓api: API!
               var data: String? = "data"
@@ -47,8 +47,8 @@ public struct XCTNullifyStoredPropertiesRule: OptInRule, ConfigurationProviderRu
                 super.tearDown()
               }
             }
-            """,
-            """
+            """),
+            Example("""
             class TestCase: XCTestCase {
               var ↓api: API!
               var ↓data: String? = "data"
@@ -58,8 +58,8 @@ public struct XCTNullifyStoredPropertiesRule: OptInRule, ConfigurationProviderRu
                 api = API()
               }
             }
-            """,
-            """
+            """),
+            Example("""
             class TestCase: XCTestCase {
               var ↓api: API!
               var data: String? = "data"
@@ -70,7 +70,7 @@ public struct XCTNullifyStoredPropertiesRule: OptInRule, ConfigurationProviderRu
                 super.tearDown()
               }
             }
-            """
+            """)
         ]
     )
 
@@ -113,9 +113,8 @@ public struct XCTNullifyStoredPropertiesRule: OptInRule, ConfigurationProviderRu
 extension SwiftLintFile {
     func bodyRange(of dictionary: SourceKittenDictionary) -> NSRange? {
         guard
-            let offset = dictionary.bodyOffset,
-            let length = dictionary.bodyLength,
-            let range = stringView.byteRangeToNSRange(start: offset, length: length)
+            let bodyByteRange = dictionary.bodyByteRange,
+            let range = stringView.byteRangeToNSRange(bodyByteRange)
         else {
             return nil
         }

diff --git a/Source/SwiftLintFramework/Rules/Idiomatic/XCTResetSharedStateRule.swift b/Source/SwiftLintFramework/Rules/Idiomatic/XCTResetSharedStateRule.swift
@@ -12,7 +12,7 @@ public struct XCTResetSharedStateRule: OptInRule, ConfigurationProviderRule, Aut
         description: "XCTestCase should reset shared state in tearDown().",
         kind: .idiomatic,
         nonTriggeringExamples: [
-            """
+            Example("""
             class TestCase: XCTestCase {
               override func setUp() {
                 super.setUp()
@@ -28,8 +28,8 @@ public struct XCTResetSharedStateRule: OptInRule, ConfigurationProviderRule, Aut
                 MySharedStateComponent.setUp(with: Configuration())
               }
             }
-            """,
-            """
+            """),
+            Example("""
             class TestCase: XCTestCase {
               override func setUp() {
                 super.setUp()
@@ -41,10 +41,10 @@ public struct XCTResetSharedStateRule: OptInRule, ConfigurationProviderRule, Aut
                 MySharedStateComponent.setUp()
               }
             }
-            """
+            """)
         ],
         triggeringExamples: [
-            """
+            Example("""
             class TestCase: XCTestCase {
               override func setUp() {
                 super.setUp()
@@ -55,22 +55,22 @@ public struct XCTResetSharedStateRule: OptInRule, ConfigurationProviderRule, Aut
                 super.tearDown()
               }
             }
-            """,
-            """
+            """),
+            Example("""
             class TestCase: XCTestCase {
               override func setUp() {
                 super.setUp()
                 ↓MySharedStateComponent.setUp()
               }
             }
-            """,
-            """
+            """),
+            Example("""
             class TestCase: XCTestCase {
               func testComponent() {
                 ↓MySharedStateComponent.setUp(with: Configuration())
               }
             }
-            """
+            """)
         ]
     )