aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Foundation/GTMNSAppleScript+HandlerTest.m2
-rw-r--r--GTM.xcodeproj/project.pbxproj4
-rw-r--r--UnitTesting/GTMNSObject+BindingUnitTesting.m2
-rw-r--r--UnitTesting/TestData/GTMUnitTestingTestApp.gtmUTState8
-rw-r--r--UnitTesting/TestData/GTMUnitTestingWindow.10.5.8.tiffbin0 -> 21176 bytes
-rw-r--r--UnitTesting/TestData/GTMUnitTestingWindow.gtmUTState8
6 files changed, 22 insertions, 2 deletions
diff --git a/Foundation/GTMNSAppleScript+HandlerTest.m b/Foundation/GTMNSAppleScript+HandlerTest.m
index ee3fe1a..fdf3a57 100644
--- a/Foundation/GTMNSAppleScript+HandlerTest.m
+++ b/Foundation/GTMNSAppleScript+HandlerTest.m
@@ -36,7 +36,7 @@
// GTMNSAppleScript+Handler.h for more details, but we disable them to avoid
// the tests failing (crashing) when it's Apple's bug. Please bump the system
// check as appropriate when new systems are tested. Currently broken on
- // 10.5.6 and below. Radar 6126682.
+ // 10.5.7 and below. Radar 6126682.
SInt32 major, minor, bugfix;
[GTMSystemVersion getMajor:&major minor:&minor bugFix:&bugfix];
if (!(GTMIsGarbageCollectionEnabled()
diff --git a/GTM.xcodeproj/project.pbxproj b/GTM.xcodeproj/project.pbxproj
index d8c39e2..a557f88 100644
--- a/GTM.xcodeproj/project.pbxproj
+++ b/GTM.xcodeproj/project.pbxproj
@@ -276,6 +276,7 @@
F42E2D24102B24E5004DF054 /* GTMUILocalizerAndLayoutTweakerTest2-0.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F42E2D21102B24E5004DF054 /* GTMUILocalizerAndLayoutTweakerTest2-0.tiff */; };
F42E2D25102B24E5004DF054 /* GTMUILocalizerAndLayoutTweakerTest2-1.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F42E2D22102B24E5004DF054 /* GTMUILocalizerAndLayoutTweakerTest2-1.tiff */; };
F42E2D26102B24E5004DF054 /* GTMUILocalizerAndLayoutTweakerTest2-2.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F42E2D23102B24E5004DF054 /* GTMUILocalizerAndLayoutTweakerTest2-2.tiff */; };
+ F42F50F91057E99200BFC735 /* GTMUnitTestingWindow.10.5.8.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F42F50E81057E91A00BFC735 /* GTMUnitTestingWindow.10.5.8.tiff */; };
F431221D0DD4E3B800F45252 /* GTMStackTrace.h in Headers */ = {isa = PBXBuildFile; fileRef = F431221A0DD4E3B800F45252 /* GTMStackTrace.h */; settings = {ATTRIBUTES = (Public, ); }; };
F431221F0DD4E3C900F45252 /* GTMStackTraceTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F431221B0DD4E3B800F45252 /* GTMStackTraceTest.m */; };
F435DE7C0DC0B6580069CDE8 /* GTMNSBezierPath+CGPathTest.ppc64.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F435DE7A0DC0B6580069CDE8 /* GTMNSBezierPath+CGPathTest.ppc64.tiff */; };
@@ -632,6 +633,7 @@
F42E2D21102B24E5004DF054 /* GTMUILocalizerAndLayoutTweakerTest2-0.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "GTMUILocalizerAndLayoutTweakerTest2-0.tiff"; sourceTree = "<group>"; };
F42E2D22102B24E5004DF054 /* GTMUILocalizerAndLayoutTweakerTest2-1.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "GTMUILocalizerAndLayoutTweakerTest2-1.tiff"; sourceTree = "<group>"; };
F42E2D23102B24E5004DF054 /* GTMUILocalizerAndLayoutTweakerTest2-2.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "GTMUILocalizerAndLayoutTweakerTest2-2.tiff"; sourceTree = "<group>"; };
+ F42F50E81057E91A00BFC735 /* GTMUnitTestingWindow.10.5.8.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = GTMUnitTestingWindow.10.5.8.tiff; sourceTree = "<group>"; };
F431221A0DD4E3B800F45252 /* GTMStackTrace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMStackTrace.h; sourceTree = "<group>"; };
F431221B0DD4E3B800F45252 /* GTMStackTraceTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMStackTraceTest.m; sourceTree = "<group>"; };
F435DE7A0DC0B6580069CDE8 /* GTMNSBezierPath+CGPathTest.ppc64.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "GTMNSBezierPath+CGPathTest.ppc64.tiff"; sourceTree = "<group>"; };
@@ -941,6 +943,7 @@
8BEEA90B0DA7446300894774 /* GTMUnitTestingWindow.tiff */,
8B2789950EF855FB00D68C01 /* GTMUnitTestingWindow.10.5.6.tiff */,
F48D000C0FE994BF00428D0B /* GTMUnitTestingWindow.10.5.7.tiff */,
+ F42F50E81057E91A00BFC735 /* GTMUnitTestingWindow.10.5.8.tiff */,
84B91B8A0EA3CC2E0087500F /* GTMUnitTestingWindow.10.6.0.tiff */,
8BEEA90C0DA7446300894774 /* GTMUnitTestingView.tiff */,
);
@@ -1595,6 +1598,7 @@
84B91B8C0EA3CC2E0087500F /* GTMUnitTestingWindow.10.6.0.tiff in Resources */,
8B2789960EF855FB00D68C01 /* GTMUnitTestingWindow.10.5.6.tiff in Resources */,
F48D000D0FE994C900428D0B /* GTMUnitTestingWindow.10.5.7.tiff in Resources */,
+ F42F50F91057E99200BFC735 /* GTMUnitTestingWindow.10.5.8.tiff in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/UnitTesting/GTMNSObject+BindingUnitTesting.m b/UnitTesting/GTMNSObject+BindingUnitTesting.m
index 85c81ae..a235bc0 100644
--- a/UnitTesting/GTMNSObject+BindingUnitTesting.m
+++ b/UnitTesting/GTMNSObject+BindingUnitTesting.m
@@ -429,7 +429,7 @@ BOOL GTMDoExposedBindingsFunctionCorrectly(NSObject *object,
NSMutableArray *array = [super gtm_unitTestExposedBindingsToIgnore];
SInt32 major, minor, bugFix;
[GTMSystemVersion getMajor:&major minor:&minor bugFix:&bugFix];
- if (major <= 10 && minor <= 5 && bugFix <= 7) {
+ if (major <= 10 && minor <= 5 && bugFix <= 8) {
// rdar://5851491 - Setting NSAlignmentBinding of search field to
// NSCenterTextAlignment broken
// Broken on 10.5.7 and below.
diff --git a/UnitTesting/TestData/GTMUnitTestingTestApp.gtmUTState b/UnitTesting/TestData/GTMUnitTestingTestApp.gtmUTState
index ccbdfa8..db045bf 100644
--- a/UnitTesting/TestData/GTMUnitTestingTestApp.gtmUTState
+++ b/UnitTesting/TestData/GTMUnitTestingTestApp.gtmUTState
@@ -1369,6 +1369,14 @@
</dict>
<key>ViewSubView 1</key>
<dict>
+ <key>BoxBorderType</key>
+ <integer>3</integer>
+ <key>BoxTitle</key>
+ <string>Box</string>
+ <key>BoxTitlePosition</key>
+ <integer>0</integer>
+ <key>BoxType</key>
+ <integer>2</integer>
<key>ViewIsHidden</key>
<false/>
</dict>
diff --git a/UnitTesting/TestData/GTMUnitTestingWindow.10.5.8.tiff b/UnitTesting/TestData/GTMUnitTestingWindow.10.5.8.tiff
new file mode 100644
index 0000000..9179576
--- /dev/null
+++ b/UnitTesting/TestData/GTMUnitTestingWindow.10.5.8.tiff
Binary files differ
diff --git a/UnitTesting/TestData/GTMUnitTestingWindow.gtmUTState b/UnitTesting/TestData/GTMUnitTestingWindow.gtmUTState
index c80a4fb..8cba4c4 100644
--- a/UnitTesting/TestData/GTMUnitTestingWindow.gtmUTState
+++ b/UnitTesting/TestData/GTMUnitTestingWindow.gtmUTState
@@ -70,6 +70,14 @@
</dict>
<key>ViewSubView 1</key>
<dict>
+ <key>BoxBorderType</key>
+ <integer>3</integer>
+ <key>BoxTitle</key>
+ <string>Box</string>
+ <key>BoxTitlePosition</key>
+ <integer>0</integer>
+ <key>BoxType</key>
+ <integer>2</integer>
<key>ViewIsHidden</key>
<false/>
</dict>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-07 06:10:51 +0000