From 131410f79550d9c153a9aeedcfe1d57055b13212 Mon Sep 17 00:00:00 2001 From: Heitor Ribeiro Date: Sat, 22 Feb 2020 17:03:47 -0300 Subject: [PATCH 1/4] Creating a gitignore and making the project and tests work well --- .gitignore | 353 +++++++++++++++++++++ BerlinClock.csproj | 4 +- Classes/Interfaces/IMarkColorClock.cs | 21 ++ Classes/{ => Interfaces}/ITimeConverter.cs | 0 Classes/MarkColorClock.cs | 156 +++++++++ Classes/TimeConverter.cs | 24 +- 6 files changed, 553 insertions(+), 5 deletions(-) create mode 100644 .gitignore create mode 100644 Classes/Interfaces/IMarkColorClock.cs rename Classes/{ => Interfaces}/ITimeConverter.cs (100%) create mode 100644 Classes/MarkColorClock.cs diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..a57fdbbc --- /dev/null +++ b/.gitignore @@ -0,0 +1,353 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*[.json, .xml, .info] + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ \ No newline at end of file diff --git a/BerlinClock.csproj b/BerlinClock.csproj index ac8af99d..a39b903c 100644 --- a/BerlinClock.csproj +++ b/BerlinClock.csproj @@ -50,13 +50,15 @@ + + True True BerlinClockFeatureSteps.feature - + diff --git a/Classes/Interfaces/IMarkColorClock.cs b/Classes/Interfaces/IMarkColorClock.cs new file mode 100644 index 00000000..81946047 --- /dev/null +++ b/Classes/Interfaces/IMarkColorClock.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BerlinClock.Classes.Interfaces +{ + public interface IMarkColorClock + { + string FindFirstLampBlink(int secondsComingFromTheClock); + + string FindFirstRowLampBlink(int hoursCommingFromTheClock, string firstLampBlink); + + string FindSecondRowLampBlink(int hoursCommingFromTheClock, string firstLampBlink); + + string FindThirdRowLampBlink(int minutesCommingFromTheClock, string firstLampBlink); + + string FindLastRowLampBlink(int minutesCommingFromTheClock, string firstLampBlink); + } +} diff --git a/Classes/ITimeConverter.cs b/Classes/Interfaces/ITimeConverter.cs similarity index 100% rename from Classes/ITimeConverter.cs rename to Classes/Interfaces/ITimeConverter.cs diff --git a/Classes/MarkColorClock.cs b/Classes/MarkColorClock.cs new file mode 100644 index 00000000..685ab0f7 --- /dev/null +++ b/Classes/MarkColorClock.cs @@ -0,0 +1,156 @@ +using BerlinClock.Classes.Interfaces; +using System.Text; + +namespace BerlinClock.Classes +{ + public class MarkColorClock : IMarkColorClock + { + private const int TotalOfSecondsThatTheFirstLampBlinks = 2; + private const int HourOfTheFirstRowLamp = 5; + + private const int FirstQuarterPositionOfAnHour = 3; + private const int HalfQuarterPositionOfAnHour = 6; + private const int LastQuarterPositionOfAnHour = 9; + + private const int MinuteOfTheFirstLastLamp = 1; + private const int MinuteOfTheSecondtLastLamp = 2; + private const int MinuteOfTheThirdLastLamp = 3; + private const int MinuteOfTheForthLastLamp = 4; + + private const int HourOfTheFirstLampOfSecondRow = 1; + private const int HourOfTheSecondLampRow = 2; + private const int HourOfTheThirdLampOfSecondRow = 3; + private const int HourOfTheForthLampOfSecondRow = 4; + + public string FindFirstLampBlink(int secondsComingFromTheClock) + { + StringBuilder firstLampBlink = new StringBuilder(); + + if (secondsComingFromTheClock % TotalOfSecondsThatTheFirstLampBlinks == 0) + { + firstLampBlink.Append("Y\r\n"); + } + else + { + firstLampBlink.Append("O\r\n"); + } + + return firstLampBlink.ToString(); + } + + public string FindFirstRowLampBlink(int hoursCommingFromTheClock, string firstLampBlink) + { + StringBuilder firstRowLampBlink = new StringBuilder(); + + if (hoursCommingFromTheClock < HourOfTheFirstRowLamp) + { + firstRowLampBlink.Append("OOOO\r\n"); + } + + if (hoursCommingFromTheClock == HourOfTheFirstRowLamp) + { + firstRowLampBlink.Append("ROOO\r\n"); + } + + if (hoursCommingFromTheClock >= 10 && hoursCommingFromTheClock <= 14) + { + firstRowLampBlink.Append("RROO\r\n"); + } + + if (hoursCommingFromTheClock >= 15 && hoursCommingFromTheClock < 20) + { + firstRowLampBlink.Append("RRRO\r\n"); + } + + if (hoursCommingFromTheClock >= 20) + { + firstRowLampBlink.Append("RRRR\r\n"); + } + + return firstLampBlink += firstRowLampBlink.ToString(); + } + + public string FindSecondRowLampBlink(int hoursCommingFromTheClock, string firstLampBlink) + { + StringBuilder secondRowLampBlink = new StringBuilder(); + int hoursModule = hoursCommingFromTheClock % HourOfTheFirstRowLamp; + + switch (hoursModule) + { + case HourOfTheFirstLampOfSecondRow: + secondRowLampBlink.Append("ROOO\r\n"); + break; + case HourOfTheSecondLampRow: + secondRowLampBlink.Append("RROO\r\n"); + break; + case HourOfTheThirdLampOfSecondRow: + secondRowLampBlink.Append("RRRO\r\n"); + break; + case HourOfTheForthLampOfSecondRow: + secondRowLampBlink.Append("RRRR\r\n"); + break; + default: + secondRowLampBlink.Append("OOOO\r\n"); + break; + } + + return firstLampBlink += secondRowLampBlink.ToString(); + } + + public string FindThirdRowLampBlink(int minutesCommingFromTheClock, string firstLampBlink) + { + StringBuilder thirdRowLampBlink = new StringBuilder(); + int minutesDivided = minutesCommingFromTheClock / HourOfTheFirstRowLamp; + + switch (minutesDivided) + { + case FirstQuarterPositionOfAnHour: + thirdRowLampBlink.Append("YYROOOOOOOO\r\n"); + break; + case HalfQuarterPositionOfAnHour: + thirdRowLampBlink.Append("YYRYYROOOOO\r\n"); + break; + case LastQuarterPositionOfAnHour: + thirdRowLampBlink.Append("YYRYYRYYROO\r\n"); + break; + case 11: + thirdRowLampBlink.Append("YYRYYRYYRYY\r\n"); + break; + default: + thirdRowLampBlink.Append("OOOOOOOOOOO\r\n"); + break; + } + + return firstLampBlink += thirdRowLampBlink.ToString(); + + } + + + public string FindLastRowLampBlink(int minutesCommingFromTheClock, string firstLampBlink) + { + StringBuilder lastRowLampBlink = new StringBuilder(); + int minutesModule = minutesCommingFromTheClock % HourOfTheFirstRowLamp; + + switch (minutesModule) + { + case MinuteOfTheFirstLastLamp: + lastRowLampBlink.Append("YOOO"); + break; + case MinuteOfTheSecondtLastLamp: + lastRowLampBlink.Append("YYOO"); + break; + case MinuteOfTheThirdLastLamp: + lastRowLampBlink.Append("YYYO"); + break; + case MinuteOfTheForthLastLamp: + lastRowLampBlink.Append("YYYY"); + break; + default: + lastRowLampBlink.Append("OOOO"); + break; + } + + return firstLampBlink += lastRowLampBlink.ToString(); + } + } +} diff --git a/Classes/TimeConverter.cs b/Classes/TimeConverter.cs index dd5bf4e0..3118d7db 100644 --- a/Classes/TimeConverter.cs +++ b/Classes/TimeConverter.cs @@ -1,15 +1,31 @@ -using System; -using System.Collections.Generic; -using System.Linq; +using BerlinClock.Classes; +using BerlinClock.Classes.Interfaces; +using System; using System.Text; namespace BerlinClock { public class TimeConverter : ITimeConverter { + private readonly IMarkColorClock markColorClock = new MarkColorClock(); + public string convertTime(string aTime) { - throw new NotImplementedException(); + StringBuilder lampColorsOfTheClock = new StringBuilder(); + var newTime = aTime.Split(':'); + + int hoursSplited = Convert.ToInt32(newTime[0]); + int minutesSplited = Convert.ToInt32(newTime[1]); + int secondsSplited = Convert.ToInt32(newTime[2]); + + string firstLampBlink = this.markColorClock.FindFirstLampBlink(secondsSplited); + string firstRowLampsBlink = this.markColorClock.FindFirstRowLampBlink(hoursSplited, firstLampBlink); + string secondRowLampsBlink = this.markColorClock.FindSecondRowLampBlink(hoursSplited, firstRowLampsBlink); + + string thirdRowLampsBlink = this.markColorClock.FindThirdRowLampBlink(minutesSplited, secondRowLampsBlink); + string lastRowLampsBlink = this.markColorClock.FindLastRowLampBlink(minutesSplited, thirdRowLampsBlink); + + return lampColorsOfTheClock.Append(lastRowLampsBlink).ToString(); } } } From 0d5fa571ee390f78461d7949855d5ec0b17b7e5a Mon Sep 17 00:00:00 2001 From: Heitor Ribeiro Date: Sun, 23 Feb 2020 14:52:28 -0300 Subject: [PATCH 2/4] Refactoring a few things --- BerlinClock.csproj | 1 + Classes/ClockLamps.cs | 35 +++++++ Classes/Interfaces/IMarkColorClock.cs | 16 ++- Classes/MarkColorClock.cs | 137 +++++++++++++------------- Classes/TimeConverter.cs | 13 ++- 5 files changed, 115 insertions(+), 87 deletions(-) create mode 100644 Classes/ClockLamps.cs diff --git a/BerlinClock.csproj b/BerlinClock.csproj index a39b903c..0a93fe5a 100644 --- a/BerlinClock.csproj +++ b/BerlinClock.csproj @@ -50,6 +50,7 @@ + diff --git a/Classes/ClockLamps.cs b/Classes/ClockLamps.cs new file mode 100644 index 00000000..7b6c60ab --- /dev/null +++ b/Classes/ClockLamps.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BerlinClock.Classes +{ + public static class ClockLamps + { + public const int TotalOfSecondsThatTheFirstLampBlinks = 2; + public const int HourOfTheFirstRowLamp = 5; + + public const int MinuteOfTheFirstLastLamp = 1; + public const int MinuteOfTheSecondtLastLamp = 2; + public const int MinuteOfTheThirdLastLamp = 3; + public const int MinuteOfTheForthLastLamp = 4; + + public const int HourOfTheFirstLampOfSecondRow = 1; + public const int HourOfTheSecondLampRow = 2; + public const int HourOfTheThirdLampOfSecondRow = 3; + public const int HourOfTheForthLampOfSecondRow = 4; + + public const int FirstPositionOfAnHour = 1; + public const int SecondPositionOfAnHour = 2; + public const int FirstQuarterPositionOfAnHour = 3; + public const int ForthPositionOfAnHour = 4; + public const int HalfQuarterPositionOfAnHour = 6; + public const int SeventhPositionOfAnHour = 7; + public const int EigthPositionOfAnHour = 8; + public const int LastQuarterPositionOfAnHour = 9; + public const int TenthPositionOfAnHour = 10; + public const int EleventhPositionOfAnHour = 11; + } +} diff --git a/Classes/Interfaces/IMarkColorClock.cs b/Classes/Interfaces/IMarkColorClock.cs index 81946047..18514613 100644 --- a/Classes/Interfaces/IMarkColorClock.cs +++ b/Classes/Interfaces/IMarkColorClock.cs @@ -1,21 +1,17 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Text; namespace BerlinClock.Classes.Interfaces { public interface IMarkColorClock { - string FindFirstLampBlink(int secondsComingFromTheClock); + StringBuilder FindFirstLampBlink(int secondsComingFromTheClock); - string FindFirstRowLampBlink(int hoursCommingFromTheClock, string firstLampBlink); + StringBuilder FindFirstRowLampBlink(int hoursCommingFromTheClock, StringBuilder firstLampBlink); - string FindSecondRowLampBlink(int hoursCommingFromTheClock, string firstLampBlink); + StringBuilder FindSecondRowLampBlink(int hoursCommingFromTheClock, StringBuilder firstLampBlink); - string FindThirdRowLampBlink(int minutesCommingFromTheClock, string firstLampBlink); + StringBuilder FindThirdRowLampBlink(int minutesCommingFromTheClock, StringBuilder firstLampBlink); - string FindLastRowLampBlink(int minutesCommingFromTheClock, string firstLampBlink); + StringBuilder FindLastRowLampBlink(int minutesCommingFromTheClock, StringBuilder firstLampBlink); } } diff --git a/Classes/MarkColorClock.cs b/Classes/MarkColorClock.cs index 685ab0f7..7f039f97 100644 --- a/Classes/MarkColorClock.cs +++ b/Classes/MarkColorClock.cs @@ -5,28 +5,11 @@ namespace BerlinClock.Classes { public class MarkColorClock : IMarkColorClock { - private const int TotalOfSecondsThatTheFirstLampBlinks = 2; - private const int HourOfTheFirstRowLamp = 5; - - private const int FirstQuarterPositionOfAnHour = 3; - private const int HalfQuarterPositionOfAnHour = 6; - private const int LastQuarterPositionOfAnHour = 9; - - private const int MinuteOfTheFirstLastLamp = 1; - private const int MinuteOfTheSecondtLastLamp = 2; - private const int MinuteOfTheThirdLastLamp = 3; - private const int MinuteOfTheForthLastLamp = 4; - - private const int HourOfTheFirstLampOfSecondRow = 1; - private const int HourOfTheSecondLampRow = 2; - private const int HourOfTheThirdLampOfSecondRow = 3; - private const int HourOfTheForthLampOfSecondRow = 4; - - public string FindFirstLampBlink(int secondsComingFromTheClock) + public StringBuilder FindFirstLampBlink(int secondsComingFromTheClock) { StringBuilder firstLampBlink = new StringBuilder(); - if (secondsComingFromTheClock % TotalOfSecondsThatTheFirstLampBlinks == 0) + if (secondsComingFromTheClock % ClockLamps.TotalOfSecondsThatTheFirstLampBlinks == 0) { firstLampBlink.Append("Y\r\n"); } @@ -35,122 +18,136 @@ public string FindFirstLampBlink(int secondsComingFromTheClock) firstLampBlink.Append("O\r\n"); } - return firstLampBlink.ToString(); + return firstLampBlink; } - public string FindFirstRowLampBlink(int hoursCommingFromTheClock, string firstLampBlink) + public StringBuilder FindFirstRowLampBlink(int hoursCommingFromTheClock, StringBuilder firstLampBlink) { - StringBuilder firstRowLampBlink = new StringBuilder(); - if (hoursCommingFromTheClock < HourOfTheFirstRowLamp) + if (hoursCommingFromTheClock < ClockLamps.HourOfTheFirstRowLamp) { - firstRowLampBlink.Append("OOOO\r\n"); + firstLampBlink.Append("OOOO\r\n"); } - if (hoursCommingFromTheClock == HourOfTheFirstRowLamp) + if (hoursCommingFromTheClock == ClockLamps.HourOfTheFirstRowLamp) { - firstRowLampBlink.Append("ROOO\r\n"); + firstLampBlink.Append("ROOO\r\n"); } - if (hoursCommingFromTheClock >= 10 && hoursCommingFromTheClock <= 14) + if (hoursCommingFromTheClock >= ClockLamps.TenthPositionOfAnHour && hoursCommingFromTheClock <= 14) { - firstRowLampBlink.Append("RROO\r\n"); + firstLampBlink.Append("RROO\r\n"); } if (hoursCommingFromTheClock >= 15 && hoursCommingFromTheClock < 20) { - firstRowLampBlink.Append("RRRO\r\n"); + firstLampBlink.Append("RRRO\r\n"); } if (hoursCommingFromTheClock >= 20) { - firstRowLampBlink.Append("RRRR\r\n"); + firstLampBlink.Append("RRRR\r\n"); } - return firstLampBlink += firstRowLampBlink.ToString(); + return firstLampBlink; } - public string FindSecondRowLampBlink(int hoursCommingFromTheClock, string firstLampBlink) + public StringBuilder FindSecondRowLampBlink(int hoursCommingFromTheClock, StringBuilder firstLampBlink) { - StringBuilder secondRowLampBlink = new StringBuilder(); - int hoursModule = hoursCommingFromTheClock % HourOfTheFirstRowLamp; + int hoursModule = hoursCommingFromTheClock % ClockLamps.HourOfTheFirstRowLamp; switch (hoursModule) { - case HourOfTheFirstLampOfSecondRow: - secondRowLampBlink.Append("ROOO\r\n"); + case ClockLamps.HourOfTheFirstLampOfSecondRow: + firstLampBlink.Append("ROOO\r\n"); break; - case HourOfTheSecondLampRow: - secondRowLampBlink.Append("RROO\r\n"); + case ClockLamps.HourOfTheSecondLampRow: + firstLampBlink.Append("RROO\r\n"); break; - case HourOfTheThirdLampOfSecondRow: - secondRowLampBlink.Append("RRRO\r\n"); + case ClockLamps.HourOfTheThirdLampOfSecondRow: + firstLampBlink.Append("RRRO\r\n"); break; - case HourOfTheForthLampOfSecondRow: - secondRowLampBlink.Append("RRRR\r\n"); + case ClockLamps.HourOfTheForthLampOfSecondRow: + firstLampBlink.Append("RRRR\r\n"); break; default: - secondRowLampBlink.Append("OOOO\r\n"); + firstLampBlink.Append("OOOO\r\n"); break; } - return firstLampBlink += secondRowLampBlink.ToString(); + return firstLampBlink; } - public string FindThirdRowLampBlink(int minutesCommingFromTheClock, string firstLampBlink) + public StringBuilder FindThirdRowLampBlink(int minutesCommingFromTheClock, StringBuilder firstLampBlink) { - StringBuilder thirdRowLampBlink = new StringBuilder(); - int minutesDivided = minutesCommingFromTheClock / HourOfTheFirstRowLamp; + int minutesDivided = minutesCommingFromTheClock / ClockLamps.HourOfTheFirstRowLamp; switch (minutesDivided) { - case FirstQuarterPositionOfAnHour: - thirdRowLampBlink.Append("YYROOOOOOOO\r\n"); + case ClockLamps.FirstPositionOfAnHour: + firstLampBlink.Append("YOOOOOOOOOO\r\n"); + break; + case ClockLamps.SecondPositionOfAnHour: + firstLampBlink.Append("YYOOOOOOOOO\r\n"); + break; + case ClockLamps.FirstQuarterPositionOfAnHour: + firstLampBlink.Append("YYROOOOOOOO\r\n"); + break; + case ClockLamps.ForthPositionOfAnHour: + firstLampBlink.Append("YYRYYOOOOOO\r\n"); + break; + case ClockLamps.HalfQuarterPositionOfAnHour: + firstLampBlink.Append("YYRYYROOOOO\r\n"); + break; + case ClockLamps.SeventhPositionOfAnHour: + firstLampBlink.Append("YYRYYRYOOOO\r\n"); + break; + case ClockLamps.EigthPositionOfAnHour: + firstLampBlink.Append("YYRYYRYYOOO\r\n"); break; - case HalfQuarterPositionOfAnHour: - thirdRowLampBlink.Append("YYRYYROOOOO\r\n"); + case ClockLamps.LastQuarterPositionOfAnHour: + firstLampBlink.Append("YYRYYRYYROO\r\n"); break; - case LastQuarterPositionOfAnHour: - thirdRowLampBlink.Append("YYRYYRYYROO\r\n"); + case ClockLamps.TenthPositionOfAnHour: + firstLampBlink.Append("YYRYYRYYRYO\r\n"); break; - case 11: - thirdRowLampBlink.Append("YYRYYRYYRYY\r\n"); + case ClockLamps.EleventhPositionOfAnHour: + firstLampBlink.Append("YYRYYRYYRYY\r\n"); break; default: - thirdRowLampBlink.Append("OOOOOOOOOOO\r\n"); + firstLampBlink.Append("OOOOOOOOOOO\r\n"); break; } - return firstLampBlink += thirdRowLampBlink.ToString(); + return firstLampBlink; } - public string FindLastRowLampBlink(int minutesCommingFromTheClock, string firstLampBlink) + public StringBuilder FindLastRowLampBlink(int minutesCommingFromTheClock, StringBuilder firstLampBlink) { - StringBuilder lastRowLampBlink = new StringBuilder(); - int minutesModule = minutesCommingFromTheClock % HourOfTheFirstRowLamp; + int minutesModule = minutesCommingFromTheClock % ClockLamps.HourOfTheFirstRowLamp; switch (minutesModule) { - case MinuteOfTheFirstLastLamp: - lastRowLampBlink.Append("YOOO"); + case ClockLamps.MinuteOfTheFirstLastLamp: + firstLampBlink.Append("YOOO"); break; - case MinuteOfTheSecondtLastLamp: - lastRowLampBlink.Append("YYOO"); + case ClockLamps.MinuteOfTheSecondtLastLamp: + firstLampBlink.Append("YYOO"); break; - case MinuteOfTheThirdLastLamp: - lastRowLampBlink.Append("YYYO"); + case ClockLamps.MinuteOfTheThirdLastLamp: + firstLampBlink.Append("YYYO"); break; - case MinuteOfTheForthLastLamp: - lastRowLampBlink.Append("YYYY"); + case ClockLamps.MinuteOfTheForthLastLamp: + firstLampBlink.Append("YYYY"); break; default: - lastRowLampBlink.Append("OOOO"); + firstLampBlink.Append("OOOO"); break; } - return firstLampBlink += lastRowLampBlink.ToString(); + return firstLampBlink; } } } diff --git a/Classes/TimeConverter.cs b/Classes/TimeConverter.cs index 3118d7db..a34d8946 100644 --- a/Classes/TimeConverter.cs +++ b/Classes/TimeConverter.cs @@ -11,21 +11,20 @@ public class TimeConverter : ITimeConverter public string convertTime(string aTime) { - StringBuilder lampColorsOfTheClock = new StringBuilder(); var newTime = aTime.Split(':'); int hoursSplited = Convert.ToInt32(newTime[0]); int minutesSplited = Convert.ToInt32(newTime[1]); int secondsSplited = Convert.ToInt32(newTime[2]); - string firstLampBlink = this.markColorClock.FindFirstLampBlink(secondsSplited); - string firstRowLampsBlink = this.markColorClock.FindFirstRowLampBlink(hoursSplited, firstLampBlink); - string secondRowLampsBlink = this.markColorClock.FindSecondRowLampBlink(hoursSplited, firstRowLampsBlink); + StringBuilder firstLampBlink = this.markColorClock.FindFirstLampBlink(secondsSplited); + StringBuilder firstRowLampsBlink = this.markColorClock.FindFirstRowLampBlink(hoursSplited, firstLampBlink); + StringBuilder secondRowLampsBlink = this.markColorClock.FindSecondRowLampBlink(hoursSplited, firstRowLampsBlink); - string thirdRowLampsBlink = this.markColorClock.FindThirdRowLampBlink(minutesSplited, secondRowLampsBlink); - string lastRowLampsBlink = this.markColorClock.FindLastRowLampBlink(minutesSplited, thirdRowLampsBlink); + StringBuilder thirdRowLampsBlink = this.markColorClock.FindThirdRowLampBlink(minutesSplited, secondRowLampsBlink); + StringBuilder lastRowLampsBlink = this.markColorClock.FindLastRowLampBlink(minutesSplited, thirdRowLampsBlink); - return lampColorsOfTheClock.Append(lastRowLampsBlink).ToString(); + return lastRowLampsBlink.ToString(); } } } From 7f7e2e7ad7c03598b33c3f1f8377f421e99c3d74 Mon Sep 17 00:00:00 2001 From: Heitor Ribeiro Date: Sun, 23 Feb 2020 15:38:10 -0300 Subject: [PATCH 3/4] Creating the folder interfaces --- BDD/BerlinClockFeatureSteps.cs | 2 +- BerlinClock.csproj | 4 ++-- Classes/ClockLamps.cs | 8 +------- Classes/MarkColorClock.cs | 2 +- Classes/TimeConverter.cs | 10 +++++----- {Classes/Interfaces => Interfaces}/IMarkColorClock.cs | 2 +- {Classes/Interfaces => Interfaces}/ITimeConverter.cs | 5 +---- 7 files changed, 12 insertions(+), 21 deletions(-) rename {Classes/Interfaces => Interfaces}/IMarkColorClock.cs (93%) rename {Classes/Interfaces => Interfaces}/ITimeConverter.cs (54%) diff --git a/BDD/BerlinClockFeatureSteps.cs b/BDD/BerlinClockFeatureSteps.cs index 4390f3cb..1d30b909 100644 --- a/BDD/BerlinClockFeatureSteps.cs +++ b/BDD/BerlinClockFeatureSteps.cs @@ -1,7 +1,7 @@ using System; using TechTalk.SpecFlow; using Microsoft.VisualStudio.TestTools.UnitTesting; -using System.Linq; +using BerlinClock.Interfaces; namespace BerlinClock { diff --git a/BerlinClock.csproj b/BerlinClock.csproj index 0a93fe5a..609d3f6f 100644 --- a/BerlinClock.csproj +++ b/BerlinClock.csproj @@ -51,7 +51,7 @@ - + @@ -59,7 +59,7 @@ True BerlinClockFeatureSteps.feature - + diff --git a/Classes/ClockLamps.cs b/Classes/ClockLamps.cs index 7b6c60ab..fdfd0c71 100644 --- a/Classes/ClockLamps.cs +++ b/Classes/ClockLamps.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BerlinClock.Classes +namespace BerlinClock.Classes { public static class ClockLamps { diff --git a/Classes/MarkColorClock.cs b/Classes/MarkColorClock.cs index 7f039f97..509b97d5 100644 --- a/Classes/MarkColorClock.cs +++ b/Classes/MarkColorClock.cs @@ -1,4 +1,4 @@ -using BerlinClock.Classes.Interfaces; +using BerlinClock.Interfaces; using System.Text; namespace BerlinClock.Classes diff --git a/Classes/TimeConverter.cs b/Classes/TimeConverter.cs index a34d8946..64715ee6 100644 --- a/Classes/TimeConverter.cs +++ b/Classes/TimeConverter.cs @@ -1,5 +1,5 @@ using BerlinClock.Classes; -using BerlinClock.Classes.Interfaces; +using BerlinClock.Interfaces; using System; using System.Text; @@ -11,11 +11,11 @@ public class TimeConverter : ITimeConverter public string convertTime(string aTime) { - var newTime = aTime.Split(':'); + var timeSplited = aTime.Split(':'); - int hoursSplited = Convert.ToInt32(newTime[0]); - int minutesSplited = Convert.ToInt32(newTime[1]); - int secondsSplited = Convert.ToInt32(newTime[2]); + int hoursSplited = Convert.ToInt32(timeSplited[0]); + int minutesSplited = Convert.ToInt32(timeSplited[1]); + int secondsSplited = Convert.ToInt32(timeSplited[2]); StringBuilder firstLampBlink = this.markColorClock.FindFirstLampBlink(secondsSplited); StringBuilder firstRowLampsBlink = this.markColorClock.FindFirstRowLampBlink(hoursSplited, firstLampBlink); diff --git a/Classes/Interfaces/IMarkColorClock.cs b/Interfaces/IMarkColorClock.cs similarity index 93% rename from Classes/Interfaces/IMarkColorClock.cs rename to Interfaces/IMarkColorClock.cs index 18514613..80bde42a 100644 --- a/Classes/Interfaces/IMarkColorClock.cs +++ b/Interfaces/IMarkColorClock.cs @@ -1,6 +1,6 @@ using System.Text; -namespace BerlinClock.Classes.Interfaces +namespace BerlinClock.Interfaces { public interface IMarkColorClock { diff --git a/Classes/Interfaces/ITimeConverter.cs b/Interfaces/ITimeConverter.cs similarity index 54% rename from Classes/Interfaces/ITimeConverter.cs rename to Interfaces/ITimeConverter.cs index 1d9e4c27..889f79c4 100644 --- a/Classes/Interfaces/ITimeConverter.cs +++ b/Interfaces/ITimeConverter.cs @@ -1,9 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -namespace BerlinClock +namespace BerlinClock.Interfaces { public interface ITimeConverter { From ff1a8a38795c81c6a790f319cdf5db3eb40e1ce6 Mon Sep 17 00:00:00 2001 From: Heitor Ribeiro Date: Sun, 23 Feb 2020 18:58:11 -0300 Subject: [PATCH 4/4] Correcting a bug --- Classes/ClockLamps.cs | 1 + Classes/MarkColorClock.cs | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Classes/ClockLamps.cs b/Classes/ClockLamps.cs index fdfd0c71..61656901 100644 --- a/Classes/ClockLamps.cs +++ b/Classes/ClockLamps.cs @@ -19,6 +19,7 @@ public static class ClockLamps public const int SecondPositionOfAnHour = 2; public const int FirstQuarterPositionOfAnHour = 3; public const int ForthPositionOfAnHour = 4; + public const int FithPositionOfAnHour = 5; public const int HalfQuarterPositionOfAnHour = 6; public const int SeventhPositionOfAnHour = 7; public const int EigthPositionOfAnHour = 8; diff --git a/Classes/MarkColorClock.cs b/Classes/MarkColorClock.cs index 509b97d5..b50e365b 100644 --- a/Classes/MarkColorClock.cs +++ b/Classes/MarkColorClock.cs @@ -94,6 +94,9 @@ public StringBuilder FindThirdRowLampBlink(int minutesCommingFromTheClock, Strin firstLampBlink.Append("YYROOOOOOOO\r\n"); break; case ClockLamps.ForthPositionOfAnHour: + firstLampBlink.Append("YYRYOOOOOOO\r\n"); + break; + case ClockLamps.FithPositionOfAnHour: firstLampBlink.Append("YYRYYOOOOOO\r\n"); break; case ClockLamps.HalfQuarterPositionOfAnHour: