Skip to content

Commit c394159

Browse files
kovacsvkovacsv
committed
Move visual tests to separate files.
1 parent a25e798 commit c394159

4 files changed

Lines changed: 226 additions & 212 deletions

File tree

‎Sources/NodeEngineTest/NodeEditorVisualTest.cpp‎

Lines changed: 0 additions & 211 deletions
Original file line numberDiff line numberDiff line change
@@ -136,126 +136,6 @@ TEST (MoveCopyNodesTest)
136136
}
137137
}
138138

139-
TEST (SlotConnectionTest)
140-
{
141-
SimpleNodeEditorTestEnv env (GetDefaultSkinParams ());
142-
143-
Point doubleOutputSlotPosition = env.doubleUpDownNode->GetOutputSlotRect (env.uiEnvironment, SlotId ("out")).GetCenter ();
144-
Point rangeOutputSlotPosition = env.rangeInputNode->GetOutputSlotRect (env.uiEnvironment, SlotId ("out")).GetCenter ();
145-
Rect viewer1InputSlotRect = env.viewerUINode1->GetInputSlotRect (env.uiEnvironment, SlotId ("in"));
146-
Point viewer1InputSlotPosition = viewer1InputSlotRect.GetCenter ();
147-
Point viewer2InputSlotPosition = env.viewerUINode2->GetInputSlotRect (env.uiEnvironment, SlotId ("in")).GetCenter ();
148-
Point rangeStartInputSlotPosition = env.rangeInputNode->GetInputSlotRect (env.uiEnvironment, SlotId ("start")).GetCenter ();
149-
150-
ASSERT (env.CheckReference (L"SlotConnection_Basic.svg"));
151-
152-
{ // start connecting double output slot without target
153-
Point targetPosition = doubleOutputSlotPosition + Point (200.0, -100.0);
154-
env.DragDrop (doubleOutputSlotPosition, targetPosition, [&] () {
155-
ASSERT (env.CheckReference (L"SlotConnection_DraggingDoubleOutput.svg"));
156-
});
157-
ASSERT (env.CheckReference (L"SlotConnection_Basic.svg"));
158-
}
159-
160-
{ // start connecting viewer1 input slot without target
161-
Point targetPosition = viewer1InputSlotPosition - Point (200.0, -100.0);
162-
env.DragDrop (viewer1InputSlotPosition, targetPosition, [&] () {
163-
ASSERT (env.CheckReference (L"SlotConnection_DraggingViewer1Input.svg"));
164-
});
165-
ASSERT (env.CheckReference (L"SlotConnection_Basic.svg"));
166-
}
167-
168-
{ // connect double output slot to viewer1 input slot
169-
Point targetPos = viewer1InputSlotRect.GetLeftCenter () - Point (5.0, 0.0);
170-
env.DragDrop (doubleOutputSlotPosition, targetPos, [&] () {
171-
ASSERT (env.CheckReference (L"SlotConnection_ConnectingDoubleToViewer1.svg"));
172-
});
173-
ASSERT (env.CheckReference (L"SlotConnection_DoubleConnectedToViewer1.svg"));
174-
}
175-
176-
{ // start connecting double output slot without target again
177-
Point targetPosition = doubleOutputSlotPosition + Point (200.0, -100.0);
178-
env.DragDrop (doubleOutputSlotPosition, targetPosition, [&] () {
179-
ASSERT (env.CheckReference (L"SlotConnection_DraggingConnectedViewer1Input.svg"));
180-
});
181-
ASSERT (env.CheckReference (L"SlotConnection_DoubleConnectedToViewer1.svg"));
182-
}
183-
184-
{ // connect viewer2 input slot to range output slot
185-
env.DragDrop (viewer2InputSlotPosition, rangeOutputSlotPosition, [&] () {
186-
ASSERT (env.CheckReference (L"SlotConnection_ConnectingViewer2ToRange.svg"));
187-
});
188-
ASSERT (env.CheckReference (L"SlotConnection_AllViewersConnected.svg"));
189-
}
190-
191-
{ // connect double output slot to range start slot
192-
env.DragDrop (doubleOutputSlotPosition, rangeStartInputSlotPosition);
193-
ASSERT (env.CheckReference (L"SlotConnection_AllConnected.svg"));
194-
}
195-
196-
viewer2InputSlotPosition = env.viewerUINode2->GetInputSlotRect (env.uiEnvironment, SlotId ("in")).GetCenter ();
197-
{ // connect double output slot to viewer2 input slot
198-
env.DragDrop (doubleOutputSlotPosition, viewer2InputSlotPosition, [&] () {
199-
ASSERT (env.CheckReference (L"SlotConnection_ConnectingDoubleToViewer2.svg"));
200-
});
201-
ASSERT (env.CheckReference (L"SlotConnection_DoubleToViewer2Connected.svg"));
202-
}
203-
}
204-
205-
TEST (PanAndZoomTest)
206-
{
207-
SimpleNodeEditorTestEnv env (GetDefaultSkinParams ());
208-
ASSERT (env.CheckReference (L"PanAndZoom_Basic.svg"));
209-
210-
Point doubleOutputSlotPosition = env.doubleUpDownNode->GetOutputSlotRect (env.uiEnvironment, SlotId ("out")).GetCenter ();
211-
Point rangeStartInputSlotPosition = env.rangeInputNode->GetInputSlotRect (env.uiEnvironment, SlotId ("start")).GetCenter ();
212-
Point rangeOutputSlotPosition = env.rangeInputNode->GetOutputSlotRect (env.uiEnvironment, SlotId ("out")).GetCenter ();
213-
Point viewer2InputSlotPosition = env.viewerUINode2->GetInputSlotRect (env.uiEnvironment, SlotId ("in")).GetCenter ();
214-
{
215-
env.DragDrop (doubleOutputSlotPosition, rangeStartInputSlotPosition);
216-
env.DragDrop (rangeOutputSlotPosition, viewer2InputSlotPosition);
217-
ASSERT (env.CheckReference (L"PanAndZoom_Connections.svg"));
218-
}
219-
220-
Point panStartPoint = env.rangeInputNode->GetRect (env.uiEnvironment).GetTopLeft ();
221-
Point panEndPoint = panStartPoint + Point (50.0, -50.0);
222-
223-
{
224-
env.nodeEditor.OnMouseDown (EmptyModifierKeys, MouseButton::Right, (int) panStartPoint.GetX (), (int) panStartPoint.GetY ());
225-
env.nodeEditor.OnMouseMove (EmptyModifierKeys, (int) panEndPoint.GetX (), (int) panEndPoint.GetY ());
226-
env.nodeEditor.OnMouseUp (EmptyModifierKeys, MouseButton::Right, (int) panEndPoint.GetX (), (int) panEndPoint.GetY ());
227-
ASSERT (env.CheckReference (L"PanAndZoom_Panned.svg"));
228-
}
229-
230-
for (size_t i = 0; i < 5; i++) {
231-
env.nodeEditor.OnMouseWheel (EmptyModifierKeys, MouseWheelRotation::Forward, (int) panEndPoint.GetX (), (int) panEndPoint.GetY ());
232-
}
233-
ASSERT (env.CheckReference (L"PanAndZoom_ZoomedIn.svg"));
234-
235-
for (size_t i = 0; i < 10; i++) {
236-
env.nodeEditor.OnMouseWheel (EmptyModifierKeys, MouseWheelRotation::Forward, (int) panEndPoint.GetX (), (int) panEndPoint.GetY ());
237-
}
238-
ASSERT (env.CheckReference (L"PanAndZoom_ZoomedIn2.svg"));
239-
240-
for (size_t i = 0; i < 20; i++) {
241-
env.nodeEditor.OnMouseWheel (EmptyModifierKeys, MouseWheelRotation::Backward, (int) panEndPoint.GetX (), (int) panEndPoint.GetY ());
242-
}
243-
ASSERT (env.CheckReference (L"PanAndZoom_ZoomedOut.svg"));
244-
245-
for (size_t i = 0; i < 10; i++) {
246-
env.nodeEditor.OnMouseWheel (EmptyModifierKeys, MouseWheelRotation::Backward, (int) panEndPoint.GetX (), (int) panEndPoint.GetY ());
247-
}
248-
ASSERT (env.CheckReference (L"PanAndZoom_ZoomedOut2.svg"));
249-
}
250-
251-
TEST (SwipeTest)
252-
{
253-
SimpleNodeEditorTestEnv env (GetDefaultSkinParams ());
254-
ASSERT (env.CheckReference (L"Swipe_Basic.svg"));
255-
env.nodeEditor.OnMouseSwipe (EmptyModifierKeys, 10, 100);
256-
ASSERT (env.CheckReference (L"Swipe_AfterSwipe.svg"));
257-
}
258-
259139
TEST (DeleteNodeTest)
260140
{
261141
SimpleNodeEditorTestEnvWithConnections env (GetDefaultSkinParams ());
@@ -315,42 +195,6 @@ TEST (NodeGroupingTest)
315195
}
316196
}
317197

