Changeset 16709


Ignore:
Timestamp:
03/25/19 16:49:53 (5 months ago)
Author:
gkronber
Message:

#2999 merged r16703 from trunk to stable

Location:
stable
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Tests

  • stable/HeuristicLab.Tests/HeuristicLab-3.3/ContentViewTests.cs

    r15584 r16709  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.MainForm;
    26 using HeuristicLab.MainForm.WindowsForms;
    2726using HeuristicLab.PluginInfrastructure;
    2827using Microsoft.VisualStudio.TestTools.UnitTesting;
     
    3837      //get all non-generic and instantiable classes which implement IContentView
    3938      foreach (Type viewType in ApplicationManager.Manager.GetTypes(typeof(IContentView))) {
     39        // jkarder: skip this test for the SymbolicDataAnalysisModelMathView (and for views that derive from it)
     40        // reason: our new build agent cannot create an instance of this view due to the use of System.Windows.Forms.WebBrowser
     41        if (typeof(HeuristicLab.Problems.DataAnalysis.Symbolic.Views.SymbolicDataAnalysisModelMathView).IsAssignableFrom(viewType))
     42          continue;
     43
    4044        //get all ContentAttributes on the instantiable view
    4145        foreach (ContentAttribute attribute in viewType.GetCustomAttributes(typeof(ContentAttribute), false).Cast<ContentAttribute>()) {
     
    4852        try {
    4953          accessor.Invoke("OnContentChanged");
    50         }
    51         catch (Exception ex) {
     54        } catch (Exception ex) {
    5255          Assert.Fail(viewType.ToString() + Environment.NewLine + ex.Message);
    5356        }
  • stable/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r16438 r16709  
    295295    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4">
    296296      <HintPath>..\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4.dll</HintPath>
     297      <Private>False</Private>
     298    </Reference>
     299    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     300      <SpecificVersion>False</SpecificVersion>
     301      <HintPath>..\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.dll</HintPath>
    297302      <Private>False</Private>
    298303    </Reference>
Note: See TracChangeset for help on using the changeset viewer.