commit bce0528550d63b079935693b876194486e96bd81
author Googler <noreply@google.com> Thu Jan 30 10:41:52 2020 -0500
committer David Goldman <davg@google.com> Mon Feb 24 12:38:22 2020 -0500
tree 10ab7db6b714f8abf742e3fb366612fdc3611fec
parent 08e9799f7e2c599df32af04b5018ea627e742b33

Don't check ordering for defines

This will improve the robustness of the tests, as define ordering is
not meaningful.

PiperOrigin-RevId: 292345582

BUILD

diff --git a/BUILD b/BUILD
index 4ecf9e9..9963588 100644
--- a/BUILD
+++ b/BUILD
@@ -28,8 +28,8 @@
     build_version = "%s.{date}.{buildnum}" % TULSI_VERSION_MAJOR,
     capture_groups = {
         "project": "[^_]*",
-        "date": "\d+",
-        "buildnum": "\d+",
+        "date": "\\d+",
+        "buildnum": "\\d+",
     },
     fallback_build_label = "tulsi_%s_build88" % TULSI_VERSION_DATE,
 )

src/TulsiGeneratorIntegrationTests/AspectTests.swift

diff --git a/src/TulsiGeneratorIntegrationTests/AspectTests.swift b/src/TulsiGeneratorIntegrationTests/AspectTests.swift
index 27d36fb..7bca999 100644
--- a/src/TulsiGeneratorIntegrationTests/AspectTests.swift
+++ b/src/TulsiGeneratorIntegrationTests/AspectTests.swift
@@ -709,13 +709,13 @@
 
     /// Asserts that the contextual RuleEntry has an attribute with the given name and value.
     @discardableResult
-    func hasObjcDefines(_ value: [String], line: UInt = #line) -> Context {
+    func hasObjcDefines(_ value: Set<String>, line: UInt = #line) -> Context {
       guard let ruleEntry = ruleEntry else { return self }
       guard let defines = ruleEntry.objcDefines else {
         XCTFail("\(ruleEntry) expected to have defines", line: line)
         return self
       }
-      XCTAssertEqual(defines, value, line: line)
+      XCTAssertEqual(Set(defines), value, line: line)
       return self
     }