318-
TEST (InputSlotReconnectionTest)
319-
{
320-
SimpleNodeEditorTestEnvWithConnections env (GetDefaultSkinParams ());
321-
ASSERT (env.CheckReference (L"InputSlotReconnection_Basic.svg"));
322-
323-
env.CtrlDragDrop (env.viewer1InputSlotRect.GetCenter (), env.viewer2InputSlotRect.GetCenter (), [&] () {
324-
ASSERT (env.CheckReference (L"InputSlotReconnection_DuringConnection.svg"));
325-
});
326-
327-
ASSERT (env.CheckReference (L"InputSlotReconnection_Reconnected.svg"));
328-
329-
env.nodeEditor.Undo ();
330-
ASSERT (env.CheckReference (L"InputSlotReconnection_AfterUndo.svg"));
331-
332-
env.CtrlDragDrop (env.viewer1InputSlotRect.GetCenter (), Point (0.0, 0.0));
333-
ASSERT (env.CheckReference (L"InputSlotReconnection_AfterDisconnect.svg"));
334-
}
335-
336-
TEST (OutputSlotReconnectionTest)
337-
{
338-
SimpleNodeEditorTestEnvWithConnections env (GetDefaultSkinParams ());
339-
ASSERT (env.CheckReference (L"OutputSlotReconnection_Basic.svg"));
340-
341-
env.CtrlDragDrop (env.rangeOutputSlotSRect.GetCenter (), env.doubleUpDownOutputSlotRect.GetCenter (), [&] () {
342-
ASSERT (env.CheckReference (L"OutputSlotReconnection_DuringConnection.svg"));
343-
});
344-
345-
ASSERT (env.CheckReference (L"OutputSlotReconnection_Reconnected.svg"));
346-
347-
env.nodeEditor.Undo ();
348-
ASSERT (env.CheckReference (L"OutputSlotReconnection_AfterUndo.svg"));
349-
350-
env.CtrlDragDrop (env.rangeOutputSlotSRect.GetCenter (), Point (0.0, 0.0));
351-
ASSERT (env.CheckReference (L"OutputSlotReconnection_AfterDisconnect.svg"));
352-
}
353-
354198
TEST (UndoTest)
355199
{
356200
NodeEditorTestEnv env (GetDefaultSkinParams ());
@@ -445,61 +289,6 @@ TEST (ManualUpdateTestUndo)
445289
ASSERT (env.CheckReference (L"ManualUpdateTestUndo_ManualUpdateAfterUndo.svg"));
446290
}
447291

