소스 검색

fix resource path for Utility unittest

Jens Keim 6 년 전
부모
커밋
a9f00363fc
6개의 변경된 파일7개의 추가작업 그리고 5개의 파일을 삭제
  1. 1 0
      code/Test/Lib.py
  2. 6 5
      code/Test/test_Utility.py
  3. 0 0
      resources/test/HexTestFile.txt
  4. 0 0
      resources/test/InvalidHeader.txt
  5. 0 0
      resources/test/InvalidHexFile.txt
  6. 0 0
      resources/test/StringTestFile.txt

+ 1 - 0
code/Test/Lib.py

@@ -4,6 +4,7 @@ import hashlib
 from definitions import ROOT_DIR
 
 # TODO: generate better test pcap (1000-2000 packets)
+test_resource_dir = ROOT_DIR + "/../resources/test"
 test_pcap = ROOT_DIR + "/../resources/test/test.pcap"
 test_pcap_ips = ["192.168.189.143", "192.168.189.1"]
 

+ 6 - 5
code/Test/test_Utility.py

@@ -1,5 +1,6 @@
 from unittest import TestCase
 from ID2TLib.Utility import *
+from Test.Lib import test_resource_dir
 
 
 class TestUtility(TestCase):
@@ -154,20 +155,20 @@ class TestUtility(TestCase):
 
     def test_get_bytes_from_file_invalid_path(self):
         with self.assertRaises(SystemExit):
-            get_bytes_from_file("resources/NonExistingFile.txt")
+            get_bytes_from_file(test_resource_dir+"/NonExistingFile.txt")
 
     def test_get_bytes_from_file_invalid_header(self):
         with self.assertRaises(SystemExit):
-            get_bytes_from_file("resources/InvalidHeader.txt")
+            get_bytes_from_file(test_resource_dir+"/InvalidHeader.txt")
 
     def test_get_bytes_from_file_invalid_hexfile(self):
         with self.assertRaises(SystemExit):
-            get_bytes_from_file("resources/InvalidHexFile.txt")
+            get_bytes_from_file(test_resource_dir+"/InvalidHexFile.txt")
 
     def test_get_bytes_from_file_str(self):
-        result = get_bytes_from_file("resources/StringTestFile.txt")
+        result = get_bytes_from_file(test_resource_dir+"/StringTestFile.txt")
         self.assertEqual(result, b'This is a string-test')
 
     def test_get_bytes_from_file_hex(self):
-        result = get_bytes_from_file("resources/HexTestFile.txt")
+        result = get_bytes_from_file(test_resource_dir+"/HexTestFile.txt")
         self.assertEqual(result, b'\xab\xcd\xef\xff\x10\xff\xaa\xab')

+ 0 - 0
code/Test/resources/HexTestFile.txt → resources/test/HexTestFile.txt


+ 0 - 0
code/Test/resources/InvalidHeader.txt → resources/test/InvalidHeader.txt


+ 0 - 0
code/Test/resources/InvalidHexFile.txt → resources/test/InvalidHexFile.txt


+ 0 - 0
code/Test/resources/StringTestFile.txt → resources/test/StringTestFile.txt