Tests Modification (#17)

* fix : tests modified

* fix : test_functions.py updated

* fix : test_ipv4.py updated

* fix : tests updated

* fix : mock added to tests

* fix : unused import removed

Author: sepandhaghighi

ipspot/functions.py

@@ -9,7 +9,7 @@
 from .params import IPSPOT_OVERVIEW, IPSPOT_REPO, IPSPOT_VERSION
 
 
-def ipspot_info() -> None: #pragma: no cover
+def ipspot_info() -> None:  # pragma: no cover
     """Print ipspot details."""
     tprint("IPSpot")
     tprint("V:" + IPSPOT_VERSION)
@@ -163,7 +163,7 @@ def filter_parameter(parameter: Any) -> Any:
 
 
 def display_ip_info(ipv4_api: IPv4API = IPv4API.AUTO, geo: bool=False,
-                    timeout: Union[float, Tuple[float, float]]=5) -> None: #pragma: no cover
+                    timeout: Union[float, Tuple[float, float]]=5) -> None:  # pragma: no cover
     """
     Print collected IP and location data.
 
@@ -192,7 +192,7 @@ def display_ip_info(ipv4_api: IPv4API = IPv4API.AUTO, geo: bool=False,
         print("  Error: {public_result[error]}".format(public_result=public_result))
 
 
-def main() -> None: #pragma: no cover
+def main() -> None:  # pragma: no cover
     """CLI main function."""
     parser = argparse.ArgumentParser()
     parser.add_argument(

tests/test_functions.py

@@ -15,6 +15,10 @@ def test_filter_parameter3():
     assert filter_parameter("   ") == "N/A"
 
 
+def test_filter_parameter4():
+    assert filter_parameter("GB") == "GB"
+
+
 
 
 

tests/test_ipv4.py

@@ -1,4 +1,5 @@
 import re
+from unittest import mock
 from ipspot import get_private_ipv4
 from ipspot import get_public_ipv4, IPv4API
 
@@ -7,39 +8,101 @@
 DATA_ITEMS = {'country_code', 'latitude', 'longitude', 'api', 'country', 'timezone', 'organization', 'region', 'ip', 'city'}
 
 
-def test_private_ipv4():
+def test_private_ipv4_success():
     result = get_private_ipv4()
     assert result["status"]
     assert IPV4_REGEX.match(result["data"]["ip"])
 
 
-def test_public_ipv4_auto():
+def test_private_ipv4_error():
+    with mock.patch("socket.gethostbyname", side_effect=Exception("Test error")):
+        result = get_private_ipv4()
+        assert not result["status"]
+        assert result["error"] == "Test error"
+
+
+def test_public_ipv4_auto_success():
     result = get_public_ipv4(api=IPv4API.AUTO, geo=True)
     assert result["status"]
     assert IPV4_REGEX.match(result["data"]["ip"])
     assert set(result["data"].keys()) == DATA_ITEMS
 
 
-def test_public_ipv4_ipapi():
+def test_public_ipv4_auto_timeout_error():
+    result = get_public_ipv4(api=IPv4API.AUTO, geo=True, timeout="5")
+    assert not result["status"]
+
+
+def test_public_ipv4_auto_net_error():
+    with mock.patch("requests.get", side_effect=Exception("No Internet")):
+        result = get_public_ipv4(api=IPv4API.AUTO)
+        assert not result["status"]
+        assert result["error"] == "All attempts failed."
+
+
+def test_public_ipv4_ipapi_success():
     result = get_public_ipv4(api=IPv4API.IPAPI, geo=True)
     assert result["status"]
     assert IPV4_REGEX.match(result["data"]["ip"])
     assert set(result["data"].keys()) == DATA_ITEMS
     assert result["data"]["api"] == "ip-api.com"
 
 
-def test_public_ipv4_ipinfo():
+def test_public_ipv4_ipapi_timeout_error():
+    result = get_public_ipv4(api=IPv4API.IPAPI, geo=True, timeout="5")
+    assert not result["status"]
+
+
+def test_public_ipv4_ipapi_net_error():
+    with mock.patch("requests.get", side_effect=Exception("No Internet")):
+        result = get_public_ipv4(api=IPv4API.IPAPI)
+        assert not result["status"]
+        assert result["error"] == "No Internet"
+
+
+def test_public_ipv4_ipinfo_success():
     result = get_public_ipv4(api=IPv4API.IPINFO, geo=True)
     assert result["status"]
     assert IPV4_REGEX.match(result["data"]["ip"])
     assert set(result["data"].keys()) == DATA_ITEMS
     assert result["data"]["api"] == "ipinfo.io"
 
 
-def test_public_ipv4_ipsb():
+def test_public_ipv4_ipinfo_timeout_error():
+    result = get_public_ipv4(api=IPv4API.IPINFO, geo=True, timeout="5")
+    assert not result["status"]
+
+
+def test_public_ipv4_ipinfo_net_error():
+    with mock.patch("requests.get", side_effect=Exception("No Internet")):
+        result = get_public_ipv4(api=IPv4API.IPINFO)
+        assert not result["status"]
+        assert result["error"] == "No Internet"
+
+
+def test_public_ipv4_ipsb_success():
     result = get_public_ipv4(api=IPv4API.IPSB, geo=True)
     assert result["status"]
     assert IPV4_REGEX.match(result["data"]["ip"])
     assert set(result["data"].keys()) == DATA_ITEMS
     assert result["data"]["api"] == "ip.sb"
 
+
+def test_public_ipv4_ipsb_timeout_error():
+    result = get_public_ipv4(api=IPv4API.IPSB, geo=True, timeout="5")
+    assert not result["status"]
+
+
+
+def test_public_ipv4_ipsb_net_error():
+    with mock.patch("requests.get", side_effect=Exception("No Internet")):
+        result = get_public_ipv4(api=IPv4API.IPSB)
+        assert not result["status"]
+        assert result["error"] == "No Internet"
+
+
+def test_public_ipv4_api_error():
+    result = get_public_ipv4(api="api1", geo=True)
+    assert not result["status"]
+    assert result["error"] == "Unsupported API: api1"
+