Index: Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.Designer.cs
===================================================================
diff -u -r9c816c08366bce236b8792f4f671250a716574f8 -r085024022df9a3f1ebe84c45503dc6e9275860d0
--- Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.Designer.cs (.../MessageWindow.Designer.cs) (revision 9c816c08366bce236b8792f4f671250a716574f8)
+++ Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.Designer.cs (.../MessageWindow.Designer.cs) (revision 085024022df9a3f1ebe84c45503dc6e9275860d0)
@@ -75,9 +75,11 @@
this.levelColumn = new System.Data.DataColumn();
this.timeColumn = new System.Data.DataColumn();
this.messageColumn = new System.Data.DataColumn();
+ this.fullMessageColumn = new System.Data.DataColumn();
this.levelColumnDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewImageColumn();
this.timeColumnDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.messageColumnDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.fullMessageColumnDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.contextMenu.SuspendLayout();
this.messagesToolStrip.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.messagesDataGridView)).BeginInit();
@@ -190,7 +192,8 @@
this.messagesDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.levelColumnDataGridViewTextBoxColumn,
this.timeColumnDataGridViewTextBoxColumn,
- this.messageColumnDataGridViewTextBoxColumn});
+ this.messageColumnDataGridViewTextBoxColumn,
+ this.fullMessageColumnDataGridViewTextBoxColumn});
this.messagesDataGridView.ContextMenuStrip = this.contextMenu;
this.messagesDataGridView.DataSource = this.messagesBindingSource;
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
@@ -225,7 +228,8 @@
this.Messages.Columns.AddRange(new System.Data.DataColumn[] {
this.levelColumn,
this.timeColumn,
- this.messageColumn});
+ this.messageColumn,
+ this.fullMessageColumn});
this.Messages.TableName = "MessageTable";
//
// levelColumn
@@ -244,6 +248,10 @@
//
this.messageColumn.ColumnName = "messageColumn";
//
+ // fullMessageColumn
+ //
+ this.fullMessageColumn.ColumnName = "fullMessageColumn";
+ //
// levelColumnDataGridViewTextBoxColumn
//
this.levelColumnDataGridViewTextBoxColumn.DataPropertyName = "levelColumn";
@@ -275,6 +283,13 @@
this.messageColumnDataGridViewTextBoxColumn.ReadOnly = true;
this.messageColumnDataGridViewTextBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.False;
//
+ // fullMessageColumnDataGridViewTextBoxColumn
+ //
+ this.fullMessageColumnDataGridViewTextBoxColumn.DataPropertyName = "fullMessageColumn";
+ resources.ApplyResources(this.fullMessageColumnDataGridViewTextBoxColumn, "fullMessageColumnDataGridViewTextBoxColumn");
+ this.fullMessageColumnDataGridViewTextBoxColumn.Name = "fullMessageColumnDataGridViewTextBoxColumn";
+ this.fullMessageColumnDataGridViewTextBoxColumn.ReadOnly = true;
+ //
// MessageWindow
//
resources.ApplyResources(this, "$this");
@@ -316,8 +331,10 @@
private System.Data.DataColumn levelColumn;
private System.Data.DataColumn timeColumn;
private System.Data.DataColumn messageColumn;
+ private System.Data.DataColumn fullMessageColumn;
private DataGridViewImageColumn levelColumnDataGridViewTextBoxColumn;
private DataGridViewTextBoxColumn timeColumnDataGridViewTextBoxColumn;
private DataGridViewTextBoxColumn messageColumnDataGridViewTextBoxColumn;
+ private DataGridViewTextBoxColumn fullMessageColumnDataGridViewTextBoxColumn;
}
}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.cs
===================================================================
diff -u -rbe66e1bec38a780abb27fedea8632acf4d24a173 -r085024022df9a3f1ebe84c45503dc6e9275860d0
--- Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.cs (.../MessageWindow.cs) (revision be66e1bec38a780abb27fedea8632acf4d24a173)
+++ Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.cs (.../MessageWindow.cs) (revision 085024022df9a3f1ebe84c45503dc6e9275860d0)
@@ -22,6 +22,7 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
+using System.IO;
using System.Windows.Forms;
using Core.Common.Gui.Properties;
using log4net.Core;
@@ -128,7 +129,8 @@
row[0] = msg.ImageName;
row[1] = msg.Time;
- row[2] = msg.Message;
+ row[2] = msg.ShortMessage;
+ row[3] = msg.FullMessage;
Messages.Rows.InsertAt(row, 0);
}
@@ -267,7 +269,7 @@
return;
}
- var messageWindowDialog = new MessageWindowDialog(dialogParent, (string) messagesDataGridView.CurrentRow.Cells[messageColumnDataGridViewTextBoxColumn.Index].Value);
+ var messageWindowDialog = new MessageWindowDialog(dialogParent, (string)messagesDataGridView.CurrentRow.Cells[fullMessageColumnDataGridViewTextBoxColumn.Index].Value);
messageWindowDialog.ShowDialog();
}
@@ -276,16 +278,22 @@
{
public string ImageName { get; set; }
public DateTime Time { get; set; }
- public string Message { get; set; }
+ public string ShortMessage { get; set; }
+ public string FullMessage { get; set; }
}
#region IMessageWindow Members
public void AddMessage(Level level, DateTime time, string message)
{
+ string shortMessage;
+ using (var reader = new StringReader(message))
+ {
+ shortMessage = reader.ReadLine();
+ }
newMessages.Enqueue(new MessageData
{
- ImageName = level.ToString(), Time = time, Message = message
+ ImageName = level.ToString(), Time = time, ShortMessage = shortMessage, FullMessage = message
});
Invalidate();
}
Index: Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.resx
===================================================================
diff -u -r9c816c08366bce236b8792f4f671250a716574f8 -r085024022df9a3f1ebe84c45503dc6e9275860d0
--- Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.resx (.../MessageWindow.resx) (revision 9c816c08366bce236b8792f4f671250a716574f8)
+++ Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.resx (.../MessageWindow.resx) (revision 085024022df9a3f1ebe84c45503dc6e9275860d0)
@@ -122,22 +122,22 @@
- 157, 24
+ 137, 22
&Kopiƫren
- 154, 6
+ 134, 6
- 157, 24
+ 137, 22
&Alles wissen
- 158, 58
+ 138, 54
contextMenu
@@ -152,93 +152,93 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
- ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw
- EwAAAk1TRnQBSQFMAgEBBAEAASABAQEgAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
- AwABIAMAAQEBAAEgBgABIP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wAHAAEHAUkBEAH/
- AQcBQQEHAf8kAAMZASMDRQF9AloBYwHbAUoBTAGGAfMBSQFMAYQB8wJaAWMB2wNFAX0DGQEjIAADGQEj
- A0UBfQFjAV8BXgHbAYIBaAFdAfMBgAFoAV0B8wFjAV8BXgHbA0UBfQMZASMQAANRAaIBIwGnAeAB/wEh
- AaQB3wH/AR8BoQHdAf8BHQGeAdwB/wEbAZsB2gH/ARkBmAHZAf8BFgGTAdYB/wERAYwB0wH/AQwBhQHP
- Af8BBwF0AcwB/wEDAW0ByQH/AQABZwHGAf8BAAFiAcMB/wEAAV4BwQH/A1EBoiAAARABUgEQAf8BBwFJ
- ARAB/wEHAUkBEAH/IAADMwFTAlgBcAHmAUgBWgHUAf8BhAGQAecB/wGVAaAB7gH/AZUBnwHtAf8BgwGO
- AeUB/wFCAVMBzgH/AlgBbAHmAzMBUxgAAzMBUwFuAWQBYQHmAdoBqAF1Af8B/QHfAbsC/wHrAc4C/wHr
- Ac4B/wH6AdwBuAH/AdMBogFwAf8BagFiAWEB5gMzAVMMAAFYAWUBbAHjAb4B4wH1Af8B9AH8Af4B/wHv
- AfsB/gH/Ae4B+wH+Af8B7gH7Af4B/wHvAfwB/gH/Ae8B/AH+Af8B7wH7Af4B/wHuAfsB/gH/Ae0B+wH+
- Af8B7QH7Af4B/wHsAfsB/gH/AfIB/AH+Af8BqwHOAesB/wFaAV4BXwHYFAABGAGBARgB/wEQAVoBGAH/
- ARABWgEQAf8BEAFSARAB/wEQAVIBEAH/IAADMwFTAU4BUgGOAfQBawGEAeMB/wGhAawB9AH/AXUBiwHs
- Af8BUgFdAeQB/wFRAVwB4wH/AXMBhwHqAf8BnwGoAfEB/wFlAXIB3QH/AUEBUgGHAfQDMwFTEAADMwFT
- AYsBZgFSAfQB8wHPAaUC/wHjAccB/wHrAcQBnwH/Ad4BsgGKAf8B3AGuAYgB/wHmAb4BmgH/AfkB2wG/
- Af8B7QHLAZ8B/wF/AWUBXQH0AzMBUwgAAzABSwFYAb8B6AH/AfQB/AH+Af8BtQHvAfoB/wFOAdoB9QH/
- AU4B2gH1Af8BTQHYAfMB/wFOAdcB8gH/AU4B1gHyAf8BTQHZAfQB/wFHAdgB9QH/AUQB1wH0Af8BWAHa
- AfYB/wHqAfsB/gH/AToBkwHSAf8DMAFLEAABGAGBARgB/wEYAYEBGAH/AVoBpQGBAf8BWgGlAYEB/wEY
- AYEBGAH/ARABUgEQAf8BEAFaARgB/wEQAVIBEAH/AQcBSQEQAf8BBwFJARAB/wEHAUkBEAH/CAADGAEi
- Al4BcwHlAW4BiAHmAf8BowGwAfUB/wFNAV0B5wH/AUwBWwHmAf8BiQGSAe0B/wGIAZIB7AH/AUkBVQHi
- Af8BSAFTAeEB/wGfAakB8gH/AWUBcwHdAf8BWAFdAW4B5QMYASIIAAMYASIBbgFlAV4B5QH3AdIBqQL/
- AeQBygH/AeYBuQGOAf8B4gG0AYoB/wHfAbEBhwH/AdsBrAGGAf8B2QGrAYUB/wHYAasBhAH/AfUB0gG1
- Af8B7gHNAaEB/wFsAWUBXgHlAxgBIggAAVoCXQHKAZ0B1wHxAf8B5wH5Af0B/wGLAeUB+AH/AVAB2wH2
- Af8BUQHaAfQB/wEzAaEB1QH/ATMBoQHVAf8BSgHWAfIB/wFIAdgB9QH/AUYB1gH0Af8B2AH2AfwB/wGI
- Ab8B5QH/AVUCVgG0EAABGAGEASAB/wEQAYEBEAH/AZQBxgGcAf8BWgGtAYQB/wE5AZwBUgH/AVoBrQGE
- Af8BgQGlAYEB/wEQAVoBEAH/ARABWgEYAf8BEAFSARAB/wEQAVIBEAH/DAADRgF+AVYBaQHgAf8BpAGz
- AfcB/wFQAWQB6wH/AU8BYgHqAf8BTgFfAegJ/wFLAVgB5QH/AUoBVwHjAf8BSQFVAeIB/wGfAakB8gH/
- AUYBVwHRAf8BRQJGAX4IAANGAX4B5wG5AYYC/wHqAdAB/wHtAb4BlAH/AeoBuQGRAv8B8wHgC/8B+AH/
- AdwBrQGGAf8B2wGtAYYB/wH8Ad0BwQH/AdYBowF0Af8DRgF+CAADGgEkATIBlQG/AfsB8wH7Af4B/wHD
- AfIB+wH/AVIB3AH2Af8BUgHaAfQB/wFaAd8B9gH/AU0BywHrAf8BSwHWAfIB/wFKAdkB9QH/AZQB5wH4
- Af8B4wH0AfsB/wEnAXoBpgH5AxoBJAwAASABlAEoAf8BGAGMASAB/wGBAbUBhAH/ATkBnAFBAf8BgQG1
- AYwB/wE5AaUBWgH/ATkBnAFSAf8BWgGtAYQB/wEgAYEBKAH/ARABWgEQAf8BEAFaARgB/xAAAVoBXwFk
- AdsBjgGfAfAB/wGEAZkB9AH/AVIBaQHuAf8BUQFmAewB/wFQAWQB6wH/AZABnQHxAf8BpgGvAfMB/wFN
- AV0B5wH/AUwBWwHmAf8BSwFYAeUB/wFzAYkB6wH/AYUBkQHnAf8CWgFjAdsIAAFkAWEBXgHbAf8B5AHE
- Af8B/QHVAbEB/wHvAcABlAH/AesBvQGRAf8B6QG7AY8D/wH7Bf8B4wGzAYsB/wHhAbIBiwH/AeABsgGK
- Af8B7QHFAaAB/wH6AeABuwH/AWMBXwFeAdsMAANTAaoBjAHSAfAB/wHqAfsB/gH/AZQB5gH4Af8BUgHa
- AfQB/wE9AbEB3QH/ATMBoQHVAf8BTAHXAfIB/wFSAdsB9QH/Ad4B+AH9Af8BcwHAAecB/wFIAkkBhxAA
- ASABlAEoAf8BUgGtAVoB/wGBAb0BlAH/ATEBpQFJAf8BOQGcAUEB/wGBAbUBjAH/ATkBpQFaAf8BOQGc
- AVIB/wFaAa0BhAH/AVoBpQFaAf8BEAFaARgB/wEQAVoBGAH/BAABEAFSARAB/wQAAVcBYgGdAfYBoAGz
- AfcB/wFbAYAB8gH/AVUBbgHwAf8BUwFsAe8B/wFSAWkB7gH/AdMB2QH6Bf8BTwFiAeoB/wFOAV8B6AH/
- AU0BXQHnAf8BUwFiAecB/wGZAaUB8QH/AUcBSQGQAfYIAAGdAX0BXQH2Af8B7wHXAf8B+AHKAZ4B/wHt
- AcEBkwH/AewBvwGSAf8B7AG+AZED/wH8Bf8B5wG4AY4B/wHmAbcBjQH/AeYBtwGMAf8B5gG6AZEC/wHu
- AdIB/wGJAWIBXAH2DAADCQEMAVcBcwF+AewByAHqAfcB/wHmAfoB/QH/AVMB2gH0Af8BMwGhAdUB/wEz
- AaEB1QH/AU0B1wHyAf8BxwHzAfwB/wHAAeMB9AH/AVUBYwFrAeQDCQEMEAABIAGcASgB/wFBAa0BSQH/
- AVoBvQGMAf8BOQGlAVoB/wExAZwBSQH/ATkBpQFBAf8BhAG9AZwB/wFBAaUBWgH/ATkBnAFSAf8BhAG9
- AZwB/wEYAYEBGAH/ARABgQEYAf8BEAFaARgB/wEQAVoBEAH/BAABWwFiAaEB9gGhAbYB+AH/AV0BhAH0
- Af8BVgFyAfMB/wFVAXAB8QH/AVUBbgHwCf8BUQFmAewB/wFQAWQB6wH/AU8BYgHqAf8BVQFlAekB/wGb
- AagB8QH/AUgBSgGTAfYIAAGhAYEBYgH2Af8B8QHYAf8B+AHLAaIB/wH0AcUBmQH/Ae8BwgGUAf8B7QHA
- AZMJ/wHrAb4BkQH/AekBvAGQAf8B6gG8AZAB/wHrAcABlQL/Ae0B0wH/AY0BYgFcAfYQAAM3AVoBZwHI
- Ae0B/wH5Af4C/wFUAdwB9AH/ATQBogHVAf8BNAGiAdUB/wFSAdkB9AH/Ae0B+wH+Af8BXgG7AeUB/wM3
- AVoQAAEgAaUBKAH/ASABpQEoAf8BIAGcASgB/wGUAc4BrQH/AUkBtQGBAf8BQQGtAYEB/wExAZwBSQH/
- ATkBpQFBAf8BhAG9AZwB/wFBAaUBWgH/AYwBvQGcAf8BGAGBARgB/wEYAYEBGAH/ARABgQEYAf8IAAJf
- AWQB2wGRAaYB8wH/AYgBoQH4Af8BWAGAAfQB/wFXAXQB8wH/AVYBcgHzCf8BUwFsAe8B/wFSAWkB7gH/
- AVEBZgHsAf8BggGTAfEB/wGJAZgB7AH/AloBZAHbCAABZAFjAV8B2wH/AeQBxwL/AdsBuwH/AfcByAGd
- Af8B9QHGAZoB/wHzAcQBmQL/AecBywL/AecBygH/Ae0BwQGTAf8B7QHBAZMB/wHsAcABkwH/AfkB0wGt
- Av8B4gG/Af8BYwFfAV4B2xQAAVwCYAHUAakB3wH0Af8B7QH5Af0B/wE0AaMB1gH/ATQBowHWAf8B1AH1
- AfwB/wGiAdcB8QH/AVkCWwHDEAABKAGtASgB/wEgAaUBKAH/ASABpQEoAf8BKAGlASgB/wFBAa0BSQH/
- AYwBzgGlAf8BSQG1AYQB/wFBAa0BgQH/ATEBpQFJAf8BQQGtAUkB/wGcAc4BrQH/AYwBvQGUAf8BGAGE
- ARgB/wEQAUkBKAH/DAADRgF+AWIBgQHsAf8BqQG9AfsB/wFZAYIB9QH/AVgBgQH1Af8BWAGAAfQJ/wFV
- AXAB8QH/AVUBbgHwAf8BUwFsAe8B/wGlAbUB+AH/AVMBZgHdAf8BRQJGAX4IAANGAX4B9QHEAZAC/wHz
- AdwB/wH8Ac0BogH/AfgByAGfAf8B9wHGAZwJ/wHzAcYBmQH/AfMBxQGZAf8B9QHJAZ8C/wHoAc0B/wHh
- AbIBgwH/A0YBfhQAAyEBMAFAAa0BywH9AfkB/QL/AZQB6QH5Af8BngHrAfoB/wHsAfoB/gH/ASsBjAG+
- AfwDIQEwEAABKAG1ATEB/wEoAa0BKAH/CAABIAGlASgB/wEoAaUBKAH/AZQBzgGtAf8BUgG9AYQB/wFB
- Aa0BgQH/AUkBtQGBAf8BKAGUASgB/wEYAYwBIAH/AUEBpQFSAf8BEAFBATEB/wwAAxgBIgJlAXYB5QGD
- AZcB8AH/AakBvQH7Af8BWQGCAfUB/wFZAYIB9Qn/AVcBdAHzAf8BVgFyAfMB/wGmAbkB+QH/AXEBjQHq
- Af8BXgFkAXMB5QMYASIIAAMYASIBdgFsAWUB5QH/AdoBtAL/AfIB2wL/AdEBpQH/AfkBzQGhAv8B7AHQ
- Av8B6wHQAf8B+AHKAZ4B/wH5AcwBnwL/AeUBygH/AfgB1AGtAf8BbgFlAV4B5QMYASIYAAFVAlYBtAGU
- AdgB8gH/AfMB/AH+Af8B5wH6Af4B/wGPAdMB8AH/AU0CTgGWIAABKAGtASgB/wEgAa0BKAH/ASgBpQEo
- Af8BMQGtATkB/wGcAdYBrQH/AaUB1gG9Af8BhAHGAYwB/wEYAYwBGAH/ATkBtQFJAf8BnAHOAa0B/wEY
- AYwBIAH/ARgBhAEYAf8BGAGEASAB/wgAAzMBUwFlAWkBnAH0AYQBlwHxAf8BqQG9AfsB/wGKAaMB+AH/
- AWEBiQH2Af8BYQGJAfYB/wGJAaIB+AH/AagBvAH6Af8BdQGSAewB/wFSAWUBlgH0AzMBUxAAAzMBUwGc
- AYMBZQH0Af8B2gG0Av8B9QHgAv8B4gHFAv8B0wGtAv8B0QGqAv8B2wG5Av8B6gHTAf8B/AHWAa4B/wGS
- AXUBXQH0AzMBUxwAAw0BEgFNAYMBkgHyAfEB+gH9Af8B1QHvAfoB/wFTAXQBgAHtAw0BEiAAASgBtQEx
- Af8BKAGtASgB/wQAASgBrQEoAf8BIAGlASgB/wEoAaUBKAH/ASABpQEoAf8BgQHGAYEB/wGtAecBxgH/
- AUkBjAGBAf8BIAFSATkB/xQAAzMBUwFhAWYBdAHmAWQBgwHuAf8BkgGmAfQB/wGgAbQB+AH/AaABtAH4
- Af8BkQGmAfMB/wFeAXMB6QH/AVoBYQFzAeYDMwFTGAADMwFTAXQBbAFhAeYB+AHIAZIC/wHnAcgC/wHt
- AdYC/wHtAdYC/wHkAccB/wHwAb8BigH/AXMBagFhAeYDMwFTJAABTQJOAZUBhQHUAfEB/wGCAdEB8AH/
- Az0BaSQAASgBtQExAf8BKAG1ASgB/wgAASgBrQEoAf8BIAGlASgB/wExAYEBUgH/ASgBhAFBAf8BIAGc
- ASgB/wEoAYEBSQH/HAADGQEjA0UBfQJfAWYB2wFfAWwBmgHzAV8BawGZAfMCXwFkAdsDRQF9AxkBIyAA
- AxkBIwNFAX0BZgFjAV8B2wGZAYIBXwHzAZcBggFfAfMBZAFjAV8B2wNFAX0DGQEjKAADAgEDAVwCYAHU
- AVkCWwHDAwIBAyQAASgBvQExAf8MAAEoAbUBMQH/ASgBrQEoAf8BOQGMAVoB/wEoAaUBKAH/ASABpQEo
- Af/sAAEoAbUBMQH/ASgBtQEoAf8EAAEoAa0BKAH/ASABrQEoAf8QAAFCAU0BPgcAAT4DAAEoAwABQAMA
- ASADAAEBAQABAQYAAQEWAAP/gQAH/wGfAfABDwHwAQ8CAAH/AR8B4AEHAeABBwIAAfgBPwHAAQMBwAED
- AgAB8AEBAYABAQGAAQEBgAEBAeABAwGAAQEBgAEBAYABAQHAAQcBgAEBAYABAQHAAQMBwAECAYABAQGA
- AQEBwAEDAcABAAGAAQEBgAEBAeABBwGAAQEBgAEBAYABAQHwAQ8BAAEDAYABAQGAAQEB8AEPATABAwGA
- AQEBgAEBAfgBHwHgAQABwAEDAcABAwH4AR8B5AEDAeABBwHgAQcB/AE/AeYBBwHwAQ8B8AEPAfwBPwHu
- AQ8G/wH+AU8L
+ ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADq
+ EwAAAk1TRnQBSQFMAgEBBAEAASgBAQEoAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ AwABIAMAAQEBAAEgBgABIP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wAHAAEGAUgBDwH/
+ AQYBQAEGAf8kAAMZASMDRQF9AloBYQHbAkwBgwHzAUsBTAGCAfMCWgFhAdsDRQF9AxkBIyAAAxkBIwNF
+ AX0BYQFfAV4B2wGAAWYBXQHzAX4BZgFdAfMBYQFfAV4B2wNFAX0DGQEjEAADUQGiASIBpwHgAf8BIAGk
+ Ad8B/wEeAaEB3QH/ARwBngHcAf8BGgGbAdoB/wEYAZgB2QH/ARUBkwHWAf8BEAGMAdMB/wELAYUBzwH/
+ AQYBcwHMAf8BAgFsAckB/wEAAWYBxgH/AQABYQHDAf8BAAFdAcEB/wNRAaIgAAEPAVEBDwH/AQYBSAEP
+ Af8BBgFIAQ8B/yAAAzMBUwJYAWwB5gFHAVkB1AH/AYQBkAHnAf8BlQGgAe4B/wGVAZ8B7QH/AYMBjgHl
+ Af8BQQFSAc4B/wJYAWoB5gMzAVMYAAMzAVMBagFiAWEB5gHaAagBdAH/Af0B3wG7Av8B6wHOAv8B6wHO
+ Af8B+gHcAbgB/wHTAaIBbwH/AWkCYQHmAzMBUwwAAVgBZAFoAeMBvgHjAfUB/wH0AfwB/gH/Ae8B+wH+
+ Af8B7gH7Af4B/wHuAfsB/gH/Ae8B/AH+Af8B7wH8Af4B/wHvAfsB/gH/Ae4B+wH+Af8B7QH7Af4B/wHt
+ AfsB/gH/AewB+wH+Af8B8gH8Af4B/wGrAc4B6wH/AVoCXgHYFAABFwGBARcB/wEPAVkBFwH/AQ8BWQEP
+ Af8BDwFRAQ8B/wEPAVEBDwH/IAADMwFTAVABUgGLAfQBagGEAeMB/wGhAawB9AH/AXQBiwHsAf8BUQFc
+ AeQB/wFQAVsB4wH/AXIBhwHqAf8BnwGoAfEB/wFkAXEB3QH/AUIBUgGDAfQDMwFTEAADMwFTAYcBZQFS
+ AfQB8wHPAaUC/wHjAccB/wHrAcQBnwH/Ad4BsgGKAf8B3AGuAYgB/wHmAb4BmgH/AfkB2wG/Af8B7QHL
+ AZ8B/wF9AWUBXQH0AzMBUwgAAzABSwFXAb8B6AH/AfQB/AH+Af8BtQHvAfoB/wFNAdoB9QH/AU0B2gH1
+ Af8BTAHYAfMB/wFNAdcB8gH/AU0B1gHyAf8BTAHZAfQB/wFGAdgB9QH/AUMB1wH0Af8BVwHaAfYB/wHq
+ AfsB/gH/ATkBkwHSAf8DMAFLEAABFwGBARcB/wEXAYEBFwH/AVkBpQGBAf8BWQGlAYEB/wEXAYEBFwH/
+ AQ8BUQEPAf8BDwFZARcB/wEPAVEBDwH/AQYBSAEPAf8BBgFIAQ8B/wEGAUgBDwH/CAADGAEiAl4BbgHl
+ AW0BiAHmAf8BowGwAfUB/wFMAVwB5wH/AUsBWgHmAf8BiQGSAe0B/wGIAZIB7AH/AUgBVAHiAf8BRwFS
+ AeEB/wGfAakB8gH/AWQBcgHdAf8BWQFeAWwB5QMYASIIAAMYASIBbAFlAV4B5QH3AdIBqQL/AeQBygH/
+ AeYBuQGOAf8B4gG0AYoB/wHfAbEBhwH/AdsBrAGGAf8B2QGrAYUB/wHYAasBhAH/AfUB0gG1Af8B7gHN
+ AaEB/wFqAWUBXgHlAxgBIggAAVoCXQHKAZ0B1wHxAf8B5wH5Af0B/wGLAeUB+AH/AU8B2wH2Af8BUAHa
+ AfQB/wEyAaEB1QH/ATIBoQHVAf8BSQHWAfIB/wFHAdgB9QH/AUUB1gH0Af8B2AH2AfwB/wGIAb8B5QH/
+ AVUCVgG0EAABFwGEAR8B/wEPAYEBDwH/AZQBxgGcAf8BWQGtAYQB/wE4AZwBUQH/AVkBrQGEAf8BgQGl
+ AYEB/wEPAVkBDwH/AQ8BWQEXAf8BDwFRAQ8B/wEPAVEBDwH/DAADRgF+AVUBaAHgAf8BpAGzAfcB/wFP
+ AWMB6wH/AU4BYQHqAf8BTQFeAegJ/wFKAVcB5QH/AUkBVgHjAf8BSAFUAeIB/wGfAakB8gH/AUUBVgHR
+ Af8BRQJGAX4IAANGAX4B5wG5AYYC/wHqAdAB/wHtAb4BlAH/AeoBuQGRAv8B8wHgC/8B+AH/AdwBrQGG
+ Af8B2wGtAYYB/wH8Ad0BwQH/AdYBowFzAf8DRgF+CAADGgEkATIBlAG7AfsB8wH7Af4B/wHDAfIB+wH/
+ AVEB3AH2Af8BUQHaAfQB/wFZAd8B9gH/AUwBywHrAf8BSgHWAfIB/wFJAdkB9QH/AZQB5wH4Af8B4wH0
+ AfsB/wEoAXcBogH5AxoBJAwAAR8BlAEnAf8BFwGMAR8B/wGBAbUBhAH/ATgBnAFAAf8BgQG1AYwB/wE4
+ AaUBWQH/ATgBnAFRAf8BWQGtAYQB/wEfAYEBJwH/AQ8BWQEPAf8BDwFZARcB/xAAAVoBXwFjAdsBjgGf
+ AfAB/wGEAZkB9AH/AVEBaAHuAf8BUAFlAewB/wFPAWMB6wH/AZABnQHxAf8BpgGvAfMB/wFMAVwB5wH/
+ AUsBWgHmAf8BSgFXAeUB/wFyAYkB6wH/AYUBkQHnAf8CWgFhAdsIAAFjAV8BXgHbAf8B5AHEAf8B/QHV
+ AbEB/wHvAcABlAH/AesBvQGRAf8B6QG7AY8D/wH7Bf8B4wGzAYsB/wHhAbIBiwH/AeABsgGKAf8B7QHF
+ AaAB/wH6AeABuwH/AWEBXwFeAdsMAANTAaoBjAHSAfAB/wHqAfsB/gH/AZQB5gH4Af8BUQHaAfQB/wE8
+ AbEB3QH/ATIBoQHVAf8BSwHXAfIB/wFRAdsB9QH/Ad4B+AH9Af8BcgHAAecB/wFIAkkBhxAAAR8BlAEn
+ Af8BUQGtAVkB/wGBAb0BlAH/ATABpQFIAf8BOAGcAUAB/wGBAbUBjAH/ATgBpQFZAf8BOAGcAVEB/wFZ
+ Aa0BhAH/AVkBpQFZAf8BDwFZARcB/wEPAVkBFwH/BAABDwFRAQ8B/wQAAVcBYgGXAfYBoAGzAfcB/wFa
+ AYAB8gH/AVQBbQHwAf8BUgFrAe8B/wFRAWgB7gH/AdMB2QH6Bf8BTgFhAeoB/wFNAV4B6AH/AUwBXAHn
+ Af8BUgFhAecB/wGZAaUB8QH/AUgBSQGNAfYIAAGXAXsBXQH2Af8B7wHXAf8B+AHKAZ4B/wHtAcEBkwH/
+ AewBvwGSAf8B7AG+AZED/wH8Bf8B5wG4AY4B/wHmAbcBjQH/AeYBtwGMAf8B5gG6AZEC/wHuAdIB/wGF
+ AWIBXAH2DAADCQEMAVkBcAF7AewByAHqAfcB/wHmAfoB/QH/AVIB2gH0Af8BMgGhAdUB/wEyAaEB1QH/
+ AUwB1wHyAf8BxwHzAfwB/wHAAeMB9AH/AVYBYgFpAeQDCQEMEAABHwGcAScB/wFAAa0BSAH/AVkBvQGM
+ Af8BOAGlAVkB/wEwAZwBSAH/ATgBpQFAAf8BhAG9AZwB/wFAAaUBWQH/ATgBnAFRAf8BhAG9AZwB/wEX
+ AYEBFwH/AQ8BgQEXAf8BDwFZARcB/wEPAVkBDwH/BAABWwFiAZsB9gGhAbYB+AH/AVwBhAH0Af8BVQFx
+ AfMB/wFUAW8B8QH/AVQBbQHwCf8BUAFlAewB/wFPAWMB6wH/AU4BYQHqAf8BVAFkAekB/wGbAagB8QH/
+ AUgBSQGQAfYIAAGbAX0BYgH2Af8B8QHYAf8B+AHLAaIB/wH0AcUBmQH/Ae8BwgGUAf8B7QHAAZMJ/wHr
+ Ab4BkQH/AekBvAGQAf8B6gG8AZAB/wHrAcABlQL/Ae0B0wH/AYkBYgFcAfYQAAM3AVoBZgHIAe0B/wH5
+ Af4C/wFTAdwB9AH/ATMBogHVAf8BMwGiAdUB/wFRAdkB9AH/Ae0B+wH+Af8BXQG7AeUB/wM3AVoQAAEf
+ AaUBJwH/AR8BpQEnAf8BHwGcAScB/wGUAc4BrQH/AUgBtQGBAf8BQAGtAYEB/wEwAZwBSAH/ATgBpQFA
+ Af8BhAG9AZwB/wFAAaUBWQH/AYwBvQGcAf8BFwGBARcB/wEXAYEBFwH/AQ8BgQEXAf8IAAJfAWMB2wGR
+ AaYB8wH/AYgBoQH4Af8BVwGAAfQB/wFWAXMB8wH/AVUBcQHzCf8BUgFrAe8B/wFRAWgB7gH/AVABZQHs
+ Af8BggGTAfEB/wGJAZgB7AH/AloBYwHbCAABYwFhAV8B2wH/AeQBxwL/AdsBuwH/AfcByAGdAf8B9QHG
+ AZoB/wHzAcQBmQL/AecBywL/AecBygH/Ae0BwQGTAf8B7QHBAZMB/wHsAcABkwH/AfkB0wGtAv8B4gG/
+ Af8BYQFfAV4B2xQAAVwCYAHUAakB3wH0Af8B7QH5Af0B/wEzAaMB1gH/ATMBowHWAf8B1AH1AfwB/wGi
+ AdcB8QH/AVkCWwHDEAABJwGtAScB/wEfAaUBJwH/AR8BpQEnAf8BJwGlAScB/wFAAa0BSAH/AYwBzgGl
+ Af8BSAG1AYQB/wFAAa0BgQH/ATABpQFIAf8BQAGtAUgB/wGcAc4BrQH/AYwBvQGUAf8BFwGEARcB/wEP
+ AUgBJwH/DAADRgF+AWEBgQHsAf8BqQG9AfsB/wFYAYIB9QH/AVcBgQH1Af8BVwGAAfQJ/wFUAW8B8QH/
+ AVQBbQHwAf8BUgFrAe8B/wGlAbUB+AH/AVIBZQHdAf8BRQJGAX4IAANGAX4B9QHEAZAC/wHzAdwB/wH8
+ Ac0BogH/AfgByAGfAf8B9wHGAZwJ/wHzAcYBmQH/AfMBxQGZAf8B9QHJAZ8C/wHoAc0B/wHhAbIBgwH/
+ A0YBfhQAAyEBMAFAAawByAH9AfkB/QL/AZQB6QH5Af8BngHrAfoB/wHsAfoB/gH/ASsBiQG8AfwDIQEw
+ EAABJwG1ATAB/wEnAa0BJwH/CAABHwGlAScB/wEnAaUBJwH/AZQBzgGtAf8BUQG9AYQB/wFAAa0BgQH/
+ AUgBtQGBAf8BJwGUAScB/wEXAYwBHwH/AUABpQFRAf8BDwFAATAB/wwAAxgBIgJlAXMB5QGDAZcB8AH/
+ AakBvQH7Af8BWAGCAfUB/wFYAYIB9Qn/AVYBcwHzAf8BVQFxAfMB/wGmAbkB+QH/AXABjQHqAf8BXgFk
+ AW4B5QMYASIIAAMYASIBcwFqAWUB5QH/AdoBtAL/AfIB2wL/AdEBpQH/AfkBzQGhAv8B7AHQAv8B6wHQ
+ Af8B+AHKAZ4B/wH5AcwBnwL/AeUBygH/AfgB1AGtAf8BbAFlAV4B5QMYASIYAAFVAlYBtAGUAdgB8gH/
+ AfMB/AH+Af8B5wH6Af4B/wGPAdMB8AH/AU0CTgGWIAABJwGtAScB/wEfAa0BJwH/AScBpQEnAf8BMAGt
+ ATgB/wGcAdYBrQH/AaUB1gG9Af8BhAHGAYwB/wEXAYwBFwH/ATgBtQFIAf8BnAHOAa0B/wEXAYwBHwH/
+ ARcBhAEXAf8BFwGEAR8B/wgAAzMBUwFlAWcBlgH0AYQBlwHxAf8BqQG9AfsB/wGKAaMB+AH/AWABiQH2
+ Af8BYAGJAfYB/wGJAaIB+AH/AagBvAH6Af8BdAGSAewB/wFSAWUBkgH0AzMBUxAAAzMBUwGWAX8BZQH0
+ Af8B2gG0Av8B9QHgAv8B4gHFAv8B0wGtAv8B0QGqAv8B2wG5Av8B6gHTAf8B/AHWAa4B/wGOAXMBXQH0
+ AzMBUxwAAw0BEgFOAX8BjgHyAfEB+gH9Af8B1QHvAfoB/wFUAXEBfAHtAw0BEiAAAScBtQEwAf8BJwGt
+ AScB/wQAAScBrQEnAf8BHwGlAScB/wEnAaUBJwH/AR8BpQEnAf8BgQHGAYEB/wGtAecBxgH/AUgBjAGB
+ Af8BHwFRATgB/xQAAzMBUwFhAWQBcQHmAWMBgwHuAf8BkgGmAfQB/wGgAbQB+AH/AaABtAH4Af8BkQGm
+ AfMB/wFdAXIB6QH/AVoBYQFwAeYDMwFTGAADMwFTAXEBagFhAeYB+AHIAZIC/wHnAcgC/wHtAdYC/wHt
+ AdYC/wHkAccB/wHwAb8BigH/AXABaQFhAeYDMwFTJAABTQJOAZUBhQHUAfEB/wGCAdEB8AH/Az0BaSQA
+ AScBtQEwAf8BJwG1AScB/wgAAScBrQEnAf8BHwGlAScB/wEwAYEBUQH/AScBhAFAAf8BHwGcAScB/wEn
+ AYEBSAH/HAADGQEjA0UBfQJfAWQB2wFfAWsBlQHzAV8BagGVAfMCXwFjAdsDRQF9AxkBIyAAAxkBIwNF
+ AX0BZAFhAV8B2wGVAYABXwHzAZMBgAFfAfMBYwFhAV8B2wNFAX0DGQEjKAADAgEDAVwCYAHUAVkCWwHD
+ AwIBAyQAAScBvQEwAf8MAAEnAbUBMAH/AScBrQEnAf8BOAGMAVkB/wEnAaUBJwH/AR8BpQEnAf/sAAEn
+ AbUBMAH/AScBtQEnAf8EAAEnAa0BJwH/AR8BrQEnAf8QAAFCAU0BPgcAAT4DAAEoAwABQAMAASADAAEB
+ AQABAQYAAQEWAAP/gQAH/wGfAfABDwHwAQ8CAAH/AR8B4AEHAeABBwIAAfgBPwHAAQMBwAEDAgAB8AEB
+ AYABAQGAAQEBgAEBAeABAwGAAQEBgAEBAYABAQHAAQcBgAEBAYABAQHAAQMBwAECAYABAQGAAQEBwAED
+ AcABAAGAAQEBgAEBAeABBwGAAQEBgAEBAYABAQHwAQ8BAAEDAYABAQGAAQEB8AEPATABAwGAAQEBgAEB
+ AfgBHwHgAQABwAEDAcABAwH4AR8B5AEDAeABBwHgAQcB/AE/AeYBBwHwAQ8B8AEPAfwBPwHuAQ8G/wH+
+ AU8L
@@ -303,7 +303,7 @@
0, 0
- 809, 25
+ 647, 25
@@ -342,6 +342,15 @@
Bericht
+
+ True
+
+
+ fullMessageColumn
+
+
+ False
+
401, 17
@@ -358,7 +367,7 @@
2, 2, 2, 2
- 809, 427
+ 647, 337
6
@@ -379,7 +388,7 @@
True
- 120, 120
+ 96, 96
True
@@ -388,7 +397,7 @@
2, 2, 2, 2
- 809, 452
+ 647, 362
buttonCopy
@@ -480,6 +489,12 @@
System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ fullMessageColumn
+
+
+ System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
levelColumnDataGridViewTextBoxColumn
@@ -498,6 +513,12 @@
System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ fullMessageColumnDataGridViewTextBoxColumn
+
+
+ System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
MessageWindow
Index: Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindowDialog.resx
===================================================================
diff -u -r67310775408a8134a9c69d777178080243b4efa4 -r085024022df9a3f1ebe84c45503dc6e9275860d0
--- Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindowDialog.resx (.../MessageWindowDialog.resx) (revision 67310775408a8134a9c69d777178080243b4efa4)
+++ Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindowDialog.resx (.../MessageWindowDialog.resx) (revision 085024022df9a3f1ebe84c45503dc6e9275860d0)
@@ -122,6 +122,9 @@
Top, Bottom, Left, Right
+
+ Courier New, 8.25pt
+
12, 12
@@ -133,7 +136,7 @@
Both
- 500, 238
+ 700, 238
0
@@ -178,7 +181,7 @@
6, 13
- 524, 262
+ 724, 262
Berichtdetails
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/HydraRingOutputFileParser.cs
===================================================================
diff -u -r69ba8c3394d749398c3f07bd925d805225d7c672 -r085024022df9a3f1ebe84c45503dc6e9275860d0
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/HydraRingOutputFileParser.cs (.../HydraRingOutputFileParser.cs) (revision 69ba8c3394d749398c3f07bd925d805225d7c672)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/HydraRingOutputFileParser.cs (.../HydraRingOutputFileParser.cs) (revision 085024022df9a3f1ebe84c45503dc6e9275860d0)
@@ -54,7 +54,7 @@
}
catch
{
- log.ErrorFormat(Resources.Parse_Cannot_read_file_0_from_folder_1_, outputFileName, workingDirectory);
+ log.ErrorFormat(Resources.Parse_Cannot_read_file_0_nor_file_1_from_folder_2_, sectionId + "-output.txt", outputFileName, workingDirectory);
}
}
}
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Properties/Resources.Designer.cs
===================================================================
diff -u -r69ba8c3394d749398c3f07bd925d805225d7c672 -r085024022df9a3f1ebe84c45503dc6e9275860d0
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 69ba8c3394d749398c3f07bd925d805225d7c672)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 085024022df9a3f1ebe84c45503dc6e9275860d0)
@@ -138,11 +138,11 @@
}
///
- /// Looks up a localized string similar to Kan het Hydra-Ring uitvoerbestand {0} niet lezen uit de map {1}..
+ /// Looks up a localized string similar to Kan het Hydra-Ring uitvoerbestand {0} noch het logbestand {1} lezen uit de map {2}..
///
- internal static string Parse_Cannot_read_file_0_from_folder_1_ {
+ internal static string Parse_Cannot_read_file_0_nor_file_1_from_folder_2_ {
get {
- return ResourceManager.GetString("Parse_Cannot_read_file_0_from_folder_1_", resourceCulture);
+ return ResourceManager.GetString("Parse_Cannot_read_file_0_nor_file_1_from_folder_2_", resourceCulture);
}
}
}
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Properties/Resources.resx
===================================================================
diff -u -r69ba8c3394d749398c3f07bd925d805225d7c672 -r085024022df9a3f1ebe84c45503dc6e9275860d0
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Properties/Resources.resx (.../Resources.resx) (revision 69ba8c3394d749398c3f07bd925d805225d7c672)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Properties/Resources.resx (.../Resources.resx) (revision 085024022df9a3f1ebe84c45503dc6e9275860d0)
@@ -117,8 +117,8 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Kan het Hydra-Ring uitvoerbestand {0} niet lezen uit de map {1}.
+
+ Kan het Hydra-Ring uitvoerbestand {0} noch het logbestand {1} lezen uit de map {2}.
Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/HydraRingOutputFileParserTest.cs
===================================================================
diff -u -r69ba8c3394d749398c3f07bd925d805225d7c672 -r085024022df9a3f1ebe84c45503dc6e9275860d0
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/HydraRingOutputFileParserTest.cs (.../HydraRingOutputFileParserTest.cs) (revision 69ba8c3394d749398c3f07bd925d805225d7c672)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/HydraRingOutputFileParserTest.cs (.../HydraRingOutputFileParserTest.cs) (revision 085024022df9a3f1ebe84c45503dc6e9275860d0)
@@ -55,31 +55,41 @@
Action call = () => outputFileParser.Parse(nonExistentDirectory, 1);
// Assert
- var expectedMessage = string.Format("Kan het Hydra-Ring uitvoerbestand {0} niet lezen uit de map {1}.", outputFileNameOnError, nonExistentDirectory);
+ var expectedMessage = string.Format("Kan het Hydra-Ring uitvoerbestand {0} noch het logbestand {1} lezen uit de map {2}.",
+ "1-output.txt", outputFileNameOnError, nonExistentDirectory);
TestHelper.AssertLogMessageIsGenerated(call, expectedMessage);
}
[Test]
- public void Parse_NotExistingOutputFile_LogError()
+ public void Parse_NotExistingOutputFiles_LogError()
{
// Setup
var outputFileParser = new HydraRingOutputFileParser();
- var outputFileName = "1234567890-output.txt";
// Call
Action call = () => outputFileParser.Parse(testDataDirectory, 1234567890);
// Assert
var outputFileNameOnError = "1234567890.log";
- var expectedMessage = string.Format("Kan het Hydra-Ring uitvoerbestand {0} niet lezen uit de map {1}.", new[]
- {
- outputFileNameOnError,
- testDataDirectory
- });
+ var expectedMessage = string.Format("Kan het Hydra-Ring uitvoerbestand {0} noch het logbestand {1} lezen uit de map {2}.",
+ "1234567890-output.txt", outputFileNameOnError, testDataDirectory);
TestHelper.AssertLogMessageIsGenerated(call, expectedMessage);
}
[Test]
+ public void Parse_NotExistingOutputFile_ReadLogFile()
+ {
+ // Setup
+ var outputFileParser = new HydraRingOutputFileParser();
+
+ // Call
+ outputFileParser.Parse(testDataDirectory, 123);
+
+ // Assert
+ Assert.AreEqual("Dit is het log bestand, niet het output bestand.", outputFileParser.OutputFileContent);
+ }
+
+ [Test]
public void Parse_ValidOutputFile_LogInfo()
{
// Setup
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/OutputFileParser/123.log
===================================================================
diff -u
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/OutputFileParser/123.log (revision 0)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/OutputFileParser/123.log (revision 085024022df9a3f1ebe84c45503dc6e9275860d0)
@@ -0,0 +1 @@
+Dit is het log bestand, niet het output bestand.
\ No newline at end of file