Set default log level in load instead of getter (google#23)

paulb777 · Sep 6, 2023 · d6b709f · d6b709f
1 parent abe7026
commit d6b709f
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 7 deletions.
diff --git a/AppCheckCore/Sources/Core/GACAppCheckLogger.m b/AppCheckCore/Sources/Core/GACAppCheckLogger.m
@@ -27,14 +27,12 @@ @implementation GACAppCheckLogger
 // Note: Declared as volatile to make getting and setting atomic.
 static volatile GACAppCheckLogLevel _logLevel;
 
++ (void)load {
+  // Set the default log level (warning).
+  _logLevel = GACAppCheckLogLevelWarning;
+}
+
 + (GACAppCheckLogLevel)logLevel {
-  static dispatch_once_t once;
-  dispatch_once(&once, ^{
-    if (!_logLevel) {
-      // Set the default log level (warning) if not yet set.
-      _logLevel = GACAppCheckLogLevelWarning;
-    }
-  });
   return _logLevel;
 }
 

diff --git a/AppCheckCore/Tests/Unit/Core/GACAppCheckLoggerTests.m b/AppCheckCore/Tests/Unit/Core/GACAppCheckLoggerTests.m
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@import XCTest;
+
+#import "AppCheckCore/Sources/Public/AppCheckCore/GACAppCheckLogger.h"
+
+@interface GACAppCheckLoggerTests : XCTestCase
+@end
+
+@implementation GACAppCheckLoggerTests
+
+- (void)testDefaultLogLevel {
+  GACAppCheckLogLevel defaultLogLevel = GACAppCheckLogger.logLevel;
+
+  XCTAssertEqual(defaultLogLevel, GACAppCheckLogLevelWarning);
+}
+
+- (void)testSetLogLevel {
+  GACAppCheckLogLevel expectedLogLevel = GACAppCheckLogLevelDebug;
+
+  GACAppCheckLogger.logLevel = expectedLogLevel;
+
+  XCTAssertEqual(GACAppCheckLogger.logLevel, expectedLogLevel);
+}
+
+@end