Index: src/Deltares.DSoilModel.Forms.Tests/Deltares.DSoilModel.Forms.Tests.csproj =================================================================== diff -u -r247 -r296 --- src/Deltares.DSoilModel.Forms.Tests/Deltares.DSoilModel.Forms.Tests.csproj (.../Deltares.DSoilModel.Forms.Tests.csproj) (revision 247) +++ src/Deltares.DSoilModel.Forms.Tests/Deltares.DSoilModel.Forms.Tests.csproj (.../Deltares.DSoilModel.Forms.Tests.csproj) (revision 296) @@ -40,6 +40,14 @@ False ..\..\lib\Deltares\DslGeoIo\Deltares.Geotechnics.IO.dll + + False + ..\..\lib\Deltares\DslGeo\Deltares.Geotechnics.TestUtils.dll + + + False + ..\..\lib\Deltares\DslProbabilistic\Deltares.Probabilistic.dll + False ..\..\lib\Deltares\DslCore\Deltares.Standard.dll @@ -59,6 +67,7 @@ + @@ -67,7 +76,9 @@ + + Fisheye: Tag 296 refers to a dead (removed) revision in file `src/Deltares.DSoilModel.Tests/DSoilModelContextTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: src/Deltares.DSoilModel.Forms.Tests/FilmStripTest.cs =================================================================== diff -u -r7 -r296 --- src/Deltares.DSoilModel.Forms.Tests/FilmStripTest.cs (.../Deltares.DSoilModel.Tests/FilmStripTest.cs) (revision 7) +++ src/Deltares.DSoilModel.Forms.Tests/FilmStripTest.cs (.../Deltares.DSoilModel.Forms.Tests/FilmStripTest.cs) (revision 296) @@ -2,14 +2,11 @@ using System.Collections.Generic; using System.Drawing; using System.Reflection; - -using Deltares.DSoilModel.Forms; using Deltares.Geotechnics.TestUtils; using Deltares.Standard.Forms; - using NUnit.Framework; -namespace Deltares.DSoilModel.Tests +namespace Deltares.DSoilModel.Forms.Tests { public class FilmStripTest { Index: src/Deltares.DSoilModel.Data.Tests/packages.config =================================================================== diff -u -r131 -r296 --- src/Deltares.DSoilModel.Data.Tests/packages.config (.../packages.config) (revision 131) +++ src/Deltares.DSoilModel.Data.Tests/packages.config (.../packages.config) (revision 296) @@ -1,4 +1,5 @@  + \ No newline at end of file Fisheye: Tag 296 refers to a dead (removed) revision in file `src/Deltares.DSoilModel.Tests/SosSoilLayer1DTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: src/Deltares.DSoilModel.Data.Tests/SosSoilLayer1DTest.cs =================================================================== diff -u -r163 -r296 --- src/Deltares.DSoilModel.Data.Tests/SosSoilLayer1DTest.cs (.../Deltares.DSoilModel.Tests/SosSoilLayer1DTest.cs) (revision 163) +++ src/Deltares.DSoilModel.Data.Tests/SosSoilLayer1DTest.cs (.../Deltares.DSoilModel.Data.Tests/SosSoilLayer1DTest.cs) (revision 296) @@ -4,20 +4,18 @@ using System.Drawing; using System.IO; using System.Xml.Serialization; -using Deltares.DSoilModel.Data; -using Deltares.DSoilModel.Forms; using Deltares.Geotechnics; using Deltares.Geotechnics.IO; using Deltares.Standard.EventPublisher; using Deltares.Standard.TestUtils; using KellermanSoftware.CompareNetObjects; using NUnit.Framework; -namespace Tests +namespace Deltares.DSoilModel.Data.Tests { internal class SosSoilLayer1DTest { - private const string TestDataFolder = @"TestFiles\"; + private const string TestDataFolder = @"..\..\Deltares.DSoilModel.Data.Tests\TestFiles"; private const string TestOutputFolder = TestDataFolder + @"SoilModelDatabaseTest\"; private bool oldIsDataEventPublishStopped; @@ -186,7 +184,6 @@ // import SOS data var project = new DSoilModelProject(); - var plugin = new DSoilModelPlugin(); // {Project = project}; Console.WriteLine("reading soil profiles CSV...."); project.ReadSoilProfiles1DFromFile(Path.Combine(sosFolder, "WTISOS_soilprofiles_short_code.csv")); Fisheye: Tag 296 refers to a dead (removed) revision in file `src/Deltares.DSoilModel.Tests/DSoilModelProjectTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 296 refers to a dead (removed) revision in file `src/Deltares.DSoilModel.Tests/FilmStripTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: src/Deltares.DSoilModel.Tests/DSoilModelIOTest.cs =================================================================== diff -u -r260 -r296 --- src/Deltares.DSoilModel.Tests/DSoilModelIOTest.cs (.../DSoilModelIOTest.cs) (revision 260) +++ src/Deltares.DSoilModel.Tests/DSoilModelIOTest.cs (.../DSoilModelIOTest.cs) (revision 296) @@ -7,7 +7,6 @@ using Deltares.Standard.EventPublisher; using Deltares.Standard.Language; using Deltares.Standard.Logging; -using Deltares.Standard.TestUtils; using NUnit.Framework; namespace Deltares.DSoilModel.Tests Index: src/Deltares.DSoilModel.Data.Tests/DSoilModelIOTest.cs =================================================================== diff -u -r260 -r296 --- src/Deltares.DSoilModel.Data.Tests/DSoilModelIOTest.cs (.../Deltares.DSoilModel.Tests/DSoilModelIOTest.cs) (revision 260) +++ src/Deltares.DSoilModel.Data.Tests/DSoilModelIOTest.cs (.../Deltares.DSoilModel.Data.Tests/DSoilModelIOTest.cs) (revision 296) @@ -1,16 +1,14 @@ using System.IO; using System.Linq; using System.Text; -using Deltares.DSoilModel.Data; using Deltares.Geotechnics; using Deltares.Geotechnics.IO.Importers; using Deltares.Standard.EventPublisher; using Deltares.Standard.Language; using Deltares.Standard.Logging; -using Deltares.Standard.TestUtils; using NUnit.Framework; -namespace Deltares.DSoilModel.Tests +namespace Deltares.DSoilModel.Data.Tests { [TestFixture] public class DSoilModelIOTest @@ -25,20 +23,22 @@ DataEventPublisher.IsDataEventPublishStopped = true; oldLanguageType = LocalizationManager.CurrentLanguage; LocalizationManager.CurrentLanguage = LanguageType.English; + Directory.CreateDirectory("TempFiles"); } [TestFixtureTearDown] public void FixtureTearDown() { DataEventPublisher.IsDataEventPublishStopped = oldIsDataEventPublishStopped; LocalizationManager.CurrentLanguage = oldLanguageType; + Directory.Delete("TempFiles", true); } [Test] public void ImportOfEmptyCsvFilesResultsInWarninLogMessage() { // empty soilprofiles Csv - var testFile = "TestFiles/empty_soilprofiles.csv"; + var testFile = Path.Combine("TempFiles","empty_soilprofiles.csv"); File.WriteAllText(testFile, @"soilprofile_id;top_level;soil_name;soiltype", Encoding.ASCII); var project = new DSoilModelProject(); @@ -49,7 +49,7 @@ File.Delete(testFile); // empty segments.csv - testFile = "TestFiles/empty_segments.csv"; + testFile = Path.Combine("TempFiles","empty_segments.csv"); File.WriteAllText(testFile, @"segment_id;soilprofile_id;probability;calculation_type", Encoding.ASCII); LogManager.Clear(); @@ -59,7 +59,7 @@ File.Delete(testFile); // empty surfacelines.csv - testFile = "TestFiles/empty_surfacelines.csv"; + testFile = Path.Combine("TempFiles","empty_surfacelines.csv"); File.WriteAllText(testFile, @"LocationID;Geologischprofiel;X_GridPoint;Y_GridPoint;ScenarioClusterID;X1;Y1;Z1;.....;Xn;Yn;Zn;(Profiel)", Encoding.ASCII); LogManager.Clear(); DSoilModelIO.ReadCsvSurfaceLineFromFileAndAddToProject(testFile, project); @@ -68,7 +68,7 @@ File.Delete(testFile); // empty characteristicpoints.csv - testFile = "TestFiles/empty_characteristicpoints.csv"; + testFile = Path.Combine("TempFiles","empty_characteristicpoints.csv"); File.WriteAllText(testFile, @"LocationID;X_Maaiveld binnenwaarts;Y_Maaiveld binnenwaarts;Z_Maaiveld binnenwaarts;X_Insteek sloot polderzijde;Y_Insteek sloot polderzijde;Z_Insteek sloot polderzijde;X_Slootbodem polderzijde;Y_Slootbodem polderzijde;Z_Slootbodem polderzijde;X_Slootbodem dijkzijde;Y_Slootbodem dijkzijde;Z_Slootbodem dijkzijde;X_Insteek sloot dijkzijde;Y_Insteek_sloot dijkzijde;Z_Insteek sloot dijkzijde;X_Teen dijk binnenwaarts;Y_Teen dijk binnenwaarts;Z_Teen dijk binnenwaarts;X_Kruin binnenberm;Y_Kruin binnenberm;Z_Kruin binnenberm;X_Insteek binnenberm;Y_Insteek binnenberm;Z_Insteek binnenberm;X_Kruin binnentalud;Y_Kruin binnentalud;Z_Kruin binnentalud;X_Verkeersbelasting kant binnenwaarts;Y_Verkeersbelasting kant binnenwaarts;Z_Verkeersbelasting kant binnenwaarts;X_Verkeersbelasting kant buitenwaarts;Y_Verkeersbelasting kant buitenwaarts;Z_Verkeersbelasting kant buitenwaarts;X_Kruin buitentalud;Y_Kruin buitentalud;Z_Kruin buitentalud;X_Insteek buitenberm;Y_Insteek buitenberm;Z_Insteek buitenberm;X_Kruin buitenberm;Y_Kruin buitenberm;Z_Kruin buitenberm;X_Teen dijk buitenwaarts;Y_Teen dijk buitenwaarts;Z_Teen dijk buitenwaarts;X_Maaiveld buitenwaarts;Y_Maaiveld buitenwaarts;Z_Maaiveld buitenwaarts;X_Dijktafelhoogte;Y_Dijktafelhoogte;Z_Dijktafelhoogte;Volgnummer", Encoding.ASCII); LogManager.Clear(); DSoilModelIO.ReadCsvCharacteristicPointsFromFileAndAddToProject(testFile, project); @@ -89,7 +89,7 @@ public void DamDefxImporterMustRefuseIncompleteSegments() { // setup, using a copy of DAM tutorial Design with the Geometries folder deleted. - string tutorial = Path.Combine(Directory.GetCurrentDirectory(), @"TestFiles\DAM Incomplete.defx"); + string tutorial = Path.Combine(GetTestFilesPath(), "DAM Incomplete.defx"); Assert.IsTrue(File.Exists(tutorial)); // call @@ -113,7 +113,7 @@ public void ImportDamSegmentsFromDefxFile() { // setup - string tutorial = Path.Combine(@"..\..\..\data", @"DAM\Dam Tutorial Design", "DAM Tutorial Design.defx"); + string tutorial = Path.Combine(GetTestFilesPath(), "Dam Tutorial Design", "DAM Tutorial Design.defx"); Assert.IsTrue(File.Exists(tutorial)); // call @@ -140,7 +140,7 @@ [Test] public void ImportDuplicateMdbDoesNotCreateDuplicateSoils() { - string mdbFile = Path.Combine(@"..\..\..\data", "D-Soil Model", "Groot Salland.mdb"); + string mdbFile = Path.Combine(GetTestFilesPath(), "Groot Salland.mdb"); var project = new DSoilModelProject(); project.ReadSoilsFromDatabase(mdbFile); @@ -154,14 +154,13 @@ [Test] public void ImportMdbAquitardDoesNotOverwriteAquiferSoilWithSameName() { - string testFolder = Path.Combine(Directory.GetCurrentDirectory(), "TestFiles"); var project = new DSoilModelProject(); // file with TestSand as aquifer - project.ReadSoilsFromDatabase(Path.Combine(testFolder, "AquiferTest.mdb")); + project.ReadSoilsFromDatabase(Path.Combine(GetTestFilesPath(), "AquiferTest.mdb")); // file with TestSand as aquitard - project.ReadSoilsFromDatabase(Path.Combine(testFolder, "AquitardTest.mdb")); + project.ReadSoilsFromDatabase(Path.Combine(GetTestFilesPath(), "AquitardTest.mdb")); Assert.AreEqual(3, project.Soils.Soils.Count); Assert.AreEqual(1, project.Soils.Soils.Count(s => s.Name == "TestSand")); @@ -171,17 +170,13 @@ } /// - /// Test of the import of surface lines from Csv file + /// Test of the import of surface lines from Csv file /// [Test] public void ImportSurfacelinesFromCsvFile() { - const string csvFileNameAndRelativePath = @"TestFiles\DSoilModelsurfacelines.csv"; + string csvFullFileName = Path.Combine(GetTestFilesPath(), "DSoilModelsurfacelines.csv"); - // Locate the test files. - string currentDirectory = Directory.GetCurrentDirectory(); - string csvFullFileName = Path.Combine(currentDirectory, csvFileNameAndRelativePath); - using (var project = new DSoilModelProject()) { DSoilModelIO.ReadCsvSurfaceLineFromFileAndAddToProject(csvFullFileName, project); @@ -199,25 +194,25 @@ public void SegmentsImporterMustRefuseIncompleteSegments() { // setup using DAM files - const string segmentFile = "segments.csv"; - const string soilprofileFile = "soilprofiles.csv"; - var dir = @"..\..\..\data\\Dam\Waterboards\Delfland\regionaal\csv files\"; + string segmentFile = Path.Combine(GetTestFilesPath(), "Delfland", "segments.csv"); + string soilprofileFile = Path.Combine(GetTestFilesPath(), "Delfland", "soilprofiles.csv"); + using (var project = new DSoilModelProject()) { // complete import - project.SoilProfiles1D.AddRange(new SoilProfilesImporter().ReadSoilProfiles(dir + soilprofileFile, new SoilList())); + project.SoilProfiles1D.AddRange(new SoilProfilesImporter().ReadSoilProfiles(soilprofileFile, new SoilList())); Assert.AreEqual(147, project.SoilProfiles1D.Count); LogManager.Clear(); - DSoilModelIO.ReadCsvSegmentsFromFileAndAddToProject(dir + segmentFile, project); + DSoilModelIO.ReadCsvSegmentsFromFileAndAddToProject(segmentFile, project); Assert.AreEqual(10, project.SoilSegments.Count); Assert.AreEqual(0, LogManager.Messages.Count); // incomplete import of segments project.SoilProfiles1D.Clear(); project.SoilSegments.Clear(); - DSoilModelIO.ReadCsvSegmentsFromFileAndAddToProject(dir + segmentFile, project); + DSoilModelIO.ReadCsvSegmentsFromFileAndAddToProject(segmentFile, project); Assert.AreEqual(0, project.SoilSegments.Count); Assert.GreaterOrEqual(LogManager.Messages.Count, 10); } @@ -227,7 +222,7 @@ public void StoreAndRestoreUnusedStressTables() { // even if a stresstable has no records, is not used by any soil, save and reopen project should not discard those - const string testFile = @"TestFiles\EmptyStressTables.soil"; + const string testFile = @"TempFiles\EmptyStressTables.soil"; using (var project = new DSoilModelProject()) { project.StressCurves.Add(new StressCurve { Name = "StressCurve" } ); @@ -249,12 +244,12 @@ // see issue DSB-389, dataset wit all profiles missing var project = new DSoilModelProject(); LogManager.Clear(); - project.ReadSoilProfiles1DFromFile(@"TestFiles\Missing profiles\1D_profiles.csv"); + project.ReadSoilProfiles1DFromFile(Path.Combine(GetTestFilesPath(), "Missing profiles", "1D_profiles.csv")); Assert.AreEqual(3, project.SoilProfiles1D.Count); Assert.AreEqual(5, LogManager.Messages.Count(m => m.Message.Contains("undefined soil"))); LogManager.Clear(); - DSoilModelIO.ReadCsvSegmentsFromFileAndAddToProject(@"TestFiles\Missing profiles\Soilsegments.csv", project, true); + DSoilModelIO.ReadCsvSegmentsFromFileAndAddToProject(Path.Combine(GetTestFilesPath(), "Missing profiles", "Soilsegments.csv"), project, true); Assert.AreEqual(0, project.SoilSegments.Count); Assert.AreEqual(2, LogManager.Messages.Count(m => m.Message.Contains("profiles are missing"))); } @@ -265,14 +260,19 @@ // dataset with partially missing profiles var project = new DSoilModelProject(); LogManager.Clear(); - project.ReadSoilProfiles1DFromFile(@"TestFiles\Missing profiles\1D_profiles_2segmenten.csv"); + project.ReadSoilProfiles1DFromFile(Path.Combine(GetTestFilesPath(), "Missing profiles", "1D_profiles_2segmenten.csv")); Assert.AreEqual(5, project.SoilProfiles1D.Count); Assert.AreEqual(7, LogManager.Messages.Count(m => m.Message.Contains("undefined soil"))); LogManager.Clear(); - DSoilModelIO.ReadCsvSegmentsFromFileAndAddToProject(@"TestFiles\Missing profiles\Soilsegments_2segmenten.csv", project, true); + DSoilModelIO.ReadCsvSegmentsFromFileAndAddToProject(Path.Combine(GetTestFilesPath(), "Missing profiles", "Soilsegments_2segmenten.csv"), project, true); Assert.AreEqual(2, project.SoilSegments.Count); Assert.AreEqual(2, LogManager.Messages.Count(m => m.Message.Contains("profiles are missing"))); } + + private string GetTestFilesPath() + { + return Path.GetFullPath(@"..\..\Deltares.DSoilModel.Data.Tests\TestFiles"); + } } } \ No newline at end of file Index: src/Deltares.DSoilModel.Data.Tests/SosSoilProfilesImporterTests.cs =================================================================== diff -u -r283 -r296 --- src/Deltares.DSoilModel.Data.Tests/SosSoilProfilesImporterTests.cs (.../Deltares.DSoilModel.Tests/SosSoilProfilesImporterTests.cs) (revision 283) +++ src/Deltares.DSoilModel.Data.Tests/SosSoilProfilesImporterTests.cs (.../Deltares.DSoilModel.Data.Tests/SosSoilProfilesImporterTests.cs) (revision 296) @@ -1,12 +1,10 @@ using System.Drawing; using System.IO; -using Deltares.DSoilModel.Data; using Deltares.Geotechnics; -using Deltares.Standard; using Deltares.Standard.Logging; using NUnit.Framework; -namespace Tests +namespace Deltares.DSoilModel.Data.Tests { [TestFixture] public class SosSoilProfilesImporterTests @@ -17,11 +15,11 @@ [Test] public void DSoilModelIO_ImportFromCsvFile() { - const string csvFileNameAndRelativePath = @"TestFiles\DSoilModelsoilprofiles.csv"; + string csvFilePath = Path.Combine(GetTestFilesPath(), "DSoilModelsoilprofiles.csv"); // Locate the test files. var currentDirectory = Directory.GetCurrentDirectory(); - var csvFullFileName = Path.Combine(currentDirectory, csvFileNameAndRelativePath); + var csvFullFileName = Path.Combine(currentDirectory, csvFilePath); using (var project = new DSoilModelProject()) { @@ -44,11 +42,11 @@ [Test] public void DSoilModelIO_ImportFromCsvFileWithErrors() { - const string csvFileNameAndRelativePath = @"TestFiles\DSoilModelsoilprofilesWithErrors.csv"; - + string csvFilePath = Path.Combine(GetTestFilesPath(), "DSoilModelsoilprofilesWithErrors.csv"); + // Locate the test files. var currentDirectory = Directory.GetCurrentDirectory(); - var csvFullFileName = Path.Combine(currentDirectory, csvFileNameAndRelativePath); + var csvFullFileName = Path.Combine(currentDirectory, csvFilePath); LogManager.Messages.Clear(); using (var project = new DSoilModelProject()) { @@ -69,11 +67,11 @@ [Test] public void DSoilModelIO_ImportFromCsvFileWithTypes() { - const string csvFileNameAndRelativePath = @"TestFiles\DSoilModelsoilprofilesWithSoilTypes.csv"; - + string csvFilePath = Path.Combine(GetTestFilesPath(), "DSoilModelsoilprofilesWithSoilTypes.csv"); + // Locate the test files. var currentDirectory = Directory.GetCurrentDirectory(); - var csvFullFileName = Path.Combine(currentDirectory, csvFileNameAndRelativePath); + var csvFullFileName = Path.Combine(currentDirectory, csvFilePath); using (var project = new DSoilModelProject()) { @@ -110,11 +108,11 @@ [Test] public void DSoilModelIO_ImportFromCsvFileWithTypesAndColors() { - const string csvFileNameAndRelativePath = @"TestFiles\DSoilModelsoilprofilesWithSoilTypesAndColorUniqueSoils.csv"; - + string csvFilePath = Path.Combine(GetTestFilesPath(), "DSoilModelsoilprofilesWithSoilTypesAndColorUniqueSoils.csv"); + // Locate the test files. var currentDirectory = Directory.GetCurrentDirectory(); - var csvFullFileName = Path.Combine(currentDirectory, csvFileNameAndRelativePath); + var csvFullFileName = Path.Combine(currentDirectory, csvFilePath); using (var project = new DSoilModelProject()) { @@ -166,11 +164,11 @@ [Test] public void DSoilModelIO_ImportFromCsvFileWithTypesAndColorsWithDoubleSoils() { - const string csvFileNameAndRelativePath = @"TestFiles\DSoilModelsoilprofilesWithSoilTypesAndColor.csv"; - + string csvFilePath = Path.Combine(GetTestFilesPath(), "DSoilModelsoilprofilesWithSoilTypesAndColor.csv"); + // Locate the test files. var currentDirectory = Directory.GetCurrentDirectory(); - var csvFullFileName = Path.Combine(currentDirectory, csvFileNameAndRelativePath); + var csvFullFileName = Path.Combine(currentDirectory, csvFilePath); using (var project = new DSoilModelProject()) { @@ -231,11 +229,11 @@ [Test] public void DSoilModelIO_ImportFromCsvFileWithInvalidHeaders() { - const string csvFileNameAndRelativePath = @"TestFiles\DSoilModelsoilprofilesWithInvalidHeaders.csv"; - + string csvFilePath = Path.Combine(GetTestFilesPath(), "DSoilModelsoilprofilesWithInvalidHeaders.csv"); + // Locate the test files. var currentDirectory = Directory.GetCurrentDirectory(); - var csvFullFileName = Path.Combine(currentDirectory, csvFileNameAndRelativePath); + var csvFullFileName = Path.Combine(currentDirectory, csvFilePath); LogManager.Messages.Clear(); using (var project = new DSoilModelProject()) { @@ -248,11 +246,11 @@ [Test] public void DSoilModelIO_ImportFromCsvFileWithMissingHeaders() { - const string csvFileNameAndRelativePath = @"TestFiles\DSoilModelsoilprofilesWithMissingHeaders.csv"; - + string csvFilePath = Path.Combine(GetTestFilesPath(), "DSoilModelsoilprofilesWithMissingHeaders.csv"); + // Locate the test files. var currentDirectory = Directory.GetCurrentDirectory(); - var csvFullFileName = Path.Combine(currentDirectory, csvFileNameAndRelativePath); + var csvFullFileName = Path.Combine(currentDirectory, csvFilePath); LogManager.Messages.Clear(); using (var project = new DSoilModelProject()) { @@ -261,5 +259,11 @@ Assert.AreEqual(0, project.SoilProfiles1D.Count, "Expected the profiles were not read"); } } + + private string GetTestFilesPath() + { + return Path.GetFullPath(@"..\..\Deltares.DSoilModel.Data.Tests\TestFiles"); + } + } } \ No newline at end of file Index: src/DSoilModel.sln =================================================================== diff -u -r241 -r296 --- src/DSoilModel.sln (.../DSoilModel.sln) (revision 241) +++ src/DSoilModel.sln (.../DSoilModel.sln) (revision 296) @@ -7,8 +7,6 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.DSoilModel.Application", "Deltares.DSoilModel.Application\Deltares.DSoilModel.Application.csproj", "{61D69903-F728-40DF-9B6B-19E45C0621D6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.DSoilModel.Tests", "Deltares.DSoilModel.Tests\Deltares.DSoilModel.Tests.csproj", "{7F3A1524-E28B-47BF-94BB-4571D304BE16}" -EndProject Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Deltares.DSoilModel.Setup", "Deltares.DSoilModel.Setup\Deltares.DSoilModel.Setup.wixproj", "{E3E0CC29-5031-47E2-B230-C077B9BB5061}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{EEEE9444-BDDA-44ED-A139-4A7B6F93BBCA}" @@ -35,10 +33,6 @@ {61D69903-F728-40DF-9B6B-19E45C0621D6}.Debug|x86.Build.0 = Debug|x86 {61D69903-F728-40DF-9B6B-19E45C0621D6}.Release|x86.ActiveCfg = Release|x86 {61D69903-F728-40DF-9B6B-19E45C0621D6}.Release|x86.Build.0 = Release|x86 - {7F3A1524-E28B-47BF-94BB-4571D304BE16}.Debug|x86.ActiveCfg = Debug|x86 - {7F3A1524-E28B-47BF-94BB-4571D304BE16}.Debug|x86.Build.0 = Debug|x86 - {7F3A1524-E28B-47BF-94BB-4571D304BE16}.Release|x86.ActiveCfg = Release|x86 - {7F3A1524-E28B-47BF-94BB-4571D304BE16}.Release|x86.Build.0 = Release|x86 {E3E0CC29-5031-47E2-B230-C077B9BB5061}.Debug|x86.ActiveCfg = Debug|x86 {E3E0CC29-5031-47E2-B230-C077B9BB5061}.Release|x86.ActiveCfg = Release|x86 {7FA5B2F2-3FEE-4706-908C-68BA03FDF084}.Debug|x86.ActiveCfg = Debug|x86 @@ -54,7 +48,6 @@ HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {7F3A1524-E28B-47BF-94BB-4571D304BE16} = {EEEE9444-BDDA-44ED-A139-4A7B6F93BBCA} {7FA5B2F2-3FEE-4706-908C-68BA03FDF084} = {EEEE9444-BDDA-44ED-A139-4A7B6F93BBCA} {280EF52F-2056-4430-9644-880094A62A4C} = {EEEE9444-BDDA-44ED-A139-4A7B6F93BBCA} EndGlobalSection Index: src/Deltares.DSoilModel.Data.Tests/Deltares.DSoilModel.Data.Tests.csproj =================================================================== diff -u -r131 -r296 --- src/Deltares.DSoilModel.Data.Tests/Deltares.DSoilModel.Data.Tests.csproj (.../Deltares.DSoilModel.Data.Tests.csproj) (revision 131) +++ src/Deltares.DSoilModel.Data.Tests/Deltares.DSoilModel.Data.Tests.csproj (.../Deltares.DSoilModel.Data.Tests.csproj) (revision 296) @@ -24,6 +24,10 @@ false + + False + ..\..\lib\Deltares\DslGeographic\Deltares.Geographic.dll + False ..\..\lib\Deltares\DslGeo\Deltares.Geometry.dll @@ -32,6 +36,18 @@ False ..\..\lib\Deltares\DslGeo\Deltares.Geotechnics.dll + + False + ..\..\lib\Deltares\DslGeoIo\Deltares.Geotechnics.IO.dll + + + False + ..\..\lib\Deltares\DslGeo\Deltares.Geotechnics.TestUtils.dll + + + False + ..\..\lib\Deltares\DslCore\Deltares.Mathematics.dll + False ..\..\lib\Deltares\DslProbabilistic\Deltares.Probabilistic.dll @@ -40,26 +56,107 @@ False ..\..\lib\Deltares\DslGeo\Deltares.Standard.dll + + False + ..\..\lib\Deltares\DslFormsStandard\Deltares.Standard.Forms.dll + + + False + ..\..\lib\Deltares\DslFormsMap\Deltares.Standard.Maps.dll + + + False + ..\..\lib\Deltares\DslCore\Deltares.Standard.TestUtils.dll + + + ..\packages\CompareNETObjects.3.03.0.0\lib\net40\KellermanSoftware.Compare-NET-Objects.dll + True + ..\packages\NUnit.2.6.2\lib\nunit.framework.dll True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {37BC4D84-386E-425C-967B-CCF83E48A5F3} Deltares.DSoilModel.Data + + + + + + + +