diff options
Diffstat (limited to 'main/tests/UserInterfaceTests/TemplateTests')
3 files changed, 42 insertions, 25 deletions
diff --git a/main/tests/UserInterfaceTests/TemplateTests/ASPNETTemplateTests.cs b/main/tests/UserInterfaceTests/TemplateTests/ASPNETTemplateTests.cs index 0ab34f71b6..904726c71d 100644 --- a/main/tests/UserInterfaceTests/TemplateTests/ASPNETTemplateTests.cs +++ b/main/tests/UserInterfaceTests/TemplateTests/ASPNETTemplateTests.cs @@ -35,15 +35,22 @@ namespace UserInterfaceTests { readonly string aspCategory = "ASP.NET"; - [Test] - [TestCase ("Empty ASP.NET MVC Project", BeforeBuildAction.WaitForPackageUpdate, TestName = "TestEmptyASPMVCProject")] - [TestCase ("Empty ASP.NET Project", BeforeBuildAction.None, TestName = "TestEmptyASPProject")] - [TestCase ("ASP.NET MVC Project", BeforeBuildAction.WaitForPackageUpdate, TestName = "TestASPMVCProject")] - [TestCase ("ASP.NET MVC Project with Unit Tests", BeforeBuildAction.WaitForPackageUpdate, TestName = "TestASPMVCProjectWithUnitTests")] - [TestCase ("ASP.NET MVC Razor Project", BeforeBuildAction.WaitForPackageUpdate, TestName = "TestASPMVCMazorProject")] - [TestCase ("ASP.NET MVC Razor Project with Unit Tests", BeforeBuildAction.WaitForPackageUpdate, TestName = "TestASPMVCMazorProjectWithUnitTests")] - [TestCase ("ASP.NET Project", BeforeBuildAction.None, TestName = "TestASPProject")] - public void RunASPTest (string templateName, BeforeBuildAction beforeBuild) + [Test, Timeout (90000)] + [TestCase ("Empty ASP.NET MVC Project", TestName = "TestEmptyASPMVCProject", + Description = "Create and build Empty ASP.NET MVC Project")] + [TestCase ("Empty ASP.NET Project", TestName = "TestEmptyASPProject", + Description = "Create and build Empty ASP.NET MVC Project")] + [TestCase ("ASP.NET MVC Project", TestName = "TestASPMVCProject", + Description = "Create and build ASP.NET MVC Project")] + [TestCase ("ASP.NET MVC Project with Unit Tests", TestName = "TestASPMVCProjectWithUnitTests", + Description = "Create and build ASP.NET MVC Project with Unit Tests")] + [TestCase ("ASP.NET MVC Razor Project", TestName = "TestASPMVCMazorProject", + Description = "Create and build ASP.NET MVC Razor Project")] + [TestCase ("ASP.NET MVC Razor Project with Unit Tests", TestName = "TestASPMVCMazorProjectWithUnitTests", + Description = "Create and build ASP.NET MVC Razor Project with Unit Tests", Category="Smoke")] + [TestCase ("ASP.NET Project", TestName = "TestASPProject", + Description = "Create and build ASP.NET Project")] + public void RunASPTest (string templateName) { var templateOptions = new TemplateSelectionOptions { CategoryRoot = OtherCategoryRoot, @@ -51,7 +58,8 @@ namespace UserInterfaceTests TemplateKindRoot = GeneralKindRoot, TemplateKind = templateName }; - CreateBuildProject (templateOptions, beforeBuild.GetAction ()); + + CreateBuildProject (templateOptions, () => Ide.WaitForIdeIdle (totalTimeoutInSecs: 50)); } } } diff --git a/main/tests/UserInterfaceTests/TemplateTests/DotNetTemplatesTest.cs b/main/tests/UserInterfaceTests/TemplateTests/DotNetTemplatesTest.cs index 53abdb7d70..48eb89b26b 100644 --- a/main/tests/UserInterfaceTests/TemplateTests/DotNetTemplatesTest.cs +++ b/main/tests/UserInterfaceTests/TemplateTests/DotNetTemplatesTest.cs @@ -34,12 +34,13 @@ namespace UserInterfaceTests { readonly string dotNetCategory = ".NET"; - [Test] - [TestCase ("Console Project", BeforeBuildAction.None, TestName = "TestCreateBuildConsoleProject")] - [TestCase ("Gtk# 2.0 Project", BeforeBuildAction.None, TestName = "TestCreateBuildGtkSharp20Project")] - [TestCase ("Library", BeforeBuildAction.None, TestName = "TestCreateBuildLibrary")] - [TestCase ("NUnit Library Project", BeforeBuildAction.WaitForPackageUpdate, TestName = "TestCreateBuildNUnitLibraryProject")] - public void RunDotNetTests (string templateName, BeforeBuildAction beforeBuild) + [Test, Timeout (90000)] + [TestCase ("Console Project", 30, TestName = "TestCreateBuildConsoleProject", Description = "Create and build C# Console Project", Category="Smoke")] + [TestCase ("Gtk# 2.0 Project", 30, TestName = "TestCreateBuildGtkSharp20Project", Description = "Create and build a GTK#2 Project")] + [TestCase ("Library", 30, TestName = "TestCreateBuildLibrary", Description = "Create and build a Library Project")] + [TestCase ("NUnit Library Project", 50, TestName = "TestCreateBuildNUnitLibraryProject", + Description = "Create and build NUnit Library Project", Category="Smoke")] + public void RunDotNetTests (string templateName, int totalTimeoutInSecs) { var templateOptions = new TemplateSelectionOptions { CategoryRoot = OtherCategoryRoot, @@ -47,7 +48,7 @@ namespace UserInterfaceTests TemplateKindRoot = GeneralKindRoot, TemplateKind = templateName }; - CreateBuildProject (templateOptions, beforeBuild.GetAction ()); + CreateBuildProject (templateOptions, () => Ide.WaitForIdeIdle ((uint)totalTimeoutInSecs)); } } } diff --git a/main/tests/UserInterfaceTests/TemplateTests/MiscTemplatesTest.cs b/main/tests/UserInterfaceTests/TemplateTests/MiscTemplatesTest.cs index 196e3392db..8a041ac129 100644 --- a/main/tests/UserInterfaceTests/TemplateTests/MiscTemplatesTest.cs +++ b/main/tests/UserInterfaceTests/TemplateTests/MiscTemplatesTest.cs @@ -28,18 +28,25 @@ using NUnit.Framework; namespace UserInterfaceTests { - [TestFixture] - [Category("Misc")] + [TestFixture, Timeout (60000), Category ("Misc")] public class MiscTemplatesTest : CreateBuildTemplatesTestBase { readonly string miscCategory = "Miscellaneous"; [Test] - [TestCase ("Generic Project", "Generic", TestName = "TestMiscGenericProject")] - [TestCase ("Packaging project", "Generic", TestName = "TestMiscPackagingProject")] - [TestCase ("Shared Library", "C/C++", TestName = "TestMiscCCPlusSharedLibrary")] - [TestCase ("Static Library", "C/C++", TestName = "TestMiscCCPlusStaticLibrary")] - [TestCase ("Console Project", "C/C++", TestName = "TestMiscCCPlusConsoleProject")] + [Platform (Exclude="Win")] + [TestCase ("Shared Library", "C/C++", TestName = "TestMiscCCPlusSharedLibrary", Description = "Create and build Shared C/C++ Library")] + [TestCase ("Static Library", "C/C++", TestName = "TestMiscCCPlusStaticLibrary", Description = "Create and build Static C/C++ Library")] + [TestCase ("Console Project", "C/C++", TestName = "TestMiscCCPlusConsoleProject", Description = "Create and build Console C/C++ Project")] + public void RunMiscCPlusPlusTemplatesTest (string templateName, string templateKind) + { + RunMiscTemplatesTest (templateName, templateKind); + } + + [Test] + [TestCase ("Generic Project", "Generic", TestName = "TestMiscGenericProject", Description = "Create and build Generic Project")] + [TestCase ("Packaging project", "Generic", TestName = "TestMiscPackagingProject", Description = "Create and build Packaging Project")] + public void RunMiscTemplatesTest (string templateName, string templateKind) { var templateOptions = new TemplateSelectionOptions { @@ -48,7 +55,8 @@ namespace UserInterfaceTests TemplateKindRoot = templateKind, TemplateKind = templateName }; - CreateBuildProject (templateOptions, EmptyAction); + CreateBuildProject (templateOptions, () => Ide.WaitForIdeIdle ()); + IsTemplateSelected (templateOptions); } } } |