Skip to content

Commit fa4f220

Browse files
ddnanddnan
authored
Updating test apps for CSH backend (#4806)
* Updating test apps for CSH backend * Updating test apps for CSH backend with changes * Style
1 parent 1797950 commit fa4f220

File tree

4 files changed

+86
-32
lines changed

4 files changed

+86
-32
lines changed

‎GoogleDataTransportCCTSupport/GDTCCTTestApp/app.swift

Lines changed: 59 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import GoogleDataTransport
3232
public class ViewController: UIViewController {
3333
let cctTransport: GDTCORTransport = GDTCORTransport(mappingID: "1018", transformers: nil, target: GDTCORTarget.CCT.rawValue)!
3434
let fllTransport: GDTCORTransport = GDTCORTransport(mappingID: "1018", transformers: nil, target: GDTCORTarget.FLL.rawValue)!
35+
let cshTransport: GDTCORTransport = GDTCORTransport(mappingID: "1018", transformers: nil, target: GDTCORTarget.CSH.rawValue)!
3536

3637
@IBOutlet var backendSwitch: UISegmentedControl?
3738

@@ -41,15 +42,40 @@ import GoogleDataTransport
4142
if !Thread.current.isMainThread {
4243
DispatchQueue.main.sync {
4344
if Globals.IsMonkeyTesting {
44-
backendSwitch?.selectedSegmentIndex = Int(arc4random_uniform(2))
45+
backendSwitch?.selectedSegmentIndex = Int(arc4random_uniform(3))
46+
}
47+
switch backendSwitch?.selectedSegmentIndex {
48+
case 0:
49+
theTransport = cctTransport
50+
51+
case 1:
52+
theTransport = fllTransport
53+
54+
case 2:
55+
theTransport = cshTransport
56+
57+
default:
58+
theTransport = cctTransport
4559
}
46-
theTransport = backendSwitch?.selectedSegmentIndex == 0 ? cctTransport : fllTransport
4760
}
4861
} else {
4962
if Globals.IsMonkeyTesting {
50-
backendSwitch?.selectedSegmentIndex = Int(arc4random_uniform(2))
63+
backendSwitch?.selectedSegmentIndex = Int(arc4random_uniform(3))
64+
}
65+
66+
switch backendSwitch?.selectedSegmentIndex {
67+
case 0:
68+
theTransport = cctTransport
69+
70+
case 1:
71+
theTransport = fllTransport
72+
73+
case 2:
74+
theTransport = cshTransport
75+
76+
default:
77+
theTransport = cctTransport
5178
}
52-
theTransport = backendSwitch?.selectedSegmentIndex == 0 ? cctTransport : fllTransport
5379
}
5480
return theTransport
5581
}
@@ -68,6 +94,7 @@ import GoogleDataTransport
6894
public class ViewController: NSViewController {
6995
let cctTransport: GDTCORTransport = GDTCORTransport(mappingID: "1018", transformers: nil, target: GDTCORTarget.CCT.rawValue)!
7096
let fllTransport: GDTCORTransport = GDTCORTransport(mappingID: "1018", transformers: nil, target: GDTCORTarget.FLL.rawValue)!
97+
let cshTransport: GDTCORTransport = GDTCORTransport(mappingID: "1018", transformers: nil, target: GDTCORTarget.CSH.rawValue)!
7198

7299
@IBOutlet var backendSwitch: NSSegmentedControl?
73100

@@ -76,15 +103,39 @@ import GoogleDataTransport
76103
if !Thread.current.isMainThread {
77104
DispatchQueue.main.sync {
78105
if Globals.IsMonkeyTesting {
79-
backendSwitch?.selectedSegment = Int(arc4random_uniform(2))
106+
backendSwitch?.selectedSegment = Int(arc4random_uniform(3))
107+
}
108+
switch backendSwitch?.selectedSegment {
109+
case 0:
110+
theTransport = cctTransport
111+
112+
case 1:
113+
theTransport = fllTransport
114+
115+
case 2:
116+
theTransport = cshTransport
117+
118+
default:
119+
theTransport = cctTransport
80120
}
81-
theTransport = backendSwitch?.selectedSegment == 0 ? cctTransport : fllTransport
82121
}
83122
} else {
84123
if Globals.IsMonkeyTesting {
85-
backendSwitch?.selectedSegment = Int(arc4random_uniform(2))
124+
backendSwitch?.selectedSegment = Int(arc4random_uniform(3))
125+
}
126+
switch backendSwitch?.selectedSegment {
127+
case 0:
128+
theTransport = cctTransport
129+
130+
case 1:
131+
theTransport = fllTransport
132+
133+
case 2:
134+
theTransport = cshTransport
135+
136+
default:
137+
theTransport = cctTransport
86138
}
87-
theTransport = backendSwitch?.selectedSegment == 0 ? cctTransport : fllTransport
88139
}
89140
return theTransport
90141
}

‎GoogleDataTransportCCTSupport/GDTCCTTestApp/ios/Main.storyboard

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
33
<device id="retina5_5" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
77
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
88
</dependencies>
99
<scenes>
@@ -26,14 +26,15 @@
2626
<nil key="highlightedColor"/>
2727
</label>
2828
<segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="9fC-1b-Rvu">
29-
<rect key="frame" x="284" y="3" width="91" height="32"/>
29+
<rect key="frame" x="20" y="37" width="140" height="32"/>
3030
<segments>
3131
<segment title="CCT"/>
3232
<segment title="FLL"/>
33+
<segment title="CSH"/>
3334
</segments>
3435
</segmentedControl>
3536
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="674-uo-mtw">
36-
<rect key="frame" x="20" y="42" width="369" height="55"/>
37+
<rect key="frame" x="20" y="76" width="369" height="55"/>
3738
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
3839
<constraints>
3940
<constraint firstAttribute="height" constant="55" id="S2Z-8q-89v"/>
@@ -46,7 +47,7 @@
4647
</connections>
4748
</button>
4849
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="FD9-Mn-in7">
49-
<rect key="frame" x="20" y="105" width="369" height="55"/>
50+
<rect key="frame" x="20" y="139" width="369" height="55"/>
5051
<color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
5152
<constraints>
5253
<constraint firstAttribute="height" constant="55" id="mYc-rL-3cW"/>
@@ -59,7 +60,7 @@
5960
</connections>
6061
</button>
6162
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IFu-Rf-wNA">
62-
<rect key="frame" x="20" y="168" width="369" height="55"/>
63+
<rect key="frame" x="20" y="202" width="369" height="55"/>
6364
<color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
6465
<constraints>
6566
<constraint firstAttribute="height" constant="55" id="Xp1-a8-nh0"/>
@@ -72,7 +73,7 @@
7273
</connections>
7374
</button>
7475
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yTs-B1-Yoh">
75-
<rect key="frame" x="20" y="231" width="369" height="55"/>
76+
<rect key="frame" x="20" y="265" width="369" height="55"/>
7677
<color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
7778
<constraints>
7879
<constraint firstAttribute="height" constant="55" id="jJR-dP-ezp"/>
@@ -85,7 +86,7 @@
8586
</connections>
8687
</button>
8788
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QpN-cI-JZa">
88-
<rect key="frame" x="20" y="294" width="369" height="55"/>
89+
<rect key="frame" x="20" y="328" width="369" height="55"/>
8990
<color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
9091
<constraints>
9192
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="55" id="LEk-X2-0qf"/>
@@ -103,7 +104,7 @@
103104
<constraints>
104105
<constraint firstItem="674-uo-mtw" firstAttribute="leading" secondItem="FD9-Mn-in7" secondAttribute="leading" id="2MG-RM-cIL"/>
105106
<constraint firstItem="yTs-B1-Yoh" firstAttribute="leading" secondItem="QpN-cI-JZa" secondAttribute="leading" id="3AV-qq-ttG"/>
106-
<constraint firstItem="9fC-1b-Rvu" firstAttribute="leading" secondItem="L83-mC-jNW" secondAttribute="trailing" constant="28" id="F3k-xF-AZv"/>
107+
<constraint firstItem="9fC-1b-Rvu" firstAttribute="leading" secondItem="L83-mC-jNW" secondAttribute="trailing" constant="-236" id="F3k-xF-AZv"/>
107108
<constraint firstItem="IFu-Rf-wNA" firstAttribute="leading" secondItem="yTs-B1-Yoh" secondAttribute="leading" id="J3A-D1-3Wc"/>
108109
<constraint firstItem="QpN-cI-JZa" firstAttribute="top" secondItem="yTs-B1-Yoh" secondAttribute="bottom" constant="8" symbolic="YES" id="JwZ-sw-3Fd"/>
109110
<constraint firstItem="674-uo-mtw" firstAttribute="trailing" secondItem="FD9-Mn-in7" secondAttribute="trailing" id="K5w-h4-9CX"/>
@@ -119,7 +120,7 @@
119120
<constraint firstItem="yTs-B1-Yoh" firstAttribute="top" secondItem="IFu-Rf-wNA" secondAttribute="bottom" constant="8" symbolic="YES" id="pOu-Fj-7jV"/>
120121
<constraint firstItem="674-uo-mtw" firstAttribute="top" secondItem="9fC-1b-Rvu" secondAttribute="bottom" constant="8" symbolic="YES" id="sw7-fX-DwC"/>
121122
<constraint firstAttribute="trailingMargin" secondItem="674-uo-mtw" secondAttribute="trailing" constant="5" id="ySl-NP-P12"/>
122-
<constraint firstItem="L83-mC-jNW" firstAttribute="centerY" secondItem="9fC-1b-Rvu" secondAttribute="centerY" id="yh9-Qb-nF3"/>
123+
<constraint firstItem="L83-mC-jNW" firstAttribute="centerY" secondItem="9fC-1b-Rvu" secondAttribute="centerY" constant="-34" id="yh9-Qb-nF3"/>
123124
</constraints>
124125
</view>
125126
<connections>

‎GoogleDataTransportCCTSupport/GDTCCTTestApp/macos/Main.storyboard

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14868" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14868"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15702"/>
66
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
77
</dependencies>
88
<scenes>
@@ -770,8 +770,8 @@
770770
<action selector="generateDailyEventWithSender:" target="XfG-lQ-9wD" id="nLB-7y-yWa"/>
771771
</connections>
772772
</button>
773-
<segmentedControl verticalHuggingPriority="750" misplaced="YES" springLoaded="YES" translatesAutoresizingMaskIntoConstraints="NO" id="k6I-AV-bFw">
774-
<rect key="frame" x="358" y="177" width="104" height="24"/>
773+
<segmentedControl verticalHuggingPriority="750" springLoaded="YES" translatesAutoresizingMaskIntoConstraints="NO" id="k6I-AV-bFw">
774+
<rect key="frame" x="317" y="177" width="145" height="24"/>
775775
<constraints>
776776
<constraint firstAttribute="height" constant="21" id="Rhk-Q2-W55"/>
777777
</constraints>
@@ -780,19 +780,20 @@
780780
<segments>
781781
<segment label="CCT" selected="YES"/>
782782
<segment label="FLL" tag="1"/>
783+
<segment label="CSH"/>
783784
</segments>
784785
</segmentedCell>
785786
</segmentedControl>
786787
</subviews>
787788
<constraints>
788-
<constraint firstItem="aiw-VS-cNk" firstAttribute="top" secondItem="k6I-AV-bFw" secondAttribute="bottom" constant="5" id="4bB-Fp-all"/>
789+
<constraint firstItem="aiw-VS-cNk" firstAttribute="top" secondItem="k6I-AV-bFw" secondAttribute="bottom" constant="4" id="4bB-Fp-all"/>
789790
<constraint firstItem="2ft-D0-CMq" firstAttribute="top" secondItem="aiw-VS-cNk" secondAttribute="bottom" constant="12" symbolic="YES" id="5of-K7-QY4"/>
790791
<constraint firstItem="CDv-jq-Itb" firstAttribute="leading" secondItem="m2S-Jp-Qdl" secondAttribute="leading" constant="20" symbolic="YES" id="IzD-5w-Bq1"/>
791792
<constraint firstItem="2ft-D0-CMq" firstAttribute="trailing" secondItem="IlF-o2-Jac" secondAttribute="trailing" id="MZ4-Vp-Bk3"/>
792793
<constraint firstItem="2ft-D0-CMq" firstAttribute="trailing" secondItem="Uh8-3g-UwR" secondAttribute="trailing" id="N94-GB-w24"/>
793794
<constraint firstItem="CDv-jq-Itb" firstAttribute="leading" secondItem="aiw-VS-cNk" secondAttribute="leading" id="OBj-sJ-eFn"/>
794795
<constraint firstItem="IlF-o2-Jac" firstAttribute="top" secondItem="aSo-QZ-e6X" secondAttribute="bottom" constant="12" symbolic="YES" id="PK3-yK-9bq"/>
795-
<constraint firstItem="k6I-AV-bFw" firstAttribute="centerY" secondItem="CDv-jq-Itb" secondAttribute="centerY" id="VcQ-7S-yQB"/>
796+
<constraint firstItem="k6I-AV-bFw" firstAttribute="centerY" secondItem="CDv-jq-Itb" secondAttribute="centerY" constant="1" id="VcQ-7S-yQB"/>
796797
<constraint firstItem="CDv-jq-Itb" firstAttribute="leading" secondItem="2ft-D0-CMq" secondAttribute="leading" id="WS1-Ar-msV"/>
797798
<constraint firstAttribute="trailing" secondItem="2ft-D0-CMq" secondAttribute="trailing" constant="20" symbolic="YES" id="X3u-Lt-dG9"/>
798799
<constraint firstItem="2ft-D0-CMq" firstAttribute="trailing" secondItem="aiw-VS-cNk" secondAttribute="trailing" id="bWR-0E-3HY"/>

0 commit comments

Comments
 (0)