Riskeer / Ringtoets / Integration / test / Ringtoets.Integration.Plugin.Test

Merge

Clone Tools

Stats

Commits this week: 0
Total Committers: 3
Last Commit: 26 Nov
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Monday 06 Aug 2018
11:16 am

Elmar Kleijn

Review related changes. WTI-1791

Options
    • -21
    • +21
    ./AssessmentSectionMergeHandlerTest.cs
  2. … 3 more files in changeset.
Thursday 26 Jul 2018
4:11 pm

Elmar Kleijn

Review related changes. WTI-1750

Options
    • -34
    • +0
    ./AssessmentSectionProviderTest.cs
1:53 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Close views of failure mechanisms that are being merged. WTI-1747

Options
    • -2
    • +61
    ./AssessmentSectionMergeHandlerTest.cs
  2. … 1 more file in changeset.
1:19 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Only log HR merge message when there is something merged. WTI-1747

Options
    • -49
    • +66
    ./AssessmentSectionMergeHandlerTest.cs
  2. … 1 more file in changeset.
10:44 am

Dennis Tang <dennis.tang@deltares.nl>

Incorporated comments review:

- Ran cleanup

- Updated XMLDocs

- Updated test names

Paired with ~tangerma

WTI-1731

Options
    • -1
    • +1
    ./AssessmentSectionMergeHandlerTest.cs
  2. … 4 more files in changeset.
9:49 am

Robert Tangerman <robert.tangerman@deltares.nl>

Fixed error that assessment sections are only read once. WTI-1750

Options
    • -0
    • +34
    ./AssessmentSectionProviderTest.cs
  2. … 2 more files in changeset.
Wednesday 25 Jul 2018
4:30 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Improvements after review. WTI-1770

Options
    • -30
    • +38
    ./AssessmentSectionMergeHandlerTest.cs
  2. … 1 more file in changeset.
3:26 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Removed unused property. WTI-1731

Options
    • -26
    • +1
    ./AssessmentSectionMergeHandlerTest.cs
    • -10
    • +2
    ./AssessmentSectionMergerTest.cs
  3. … 4 more files in changeset.
3:21 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Used merge data bool properties for merging failure mechanisms. WTI-1731

Options
    • -3
    • +54
    ./AssessmentSectionMergeHandlerTest.cs
  2. … 1 more file in changeset.
2:32 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Removed old method. WTI-1731

Options
    • -65
    • +1
    ./AssessmentSectionMergeHandlerTest.cs
  2. … 2 more files in changeset.
2:30 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Connected tests to new method. WTI-1731

Options
    • -35
    • +82
    ./AssessmentSectionMergeHandlerTest.cs
2:17 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Use new handler method in merger. WTI-1731

Options
    • -6
    • +6
    ./AssessmentSectionMergerTest.cs
  2. … 1 more file in changeset.
2:13 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Added method in handler with MergeData. WTI-1731

Options
    • -0
    • +19
    ./AssessmentSectionMergeHandlerTest.cs
  2. … 2 more files in changeset.
1:26 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Added construction properties to constructor. WTI-1731

Options
    • -2
    • +2
    ./AssessmentSectionMergerTest.cs
  2. … 3 more files in changeset.
11:52 am

Robert Tangerman <robert.tangerman@deltares.nl>

Added merge exception. WTI-1731

Options
    • -0
    • +32
    ./AssessmentSectionMergeExceptionTest.cs
  2. … 3 more files in changeset.
11:52 am

Robert Tangerman <robert.tangerman@deltares.nl>

Revert "Added merge exception. WTI-1731"

This reverts commit 6e5c5f73497dbbb49815645a08eea8ec24140f7e.

Options
    • -32
    • +0
    ./AssessmentSectionMergeExceptionTest.cs
  2. … 3 more files in changeset.
11:49 am

Robert Tangerman <robert.tangerman@deltares.nl>

Added throwing NotSupportedException when failure mechanism can't be merged. WTI-1731

Options
    • -0
    • +23
    ./AssessmentSectionMergeHandlerTest.cs
  2. … 1 more file in changeset.
11:27 am

Robert Tangerman <robert.tangerman@deltares.nl>

Added missing assert. WTI-1770

Options
    • -0
    • +2
    ./AssessmentSectionMergeHandlerTest.cs
11:26 am

Dennis Tang <dennis.tang@deltares.nl>

Incorporated comments review 3096:

- Added missing asserts

Paired with ~tangerma.

WTI-1777

Options
    • -0
    • +2
    ./AssessmentSectionMergeHandlerTest.cs
11:25 am

Robert Tangerman <robert.tangerman@deltares.nl>

Improved checking whether to merge location calculations. WTI-1746

Options
    • -0
    • +86
    ./AssessmentSectionMergeHandlerTest.cs
  2. … 1 more file in changeset.
11:00 am

Robert Tangerman <robert.tangerman@deltares.nl>

Added notifying location calculations when merged. WTI-1747

Options
    • -0
    • +38
    ./AssessmentSectionMergeHandlerTest.cs
  2. … 1 more file in changeset.
10:36 am

Robert Tangerman <robert.tangerman@deltares.nl>

Cleanup. WTI-1747

Options
    • -4
    • +4
    ./AssessmentSectionMergeHandlerTest.cs
9:11 am

Robert Tangerman <robert.tangerman@deltares.nl>

Added merging dunes. WTI-1777

Options
    • -2
    • +3
    ./AssessmentSectionMergeHandlerTest.cs
  2. … 1 more file in changeset.
Tuesday 24 Jul 2018
4:21 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Improvements after review. WTI-1750

Options
    • -1
    • +1
    ./AssessmentSectionMergerTest.cs
    • -1
    • +1
    ./AssessmentSectionProviderTest.cs
  3. … 3 more files in changeset.
3:11 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Added updating hydraulic boundary calculations for grass outwards. WTI-1770

Options
    • -0
    • +47
    ./AssessmentSectionMergeHandlerTest.cs
  2. … 1 more file in changeset.
10:08 am

Robert Tangerman <robert.tangerman@deltares.nl>

Update reference of hydraulic boundary locations in calculations after merge. WTI-1770

Options
    • -3
    • +15
    ./AssessmentSectionMergeHandlerTest.cs
  2. … 1 more file in changeset.
9:59 am

Robert Tangerman <robert.tangerman@deltares.nl>

Added merging grass outwards. WTI-1770

Options
    • -9
    • +10
    ./AssessmentSectionMergeHandlerTest.cs
  2. … 1 more file in changeset.
9:46 am

Robert Tangerman <robert.tangerman@deltares.nl>

Improvements after review. WTI-1746

Options
    • -18
    • +15
    ./AssessmentSectionMergeHandlerTest.cs
  2. … 2 more files in changeset.
Monday 23 Jul 2018
10:54 pm

Dennis Tang <dennis.tang@deltares.nl>

Merge branch 'AssemblyTool'

# Conflicts:

# Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs

# Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj

# Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs

# Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs

# Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx

# Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs

# Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs

# Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs

# Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs

# Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs

# Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs

# Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactoryTest.cs

Options
    • -1
    • +1
    ./AssessmentSectionMergeHandlerTest.cs
  2. … 2 more files in changeset.
4:36 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Update reference of hydraulic boundary locations after merge. WTI-1731

Options
    • -1
    • +130
    ./AssessmentSectionMergeHandlerTest.cs
  2. … 2 more files in changeset.