Skip to content

Commit

Permalink
Rename new_plot->make_plots in surf-surf fnl. test.
Browse files Browse the repository at this point in the history
  • Loading branch information
dhermes committed Dec 14, 2016
1 parent b67bbdb commit 7ec6cb2
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions functional_tests/test_surface_surface.py
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@
['start_vals', 'end_vals', 'nodes', 'edge_pairs'])


def new_plot(surface1, surface2, intersections, failed=True):
def make_plots(surface1, surface2, intersections, failed=True):
if not CONFIG.running:
return

Expand Down Expand Up @@ -504,7 +504,7 @@ def surface_surface_check_multi(surface1, surface2, *all_intersected):
CONFIG.assert_close(edge._nodes[0, 0], node[0])
CONFIG.assert_close(edge._nodes[0, 1], node[1])

new_plot(surface1, surface2, intersections, failed=False)
make_plots(surface1, surface2, intersections, failed=False)


def test_surfaces1Q_and_3Q():
Expand Down Expand Up @@ -621,15 +621,15 @@ def test_surfaces10Q_and_18Q():
intersection = make_curved_polygon(
SURFACE10Q, SURFACE18Q,
start_vals, end_vals, edge_pairs)
new_plot(SURFACE10Q, SURFACE18Q, [intersection])
make_plots(SURFACE10Q, SURFACE18Q, [intersection])


def test_surfaces10Q_and_19Q():
with pytest.raises(NotImplementedError) as exc_info:
surface_surface_check_multi(SURFACE10Q, SURFACE19Q)

assert exc_info.value.args == PARALLEL_FAILURE
new_plot(SURFACE10Q, SURFACE19Q, [])
make_plots(SURFACE10Q, SURFACE19Q, [])


def test_surfaces3Q_and_4Q():
Expand Down Expand Up @@ -688,7 +688,7 @@ def test_surfaces1Q_and_5L():
intersection = make_curved_polygon(
SURFACE1Q, SURFACE5L,
start_vals, end_vals, edge_pairs)
new_plot(SURFACE1Q, SURFACE5L, [intersection])
make_plots(SURFACE1Q, SURFACE5L, [intersection])


def test_surfaces3Q_and_5Q():
Expand Down Expand Up @@ -766,7 +766,7 @@ def test_surfaces20Q_and_21Q():
intersection = make_curved_polygon(
SURFACE20Q, SURFACE21Q,
start_vals, end_vals, edge_pairs)
new_plot(SURFACE20Q, SURFACE21Q, [intersection])
make_plots(SURFACE20Q, SURFACE21Q, [intersection])


def test_surfaces4L_and_22Q():
Expand All @@ -791,7 +791,7 @@ def test_surfaces4L_and_22Q():
intersection = make_curved_polygon(
SURFACE4L, SURFACE22Q,
start_vals, end_vals, edge_pairs)
new_plot(SURFACE4L, SURFACE22Q, [intersection])
make_plots(SURFACE4L, SURFACE22Q, [intersection])


def test_surfaces4L_and_23Q():
Expand All @@ -816,7 +816,7 @@ def test_surfaces4L_and_23Q():
intersection = make_curved_polygon(
SURFACE4L, SURFACE23Q,
start_vals, end_vals, edge_pairs)
new_plot(SURFACE4L, SURFACE23Q, [intersection])
make_plots(SURFACE4L, SURFACE23Q, [intersection])


def test_surfaces6Q_and_7Q():
Expand Down Expand Up @@ -910,7 +910,7 @@ def test_surfaces4Q_and_10Q():
surface_surface_check_multi(SURFACE4Q, SURFACE10Q)

assert exc_info.value.args == ALL_TANGENT
new_plot(SURFACE4Q, SURFACE10Q, [])
make_plots(SURFACE4Q, SURFACE10Q, [])


def test_surfaces11Q_and_12Q():
Expand Down Expand Up @@ -952,7 +952,7 @@ def test_surfaces3Q_and_13Q():
intersection = make_curved_polygon(
SURFACE3Q, SURFACE13Q,
start_vals, end_vals, edge_pairs)
new_plot(SURFACE3Q, SURFACE13Q, [intersection])
make_plots(SURFACE3Q, SURFACE13Q, [intersection])


def test_surfaces10Q_and_17Q():
Expand Down Expand Up @@ -995,7 +995,7 @@ def test_surfaces3Q_and_14Q():
intersection = make_curved_polygon(
SURFACE3Q, SURFACE14Q,
start_vals, end_vals, edge_pairs)
new_plot(SURFACE3Q, SURFACE14Q, [intersection])
make_plots(SURFACE3Q, SURFACE14Q, [intersection])


def test_surfaces15Q_and_16Q():
Expand Down Expand Up @@ -1053,7 +1053,7 @@ def test_surfaces15Q_and_16Q():
intersection2 = make_curved_polygon(
SURFACE15Q, SURFACE16Q,
start_vals2, end_vals2, edge_pairs2)
new_plot(SURFACE15Q, SURFACE16Q, [intersection1, intersection2])
make_plots(SURFACE15Q, SURFACE16Q, [intersection1, intersection2])


def test_surfaces24Q_and_25Q():
Expand Down

0 comments on commit 7ec6cb2

Please sign in to comment.