diff --git a/.gitignore b/.gitignore index d2f3010..8b4e9b6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,9 +2,3 @@ **/*.iml **/*.eclipse **/.idea -/csharp/MovieRental.Tests/bin/ -/csharp/MovieRental.Tests/obj/ -/csharp/MovieRental/.vs/ -/csharp/MovieRental/bin/ -/csharp/MovieRental/obj/ -/csharp/MovieRental/packages/ diff --git a/csharp/.gitignore b/csharp/.gitignore new file mode 100644 index 0000000..8a30d25 --- /dev/null +++ b/csharp/.gitignore @@ -0,0 +1,398 @@ +## 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/main/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/ +[Ww][Ii][Nn]32/ +[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/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# 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 +*.tlog +*.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 +coverage*.xml +coverage*.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 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files +*.ncb +*.aps + +# 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/ + +# Visual Studio History (VSHistory) files +.vshistory/ + +# 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/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +*.sln.iml diff --git a/csharp/MovieRental.Tests/CustomerBuilder.cs b/csharp/MovieRental.Tests/CustomerBuilder.cs index d97f1d6..99e3636 100644 --- a/csharp/MovieRental.Tests/CustomerBuilder.cs +++ b/csharp/MovieRental.Tests/CustomerBuilder.cs @@ -8,26 +8,26 @@ public class CustomerBuilder public static readonly String NAME = "Roberts"; - private String name = NAME; + private String name = NAME; private List rentals = new List(); - public Customer build() + public Customer Build() { Customer result = new Customer(name); foreach (Rental rental in rentals) { - result.addRental(rental); + result.AddRental(rental); } return result; } - public CustomerBuilder withName(String name) + public CustomerBuilder WithName(String name) { this.name = name; return this; } - public CustomerBuilder withRentals(params Rental[] rentals) + public CustomerBuilder WithRentals(params Rental[] rentals) { this.rentals.AddRange(rentals); return this; diff --git a/csharp/MovieRental.Tests/CustomerTest.cs b/csharp/MovieRental.Tests/CustomerTest.cs index 61f13f2..e28d0ae 100644 --- a/csharp/MovieRental.Tests/CustomerTest.cs +++ b/csharp/MovieRental.Tests/CustomerTest.cs @@ -8,24 +8,24 @@ public class CustomerTest [TestMethod] public void TestCustomer() { - Customer c = new CustomerBuilder().build(); + Customer c = new CustomerBuilder().Build(); Assert.IsNotNull(c); } [TestMethod] public void TestAddRental() { - Customer customer2 = new CustomerBuilder().withName("Julia").build(); + Customer customer2 = new CustomerBuilder().WithName("Julia").Build(); Movie movie1 = new Movie("Gone with the Wind", Movie.REGULAR); Rental rental1 = new Rental(movie1, 3); // 3 day rental - customer2.addRental(rental1); + customer2.AddRental(rental1); } [TestMethod] public void TestGetName() { Customer c = new Customer("David"); - Assert.AreEqual("David", c.getName()); + Assert.AreEqual("David", c.GetName()); } [TestMethod] public void StatementForRegularMovie() @@ -34,14 +34,14 @@ public void StatementForRegularMovie() Rental rental1 = new Rental(movie1, 3); // 3 day rental Customer customer2 = new CustomerBuilder() - .withName("Sallie") - .withRentals(rental1) - .build(); + .WithName("Sallie") + .WithRentals(rental1) + .Build(); string expected = "Rental Record for Sallie\n" + "\tGone with the Wind\t3,5\n" + "Amount owed is 3,5\n" + "You earned 1 frequent renter points"; - string statement = customer2.statement(); + string statement = customer2.Statement(); Assert.AreEqual(expected, statement); } @@ -52,14 +52,14 @@ public void StatementForNewReleaseMovie() Rental rental1 = new Rental(movie1, 3); // 3 day rental Customer customer2 = new CustomerBuilder() - .withName("Sallie") - .withRentals(rental1) - .build(); + .WithName("Sallie") + .WithRentals(rental1) + .Build(); string expected = "Rental Record for Sallie\n" + "\tStar Wars\t9\n" + "Amount owed is 9\n" + "You earned 2 frequent renter points"; - string statement = customer2.statement(); + string statement = customer2.Statement(); Assert.AreEqual(expected, statement); } @@ -70,14 +70,14 @@ public void StatementForChildrensMovie() Rental rental1 = new Rental(movie1, 3); // 3 day rental Customer customer2 = new CustomerBuilder() - .withName("Sallie") - .withRentals(rental1) - .build(); + .WithName("Sallie") + .WithRentals(rental1) + .Build(); string expected = "Rental Record for Sallie\n" + "\tMadagascar\t1,5\n" + "Amount owed is 1,5\n" + "You earned 1 frequent renter points"; - string statement = customer2.statement(); + string statement = customer2.Statement(); Assert.AreEqual(expected, statement); } @@ -92,16 +92,16 @@ public void StatementForManyMovies() Rental rental3 = new Rental(movie3, 8); // 8 day rental Customer customer1 = new CustomerBuilder() - .withName("David") - .withRentals(rental1, rental2, rental3) - .build(); + .WithName("David") + .WithRentals(rental1, rental2, rental3) + .Build(); string expected = "Rental Record for David\n" + "\tMadagascar\t6\n" + "\tStar Wars\t6\n" + "\tGone with the Wind\t11\n" + "Amount owed is 23\n" + "You earned 4 frequent renter points"; - string statement = customer1.statement(); + string statement = customer1.Statement(); Assert.AreEqual(expected, statement); } diff --git a/csharp/MovieRental/MovieRental.sln b/csharp/MovieRental.sln similarity index 74% rename from csharp/MovieRental/MovieRental.sln rename to csharp/MovieRental.sln index fd1ea6e..37e8ff3 100644 --- a/csharp/MovieRental/MovieRental.sln +++ b/csharp/MovieRental.sln @@ -1,11 +1,16 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2027 +# Visual Studio Version 17 +VisualStudioVersion = 17.4.33122.133 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MovieRental", "MovieRental.csproj", "{B86EFEAC-A122-41D2-8B29-9A62D345DBC9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MovieRental", "MovieRental\MovieRental.csproj", "{B86EFEAC-A122-41D2-8B29-9A62D345DBC9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MovieRental.Tests", "..\MovieRental.Tests\MovieRental.Tests.csproj", "{061657CD-BB54-433B-BEF5-04533E8EDD4F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MovieRental.Tests", "MovieRental.Tests\MovieRental.Tests.csproj", "{061657CD-BB54-433B-BEF5-04533E8EDD4F}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{533C1A50-6D9B-4524-8030-40E53B34BD0B}" + ProjectSection(SolutionItems) = preProject + .gitignore = .gitignore + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/csharp/MovieRental/Customer.cs b/csharp/MovieRental/Customer.cs index a5361b8..e99cd08 100644 --- a/csharp/MovieRental/Customer.cs +++ b/csharp/MovieRental/Customer.cs @@ -13,52 +13,52 @@ public Customer(string name) _name = name; } - public void addRental(Rental arg) + public void AddRental(Rental arg) { _rentals.Add(arg); } - public string getName() + public string GetName() { return _name; } - public string statement() + public string Statement() { double totalAmount = 0; int frequentRenterPoints = 0; - string result = "Rental Record for " + getName() + "\n"; + string result = "Rental Record for " + GetName() + "\n"; foreach (Rental each in _rentals) { double thisAmount = 0; //determine amounts for each line - switch (each.getMovie().getPriceCode()) + switch (each.GetMovie().GetPriceCode()) { case Movie.REGULAR: thisAmount += 2; - if (each.getDaysRented() > 2) - thisAmount += (each.getDaysRented() - 2) * 1.5; + if (each.GetDaysRented() > 2) + thisAmount += (each.GetDaysRented() - 2) * 1.5; break; case Movie.NEW_RELEASE: - thisAmount += each.getDaysRented() * 3; + thisAmount += each.GetDaysRented() * 3; break; case Movie.CHILDRENS: thisAmount += 1.5; - if (each.getDaysRented() > 3) - thisAmount += (each.getDaysRented() - 3) * 1.5; + if (each.GetDaysRented() > 3) + thisAmount += (each.GetDaysRented() - 3) * 1.5; break; } // add frequent renter points frequentRenterPoints++; // add bonus for a two day new release rental - if ((each.getMovie().getPriceCode() == Movie.NEW_RELEASE) && each.getDaysRented() > 1) + if ((each.GetMovie().GetPriceCode() == Movie.NEW_RELEASE) && each.GetDaysRented() > 1) frequentRenterPoints++; // show figures for this rental - result += "\t" + each.getMovie().getTitle() + "\t" + thisAmount.ToString() + "\n"; + result += "\t" + each.GetMovie().GetTitle() + "\t" + thisAmount.ToString() + "\n"; totalAmount += thisAmount; } diff --git a/csharp/MovieRental/Movie.cs b/csharp/MovieRental/Movie.cs index 1ba672b..8429a16 100644 --- a/csharp/MovieRental/Movie.cs +++ b/csharp/MovieRental/Movie.cs @@ -17,16 +17,16 @@ public Movie(String title, int priceCode) _priceCode = priceCode; } - public int getPriceCode() + public int GetPriceCode() { return _priceCode; } - public void setPriceCode(int arg) + public void SetPriceCode(int arg) { _priceCode = arg; } - public String getTitle() + public String GetTitle() { return _title; } diff --git a/csharp/MovieRental/Rental.cs b/csharp/MovieRental/Rental.cs index 92b791e..f923ed4 100644 --- a/csharp/MovieRental/Rental.cs +++ b/csharp/MovieRental/Rental.cs @@ -11,12 +11,12 @@ public Rental(Movie movie, int daysRented) _daysRented = daysRented; } - public int getDaysRented() + public int GetDaysRented() { return _daysRented; } - public Movie getMovie() + public Movie GetMovie() { return _movie; }