448-
TEST (FitToWindowTest)
449-
{
450-
SimpleNodeEditorTestEnvWithConnections env (GetDefaultSkinParams ());
451-
ASSERT (env.CheckReference (L"FitToWindow_Basic.svg"));
452-
env.nodeEditor.FitToWindow ();
453-
ASSERT (env.CheckReference (L"FitToWindow_Fit.svg"));
454-
}
455-
456-
TEST (AlignToWindowTest)
457-
{
458-
SimpleNodeEditorTestEnvWithConnections env (GetDefaultSkinParams ());
459-
ASSERT (env.CheckReference (L"AlignToWindow_Basic.svg"));
460-
env.nodeEditor.AlignToWindow ();
461-
ASSERT (env.CheckReference (L"AlignToWindow_Align.svg"));
462-
}
463-
464-
TEST (AlignToWindowTestWithScale)
465-
{
466-
SimpleNodeEditorTestEnvWithConnections env (GetDefaultSkinParams ());
467-
env.uiEnvironment.SetWindowScale (1.5);
468-
ASSERT (env.CheckReference (L"AlignToWindowWithScale_Basic.svg"));
469-
env.nodeEditor.AlignToWindow ();
470-
ASSERT (env.CheckReference (L"AlignToWindowWithScale_Align.svg"));
471-
}
472-
473-
TEST (CenterToWindowTest)
474-
{
475-
SimpleNodeEditorTestEnvWithConnections env (GetDefaultSkinParams ());
476-
ASSERT (env.CheckReference (L"CenterToWindow_Basic.svg"));
477-
env.nodeEditor.CenterToWindow ();
478-
ASSERT (env.CheckReference (L"CenterToWindow_Align.svg"));
479-
}
480-
481-
TEST (CenterToWindowTestWithScale)
482-
{
483-
SimpleNodeEditorTestEnvWithConnections env (GetDefaultSkinParams ());
484-
env.uiEnvironment.SetWindowScale (1.5);
485-
ASSERT (env.CheckReference (L"CenterToWindowWithScale_Basic.svg"));
486-
env.nodeEditor.CenterToWindow ();
487-
ASSERT (env.CheckReference (L"CenterToWindowWithScale_Align.svg"));
488-
}
489-
490-
TEST (GroupSelectedNodesTest)
491-
{
492-
SimpleNodeEditorTestEnvWithConnections env (GetDefaultSkinParams ());
493-
ASSERT (env.CheckReference (L"GroupSelectedNodes_Basic.svg"));
494-
env.Click (env.rangeInputHeaderPoint);
495-
496-
env.nodeEditor.ExecuteCommand (NUIE::CommandCode::Group);
497-
ASSERT (env.CheckReference (L"GroupSelectedNodes_AfterGroup.svg"));
498-
499-
env.nodeEditor.ExecuteCommand (NUIE::CommandCode::Ungroup);
500-
ASSERT (env.CheckReference (L"GroupSelectedNodes_AfterUngroup.svg"));
501-
}
502-
503292
TEST (SkinParamsTest)
504293
{
505294
BasicSkinParams skinParams (

Sources/NodeEngineTest/NodeEditorVisualTestReconnection.cpp renamed to Sources/NodeEngineTest/NodeEditorVisualTestConnection.cpp

Lines changed: 103 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ using namespace NE;
88
using namespace NUIE;
99
using namespace BI;
1010

11-
namespace NodeEditorVisualTestReconnection
11+
namespace NodeEditorVisualTestConnection
1212
{
1313

1414
class ReconnectionTestEnv : public NodeEditorTestEnv
@@ -67,6 +67,108 @@ class ReconnectionTestEnv : public NodeEditorTestEnv
6767
Point listBuilder2OutputSlotPosition;
6868
};
6969

70+
TEST (SlotConnectionTest)
71+
{
72+
SimpleNodeEditorTestEnv env (GetDefaultSkinParams ());
73+
74+
Point doubleOutputSlotPosition = env.doubleUpDownNode->GetOutputSlotRect (env.uiEnvironment, SlotId ("out")).GetCenter ();
75+
Point rangeOutputSlotPosition = env.rangeInputNode->GetOutputSlotRect (env.uiEnvironment, SlotId ("out")).GetCenter ();
76+
Rect viewer1InputSlotRect = env.viewerUINode1->GetInputSlotRect (env.uiEnvironment, SlotId ("in"));
77+
Point viewer1InputSlotPosition = viewer1InputSlotRect.GetCenter ();
78+
Point viewer2InputSlotPosition = env.viewerUINode2->GetInputSlotRect (env.uiEnvironment, SlotId ("in")).GetCenter ();
79+
Point rangeStartInputSlotPosition = env.rangeInputNode->GetInputSlotRect (env.uiEnvironment, SlotId ("start")).GetCenter ();
80+
81+
ASSERT (env.CheckReference (L"SlotConnection_Basic.svg"));
82+
83+
{ // start connecting double output slot without target
84+
Point targetPosition = doubleOutputSlotPosition + Point (200.0, -100.0);
85+
env.DragDrop (doubleOutputSlotPosition, targetPosition, [&] () {
86+
ASSERT (env.CheckReference (L"SlotConnection_DraggingDoubleOutput.svg"));
87+
});
88+
ASSERT (env.CheckReference (L"SlotConnection_Basic.svg"));
89+
}
90+
91+
{ // start connecting viewer1 input slot without target
92+
Point targetPosition = viewer1InputSlotPosition - Point (200.0, -100.0);
93+
env.DragDrop (viewer1InputSlotPosition, targetPosition, [&] () {
94+
ASSERT (env.CheckReference (L"SlotConnection_DraggingViewer1Input.svg"));
95+
});
96+
ASSERT (env.CheckReference (L"SlotConnection_Basic.svg"));
97+
}
98+
99+
{ // connect double output slot to viewer1 input slot
100+
Point targetPos = viewer1InputSlotRect.GetLeftCenter () - Point (5.0, 0.0);
101+
env.DragDrop (doubleOutputSlotPosition, targetPos, [&] () {
102+
ASSERT (env.CheckReference (L"SlotConnection_ConnectingDoubleToViewer1.svg"));
103+
});
104+
ASSERT (env.CheckReference (L"SlotConnection_DoubleConnectedToViewer1.svg"));
105+
}
106+
107+
{ // start connecting double output slot without target again
108+
Point targetPosition = doubleOutputSlotPosition + Point (200.0, -100.0);
109+
env.DragDrop (doubleOutputSlotPosition, targetPosition, [&] () {
110+
ASSERT (env.CheckReference (L"SlotConnection_DraggingConnectedViewer1Input.svg"));
111+
});
112+
ASSERT (env.CheckReference (L"SlotConnection_DoubleConnectedToViewer1.svg"));
113+
}
114+
115+
{ // connect viewer2 input slot to range output slot
116+
env.DragDrop (viewer2InputSlotPosition, rangeOutputSlotPosition, [&] () {
117+
ASSERT (env.CheckReference (L"SlotConnection_ConnectingViewer2ToRange.svg"));
118+
});
119+
ASSERT (env.CheckReference (L"SlotConnection_AllViewersConnected.svg"));
120+
}
121+
122+
{ // connect double output slot to range start slot
123+
env.DragDrop (doubleOutputSlotPosition, rangeStartInputSlotPosition);
124+
ASSERT (env.CheckReference (L"SlotConnection_AllConnected.svg"));
125+
}
126+
127+
viewer2InputSlotPosition = env.viewerUINode2->GetInputSlotRect (env.uiEnvironment, SlotId ("in")).GetCenter ();
128+
{ // connect double output slot to viewer2 input slot
129+
env.DragDrop (doubleOutputSlotPosition, viewer2InputSlotPosition, [&] () {
130+
ASSERT (env.CheckReference (L"SlotConnection_ConnectingDoubleToViewer2.svg"));
131+
});
132+
ASSERT (env.CheckReference (L"SlotConnection_DoubleToViewer2Connected.svg"));
133+
}
134+
}
135+
136+
TEST (InputSlotReconnectionTest)
137+
{
138+
SimpleNodeEditorTestEnvWithConnections env (GetDefaultSkinParams ());
139+
ASSERT (env.CheckReference (L"InputSlotReconnection_Basic.svg"));
140+
141+
env.CtrlDragDrop (env.viewer1InputSlotRect.GetCenter (), env.viewer2InputSlotRect.GetCenter (), [&] () {
142+
ASSERT (env.CheckReference (L"InputSlotReconnection_DuringConnection.svg"));
143+
});
144+
145+
ASSERT (env.CheckReference (L"InputSlotReconnection_Reconnected.svg"));
146+
147+
env.nodeEditor.Undo ();
148+
ASSERT (env.CheckReference (L"InputSlotReconnection_AfterUndo.svg"));
149+
150+
env.CtrlDragDrop (env.viewer1InputSlotRect.GetCenter (), Point (0.0, 0.0));
151+
ASSERT (env.CheckReference (L"InputSlotReconnection_AfterDisconnect.svg"));
152+
}
153+
154+
TEST (OutputSlotReconnectionTest)
155+
{
156+
SimpleNodeEditorTestEnvWithConnections env (GetDefaultSkinParams ());
157+
ASSERT (env.CheckReference (L"OutputSlotReconnection_Basic.svg"));
158+
159+
env.CtrlDragDrop (env.rangeOutputSlotSRect.GetCenter (), env.doubleUpDownOutputSlotRect.GetCenter (), [&] () {
160+
ASSERT (env.CheckReference (L"OutputSlotReconnection_DuringConnection.svg"));
161+
});
162+
163+
ASSERT (env.CheckReference (L"OutputSlotReconnection_Reconnected.svg"));
164+
165+
env.nodeEditor.Undo ();
166+
ASSERT (env.CheckReference (L"OutputSlotReconnection_AfterUndo.svg"));
167+
168+
env.CtrlDragDrop (env.rangeOutputSlotSRect.GetCenter (), Point (0.0, 0.0));
169+
ASSERT (env.CheckReference (L"OutputSlotReconnection_AfterDisconnect.svg"));
170+
}
171+
70172
TEST (ReconnectionTest_ReconnectInputSlot)
71173
{
72174
ReconnectionTestEnv env (GetDefaultSkinParams ());

‎Sources/NodeEngineTest/NodeEditorVisualTestGrouping.cpp‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,19 @@ using namespace BI;
1111
namespace NodeEditorVisualTestGrouping
1212
{
1313

14+
TEST (GroupSelectedNodesTest)
15+
{
16+
SimpleNodeEditorTestEnvWithConnections env (GetDefaultSkinParams ());
17+
ASSERT (env.CheckReference (L"GroupSelectedNodes_Basic.svg"));
18+
env.Click (env.rangeInputHeaderPoint);
19+
20+
env.nodeEditor.ExecuteCommand (NUIE::CommandCode::Group);
21+
ASSERT (env.CheckReference (L"GroupSelectedNodes_AfterGroup.svg"));
22+
23+
env.nodeEditor.ExecuteCommand (NUIE::CommandCode::Ungroup);
24+
ASSERT (env.CheckReference (L"GroupSelectedNodes_AfterUngroup.svg"));
25+
}
26+
1427
TEST (CreateGroupTest)
1528
{
1629
SimpleNodeEditorTestEnv env (GetDefaultSkinParams ());

0 commit comments

Comments
 (0)