From bdae7ae886ebfcf510d8c239400e304c2a69fa56 Mon Sep 17 00:00:00 2001
From: Craig Warren <craig_warren@me.com>
Date: Thu, 26 Jan 2017 17:59:39 +0000
Subject: [PATCH] Code formatting cleanups.

---
 gprMax/input_cmd_funcs.py      |  3 +-
 gprMax/input_cmd_funcs_test.py | 79 ----------------------------------
 2 files changed, 1 insertion(+), 81 deletions(-)
 delete mode 100644 gprMax/input_cmd_funcs_test.py

diff --git a/gprMax/input_cmd_funcs.py b/gprMax/input_cmd_funcs.py
index c7419735..071decae 100644
--- a/gprMax/input_cmd_funcs.py
+++ b/gprMax/input_cmd_funcs.py
@@ -632,7 +632,7 @@ def rx(x, y, z, identifier=None, to_save=None, polarisation=None, dxdy=None, rot
     to_save_str = ''
     if to_save is not None:
         to_save_str = ' '.join(to_save)
-    
+
     command('rx', str(c), identifier, to_save_str)
 
     return c
@@ -667,4 +667,3 @@ def rx_steps(dx=0, dy=0, dz=0):
     c = Coordinate(dx, dy, dz)
     command('rx_steps', str(c))
     return c
-
diff --git a/gprMax/input_cmd_funcs_test.py b/gprMax/input_cmd_funcs_test.py
deleted file mode 100644
index 8ff52abf..00000000
--- a/gprMax/input_cmd_funcs_test.py
+++ /dev/null
@@ -1,79 +0,0 @@
-import sys
-import unittest
-
-# http://stackoverflow.com/a/17981937/1942837
-from contextlib import contextmanager
-from io import StringIO
-
-@contextmanager
-def captured_output():
-    new_out, new_err = StringIO(), StringIO()
-    old_out, old_err = sys.stdout, sys.stderr
-    try:
-        sys.stdout, sys.stderr = new_out, new_err
-        yield sys.stdout, sys.stderr
-    finally:
-        sys.stdout, sys.stderr = old_out, old_err
-
-# end stack copy
-        
-from input_cmd_funcs import *
-
-class My_input_cmd_funcs_test(unittest.TestCase):
-    def assert_output(self, out, expected_out):
-        """helper function"""
-        output = out.getvalue().strip()
-        self.assertEqual(output, expected_out)
-
-    def test_rx(self):
-        with captured_output() as (out, err):
-            rx(0, 0, 0)
-        self.assert_output(out, '#rx: 0 0 0')
-    def test_rx2(self):
-        with captured_output() as (out, err):
-            rx(0, 1, 2, 'id')
-        self.assert_output(out, '#rx: 0 1 2 id')
-    def test_rx3(self):
-        with captured_output() as (out, err):
-            rx(2, 1, 0, 'idd', ['Ex'])
-        self.assert_output(out, '#rx: 2 1 0 idd Ex')
-    def test_rx4(self):
-        with captured_output() as (out, err):
-            rx(2, 1, 0, 'id', ['Ex', 'Ez'])
-        self.assert_output(out, '#rx: 2 1 0 id Ex Ez')
-    def test_rx4(self):
-        with captured_output() as (out, err):
-            rx(2, 1, 0, 'id', ['Ex', 'Ez'])
-        self.assert_output(out, '#rx: 2 1 0 id Ex Ez')
-    def test_rx_rotate_exception(self):
-        with self.assertRaises(ValueError):
-            rx(2, 1, 0, 'id', ['Ex', 'Ez'], polarisation='x', rotate90origin=(1,1)) # no dxdy given
-    def test_rx_rotate_success(self):
-        with captured_output() as (out, err):
-            rx(2, 1, 0, 'id', ['Ex', 'Ez'], polarisation='x', rotate90origin=(1,1), dxdy=(0,0))
-        self.assert_output(out, '#rx: 1 2 0 id Ex Ez') # note: x, y swapped
-    def test_rx_rotate_success2(self):
-        with captured_output() as (out, err):
-            rx(2, 1, 0, 'id', ['Ex', 'Ez'], polarisation='y', rotate90origin=(1,1), dxdy=(0,0))
-        self.assert_output(out, '#rx: 1 2 0 id Ex Ez') # note: x, y swapped
-        
-    def test_src_steps(self):
-        with captured_output() as (out, err):
-            src_steps()
-        self.assert_output(out, '#src_steps: 0 0 0')
-    def test_src_steps2(self):
-        with captured_output() as (out, err):
-            src_steps(42, 43, 44.2)
-        self.assert_output(out, '#src_steps: 42 43 44.2')
-        
-    def test_rx_steps(self):
-        with captured_output() as (out, err):
-            rx_steps()
-        self.assert_output(out, '#rx_steps: 0 0 0')
-    def test_rx_steps2(self):
-        with captured_output() as (out, err):
-            rx_steps(42, 43, 44.2)
-        self.assert_output(out, '#rx_steps: 42 43 44.2')
-        
-if __name__ == '__main__':
-    unittest.main()