one test added

BigBackBoom · Jun 13, 2015 · 3117947 · 3117947
1 parent 5ce8e03
commit 3117947
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 20 deletions.
diff --git a/Tabata/Base.lproj/Main.storyboard b/Tabata/Base.lproj/Main.storyboard
@@ -239,11 +239,11 @@
                         <viewControllerLayoutGuide type="bottom" id="d7e-Z5-ZaJ"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="NVb-nG-AKk">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Tabata" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kco-2T-KNK">
-                                <rect key="frame" x="152" y="28" width="111" height="46"/>
+                                <rect key="frame" x="245" y="28" width="111" height="46"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="lessThanOrEqual" constant="111" id="bI8-vU-R2q"/>
                                 </constraints>
@@ -257,7 +257,7 @@
                                 </variation>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="k3M-b6-ztH">
-                                <rect key="frame" x="335" y="698" width="49" height="30"/>
+                                <rect key="frame" x="521" y="562" width="49" height="30"/>
                                 <state key="normal" title="Setting">
                                     <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
@@ -266,7 +266,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="b3z-QG-V8i">
-                                <rect key="frame" x="57" y="150" width="300" height="300"/>
+                                <rect key="frame" x="150" y="150" width="300" height="300"/>
                                 <accessibility key="accessibilityConfiguration" label="starExercise"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="300" id="Q4q-Th-MsI"/>
@@ -502,7 +502,7 @@
             <objects>
                 <tableViewController id="Mag-dY-7zQ" customClass="SettingTableViewController" customModule="Tabata" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" rowHeight="45" sectionHeaderHeight="22" sectionFooterHeight="22" id="pXg-Cv-cq0">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <sections>
@@ -519,7 +519,7 @@
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Q4Z-t6-tmT">
+                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Q4Z-t6-tmT">
                                                     <rect key="frame" x="472" y="8" width="60" height="30"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="60" id="bDv-aq-t2F"/>
@@ -541,7 +541,7 @@
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="TWv-Re-Rei" id="1eD-ov-RBL">
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="4f8-Wx-W6h">
+                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="4f8-Wx-W6h">
                                                     <rect key="frame" x="472" y="5" width="60" height="30"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="60" id="Xp9-pz-Ujf"/>
@@ -576,7 +576,7 @@
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="LK1-jN-vQB">
+                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="LK1-jN-vQB">
                                                     <rect key="frame" x="472" y="7" width="60" height="30"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="60" id="1IJ-gH-fWK"/>
@@ -616,7 +616,7 @@
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="tpb-Ow-qEz" id="kjZ-26-voi">
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ooH-87-hmr">
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ooH-87-hmr">
                                                     <rect key="frame" x="283" y="7" width="34" height="30"/>
                                                     <state key="normal" title="Save">
                                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -661,6 +661,6 @@
         <image name="tabataBtm3" width="1098" height="518"/>
     </resources>
     <inferredMetricsTieBreakers>
-        <segue reference="M2r-kL-2Pk"/>
+        <segue reference="8A7-Bh-eTM"/>
     </inferredMetricsTieBreakers>
 </document>
diff --git a/TabataTests/DatabaseCommsTests.swift b/TabataTests/DatabaseCommsTests.swift
@@ -23,7 +23,7 @@ class DatabaseCommsTests: XCTestCase {
         //Testing that login:: function return false
         XCTAssert(!login(username, password), "The reult need to be false")
 
-        username = "testtest"
+        username = "kodai"
         password = "1234"
         //Testing login:: returns true
         XCTAssert(login(username, password), "The reult need to be true")

diff --git a/TabataTests/TabataTests.swift b/TabataTests/TabataTests.swift
@@ -21,11 +21,6 @@ class TabataTests: XCTestCase {
         super.tearDown()
     }
 
-    func testExample() {
-        // This is an example of a functional test case.
-        XCTAssert(true, "Pass")
-    }
-
     func testPerformanceExample() {
         // This is an example of a performance test case.
         self.measureBlock() {

diff --git a/TabataTests/TimerTests.swift b/TabataTests/TimerTests.swift
@@ -2,7 +2,7 @@
 //  Created by Kodai Kikuchi on 2015/03/19.
 //  Copyright (c) 2015年 deco3800. All rights reserved.
 //
-/*
+
 
 import UIKit
 import XCTest
@@ -17,8 +17,8 @@ class TimerTests: XCTestCase {
     override func setUp() {
         super.setUp()
 
-        //initializing countdown timer
-        countingTimer = Timer(counter: 40.0,  cycle: 4, restTime: 10, circleProgressBar: circleProgressBar, timerLabel: timerLabel)
+        //initializing countdown time
+        countingTimer = Timer(counter: 40.0,  cycle: 4, restTime: 10, circleProgressBar: circleProgressBar, timerLabel: nil, currentCycleLabel: nil, backdropWork:nil, backdropRest: nil)
     }
 
     override func tearDown() {
@@ -43,4 +43,3 @@ class TimerTests: XCTestCase {
     }
 
 }
-*/