Merge pull request #10 from tnek/master

Update bazel version, add test for teamID
google · Oct 15, 2021 · 1fc72bc · 1fc72bc
2 parents 7ef66f1 + c992bf7
commit 1fc72bc
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/BUILD b/BUILD
@@ -13,12 +13,12 @@ objc_library(
 objc_library(
     name = "MOLCodesignCheckerTestsLib",
     srcs = ["Tests/MOLCodesignCheckerTest.m"],
-    data = glob(["Tests/Resources/*"]),
     deps = [":MOLCodesignChecker"],
 )
 
 macos_unit_test(
     name = "MOLCodesignCheckerTests",
     minimum_os_version = "10.9",
+    resources = glob(["Tests/Resources/*"]),
     deps = [":MOLCodesignCheckerTestsLib"],
 )
diff --git a/README.md b/README.md
@@ -50,13 +50,13 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 git_repository(
     name = "MOLCertificate",
     remote = "https://github.com/google/macops-molcertificate.git",
-    tag = "v2.0",
+    tag = "v2.1",
 )
 
 git_repository(
     name = "MOLCodesignChecker",
     remote = "https://github.com/google/macops-molcodesignchecker.git",
-    tag = "v2.1",
+    tag = "v2.2",
 )
 ```
 

diff --git a/Tests/MOLCodesignCheckerTest.m b/Tests/MOLCodesignCheckerTest.m
@@ -133,8 +133,7 @@ - (void)testAllArchitectures {
   NSError *error;
   NSBundle *bundle = [NSBundle bundleForClass:[self class]];
   NSString *path = [bundle pathForResource:@"cal-yikes-universal" ofType:@""];
-  MOLCodesignChecker *sut =
-      [[MOLCodesignChecker alloc] initWithBinaryPath:path error:&error];
+  MOLCodesignChecker *sut = [[MOLCodesignChecker alloc] initWithBinaryPath:path error:&error];
   XCTAssertNotNil(sut.universalSigningInformation);
   XCTAssertNil(sut.leafCertificate);
   XCTAssertEqual(error.code, errSecCSSignatureInvalid);
@@ -177,4 +176,17 @@ - (void)testAllArchitectures {
   XCTAssertNil(error);
 }
 
+- (void)testTeamID {
+  NSError *error;
+  NSBundle *bundle = [NSBundle bundleForClass:[self class]];
+  NSString *path = [bundle pathForResource:@"signed-with-teamid" ofType:@""];
+
+  MOLCodesignChecker *sut = [[MOLCodesignChecker alloc] initWithBinaryPath:path error:&error];
+  XCTAssertNotNil(sut.signingInformation);
+  XCTAssertNil(error);
+
+  NSString *gotTeamID = [sut.signingInformation valueForKey:@"teamid"];
+  XCTAssertEqualObjects(@"EQHXZ8M8AV", gotTeamID);
+}
+
 @end
diff --git a/Tests/Resources/signed-with-teamid b/Tests/Resources/signed-with-teamid
diff --git a/WORKSPACE b/WORKSPACE
@@ -3,7 +3,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 git_repository(
     name = "build_bazel_rules_apple",
     remote = "https://github.com/bazelbuild/rules_apple.git",
-    tag = "0.13.0",
+    tag = "0.31.3",
 )
 
 load(
@@ -16,6 +16,5 @@ apple_rules_dependencies()
 git_repository(
     name = "MOLCertificate",
     remote = "https://github.com/google/macops-molcertificate.git",
-    tag = "v2.0",
+    tag = "v2.1",
 )
-