Merge branch 'master' into feature/avatar-faker

mrstebo · Nov 1, 2018 · 893eee0 · 893eee0
2 parents e177f7d + be4d7e0
commit 893eee0
Show file tree

Hide file tree

Showing 6 changed files with 509 additions and 129 deletions.
diff --git a/src/FakerDotNet/Data/VehicleData.cs b/src/FakerDotNet/Data/VehicleData.cs
diff --git a/src/FakerDotNet/Faker.cs b/src/FakerDotNet/Faker.cs
@@ -25,9 +25,9 @@ public static class Faker
         public static IPokemonFaker Pokemon { get; } = Container.Pokemon;
         public static IRandomFaker Random { get; } = Container.Random;
         public static IRickAndMortyFaker RickAndMorty { get; } = Container.RickAndMorty;
-        public static ITeamFaker Team { get; } = Container.Team;
         public static IRockBandFaker RockBand { get; } = Container.RockBand;
         public static ISuperheroFaker Superhero { get; } = Container.Superhero;
+        public static ITeamFaker Team { get; } = Container.Team;
         public static ITimeFaker Time { get; } = Container.Time;
         public static ITwinPeaksFaker TwinPeaks { get; } = Container.TwinPeaks;
         public static IUniversityFaker University { get; } = Container.University;

diff --git a/src/FakerDotNet/Fakers/VehicleFaker.cs b/src/FakerDotNet/Fakers/VehicleFaker.cs
@@ -89,7 +89,7 @@ public string Model()
 
         public string Model(string make)
         {
-            return _fakerContainer.Random.Element(VehicleData.Make_Models[make]);
+            return _fakerContainer.Random.Element(VehicleData.MakeModels[make]);
         }
 
         public string MakeAndModel()

diff --git a/tests/FakerDotNet.Tests/FakerContainerTests.cs b/tests/FakerDotNet.Tests/FakerContainerTests.cs
@@ -87,6 +87,12 @@ public void Friends_returns_IFriendsFaker()
             Assert.IsInstanceOf<IFriendsFaker>(_fakerContainer.Friends);
         }
 
+        [Test]
+        public void GameOfThrones_returns_IGameOfThronesFaker()
+        {
+            Assert.IsInstanceOf<IGameOfThronesFaker>(_fakerContainer.GameOfThrones);
+        }
+
         [Test]
         public void Lorem_returns_ILoremFaker()
         {
@@ -129,12 +135,30 @@ public void RockBand_returns_IRockBandFaker()
             Assert.IsInstanceOf<IRockBandFaker>(_fakerContainer.RockBand);
         }
 
+        [Test]
+        public void Superhero_returns_ISuperheroFaker()
+        {
+            Assert.IsInstanceOf<ISuperheroFaker>(_fakerContainer.Superhero);
+        }
+
+        [Test]
+        public void Team_returns_ITeamFaker()
+        {
+            Assert.IsInstanceOf<ITeamFaker>(_fakerContainer.Team);
+        }
+
         [Test]
         public void Time_returns_ITimeFaker()
         {
             Assert.IsInstanceOf<ITimeFaker>(_fakerContainer.Time);
         }
 
+        [Test]
+        public void TwinPeaks_returns_ITwinPeaksFaker()
+        {
+            Assert.IsInstanceOf<ITwinPeaksFaker>(_fakerContainer.TwinPeaks);
+        }
+
         [Test]
         public void University_returns_IUniversityFaker()
         {

diff --git a/tests/FakerDotNet.Tests/FakerTests.cs b/tests/FakerDotNet.Tests/FakerTests.cs
@@ -78,6 +78,12 @@ public void Friends_returns_IFriendsFaker()
         {
             Assert.IsInstanceOf<IFriendsFaker>(Faker.Friends);
         }
+
+        [Test]
+        public void GameOfThrones_returns_IGameOfThronesFaker()
+        {
+            Assert.IsInstanceOf<IGameOfThronesFaker>(Faker.GameOfThrones);
+        }
 
         [Test]
         public void Lorem_returns_ILoremFaker()
@@ -120,13 +126,31 @@ public void RockBand_returns_IRockBandFaker()
         {
             Assert.IsInstanceOf<IRockBandFaker>(Faker.RockBand);
         }
+
+        [Test]
+        public void Superhero_returns_ISuperheroFaker()
+        {
+            Assert.IsInstanceOf<ISuperheroFaker>(Faker.Superhero);
+        }
+
+        [Test]
+        public void Team_returns_ITeamFaker()
+        {
+            Assert.IsInstanceOf<ITeamFaker>(Faker.Team);
+        }
 
         [Test]
         public void Time_returns_ITimeFaker()
         {
             Assert.IsInstanceOf<ITimeFaker>(Faker.Time);
         }
 
+        [Test]
+        public void TwinPeaks_returns_ITwinPeaksFaker()
+        {
+            Assert.IsInstanceOf<ITwinPeaksFaker>(Faker.TwinPeaks);
+        }
+
         [Test]
         public void University_returns_IUniversityFaker()
         {

diff --git a/tests/FakerDotNet.Tests/Fakers/VehicleFakerTests.cs b/tests/FakerDotNet.Tests/Fakers/VehicleFakerTests.cs
@@ -59,7 +59,7 @@ public void Model_returns_a_model()
         {
             A.CallTo(() => _fakerContainer.Random.Element(VehicleData.Makes))
                 .Returns("Audi");
-            A.CallTo(() => _fakerContainer.Random.Element(VehicleData.Make_Models["Audi"]))
+            A.CallTo(() => _fakerContainer.Random.Element(VehicleData.MakeModels["Audi"]))
                 .Returns("A8");
 
             Assert.AreEqual("A8", _vehicleFaker.Model());
@@ -68,7 +68,7 @@ public void Model_returns_a_model()
         [Test]
         public void Model_returns_a_model_for_make()
         {
-            A.CallTo(() => _fakerContainer.Random.Element(VehicleData.Make_Models["Toyota"]))
+            A.CallTo(() => _fakerContainer.Random.Element(VehicleData.MakeModels["Toyota"]))
                 .Returns("Prius");
 
             Assert.AreEqual("Prius", _vehicleFaker.Model("Toyota"));
@@ -78,7 +78,7 @@ public void Model_returns_a_model_for_make()
         public void MakeAndModel_returns_a_make_and_model() {
             A.CallTo(() => _fakerContainer.Random.Element(VehicleData.Makes))
                 .Returns("Dodge");
-            A.CallTo(() => _fakerContainer.Random.Element(VehicleData.Make_Models["Dodge"]))
+            A.CallTo(() => _fakerContainer.Random.Element(VehicleData.MakeModels["Dodge"]))
                 .Returns("Charger");
 
             Assert.AreEqual("Dodge Charger", _vehicleFaker.MakeAndModel());