From 1abc041d87c3097f975d9ad3152940b5dd07f776 Mon Sep 17 00:00:00 2001 From: Alinson Xavier Date: Sun, 7 Apr 2019 09:56:34 -0500 Subject: [PATCH] Fix ios tests; remove empty test --- ios/Tests/Platform/IosCanvasTest.swift | 12 ++++++------ ios/Tests/Platform/IosLocaleTest.swift | 27 -------------------------- ios/uhabits.xcodeproj/project.pbxproj | 4 ---- 3 files changed, 6 insertions(+), 37 deletions(-) delete mode 100644 ios/Tests/Platform/IosLocaleTest.swift diff --git a/ios/Tests/Platform/IosCanvasTest.swift b/ios/Tests/Platform/IosCanvasTest.swift index 9044eba6f..81982036a 100644 --- a/ios/Tests/Platform/IosCanvasTest.swift +++ b/ios/Tests/Platform/IosCanvasTest.swift @@ -27,14 +27,14 @@ class IosCanvasTest : XCTestCase { UIGraphicsBeginImageContext(CGSize(width: 500, height: 400)) let canvas = IosCanvas(withBounds: CGRect(x: 0, y: 0, width: 500, height: 400)) - canvas.setColor(color: Color(argb: 0x303030)) + canvas.setColor(color: Color(rgb: 0x303030)) canvas.fillRect(x: 0.0, y: 0.0, width: 500.0, height: 400.0) - canvas.setColor(color: Color(argb: 0x606060)) + canvas.setColor(color: Color(rgb: 0x606060)) canvas.setStrokeWidth(size: 25.0) canvas.drawRect(x: 100.0, y: 100.0, width: 300.0, height: 200.0) - canvas.setColor(color: Color(argb: 0xFFFF00)) + canvas.setColor(color: Color(rgb: 0xFFFF00)) canvas.setStrokeWidth(size: 1.0) canvas.fillCircle(centerX: 50.0, centerY: 50.0, radius: 30.0) canvas.fillArc(centerX: 50.0, centerY: 150.0, radius: 30.0, startAngle: 90.0, swipeAngle: 135.0) @@ -45,13 +45,13 @@ class IosCanvasTest : XCTestCase { canvas.drawRect(x: 0.0, y: 200.0, width: 100.0, height: 100.0) canvas.drawRect(x: 0.0, y: 300.0, width: 100.0, height: 100.0) - canvas.setColor(color: Color(argb: 0xFF0000)) + canvas.setColor(color: Color(rgb: 0xFF0000)) canvas.setStrokeWidth(size: 2.0) canvas.drawLine(x1: 0.0, y1: 0.0, x2: 500.0, y2: 400.0) canvas.drawLine(x1: 500.0, y1: 0.0, x2: 0.0, y2: 400.0) - canvas.setTextSize(size: 50.0) - canvas.setColor(color: Color(argb: 0x00FF00)) + canvas.setFontSize(size: 50.0) + canvas.setColor(color: Color(rgb: 0x00FF00)) canvas.drawText(text: "Test", x: 250.0, y: 200.0) canvas.setFont(font: Font.bold) diff --git a/ios/Tests/Platform/IosLocaleTest.swift b/ios/Tests/Platform/IosLocaleTest.swift deleted file mode 100644 index 49220a06e..000000000 --- a/ios/Tests/Platform/IosLocaleTest.swift +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2016-2019 Álinson Santos Xavier - * - * This file is part of Loop Habit Tracker. - * - * Loop Habit Tracker is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. - * - * Loop Habit Tracker is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -import XCTest -@testable import uhabits - -class IosLocaleTest: XCTestCase { - func testGetStringForLocale() { - //let helper = IosLocaleHelper() - } -} diff --git a/ios/uhabits.xcodeproj/project.pbxproj b/ios/uhabits.xcodeproj/project.pbxproj index 9eff169a3..2ebb71341 100644 --- a/ios/uhabits.xcodeproj/project.pbxproj +++ b/ios/uhabits.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 006EFE4C2252E9F3008464E0 /* IosLocaleTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 006EFE4A2252E9D3008464E0 /* IosLocaleTest.swift */; }; 006EFE4E2252EA2B008464E0 /* IosLocale.swift in Sources */ = {isa = PBXBuildFile; fileRef = 006EFE4D2252EA2B008464E0 /* IosLocale.swift */; }; 006EFE50225432B8008464E0 /* AboutScreenController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 006EFE4F225432B8008464E0 /* AboutScreenController.swift */; }; 00A5B42822009F590024E00C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00A5B42722009F590024E00C /* AppDelegate.swift */; }; @@ -58,7 +57,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 006EFE4A2252E9D3008464E0 /* IosLocaleTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IosLocaleTest.swift; sourceTree = ""; }; 006EFE4D2252EA2B008464E0 /* IosLocale.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IosLocale.swift; sourceTree = ""; }; 006EFE4F225432B8008464E0 /* AboutScreenController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutScreenController.swift; sourceTree = ""; }; 00A5B42422009F590024E00C /* uhabits.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = uhabits.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -200,7 +198,6 @@ 00C0C6A222465365003D8AF0 /* IosDatabaseTest.swift */, 00C0C6DC2247E6C4003D8AF0 /* IosDatesTest.swift */, 00C0C6A122465365003D8AF0 /* IosFilesTest.swift */, - 006EFE4A2252E9D3008464E0 /* IosLocaleTest.swift */, ); path = Platform; sourceTree = ""; @@ -351,7 +348,6 @@ files = ( 00C0C6DD2247E6C4003D8AF0 /* IosDatesTest.swift in Sources */, 00C0C6A52246537A003D8AF0 /* IosFilesTest.swift in Sources */, - 006EFE4C2252E9F3008464E0 /* IosLocaleTest.swift in Sources */, 00C0C6D92247DC13003D8AF0 /* IosCanvasTest.swift in Sources */, 00C0C6A62246537E003D8AF0 /* IosDatabaseTest.swift in Sources */, );