tests: Reorganize dfilter group

11 files changed, 57 insertions, 95 deletions

diff --git a/test/suite_dfilter/group_bytes_type.py b/test/suite_dfilter/group_bytes.py
index 62aa942185..62aa942185 100644
--- a/test/suite_dfilter/group_bytes_type.py
+++ b/test/suite_dfilter/group_bytes.py
diff --git a/test/suite_dfilter/group_bytes_ether.py b/test/suite_dfilter/group_ether.py
index 1d5e14ef03..1d5e14ef03 100644
--- a/test/suite_dfilter/group_bytes_ether.py
+++ b/test/suite_dfilter/group_ether.py
diff --git a/test/suite_dfilter/group_integer.py b/test/suite_dfilter/group_integer.py
index 0523224a07..70fb56621d 100644
--- a/test/suite_dfilter/group_integer.py
+++ b/test/suite_dfilter/group_integer.py
@@ -172,3 +172,28 @@ class case_integer(unittest.TestCase):
     def test_bool_ne_2(self, checkDFilterCount):
         dfilter = "ip.flags.df != 0"
         checkDFilterCount(dfilter, 0)
+
+@fixtures.uses_fixtures
+class case_integer_1_byte(unittest.TestCase):
+
+    trace_file = "ipx_rip.pcap"
+
+    def test_ipx_1(self, checkDFilterCount):
+        dfilter = "ipx.src.net == 0x28"
+        checkDFilterCount(dfilter, 1)
+
+    def test_ipx_2(self, checkDFilterCount):
+        dfilter = "ipx.src.net == 0x29"
+        checkDFilterCount(dfilter, 0)
+
+@fixtures.uses_fixtures
+class case_uint64(unittest.TestCase):
+    trace_file = "nfs.pcap"
+
+    def test_uint64_1(self, checkDFilterCount):
+        dfilter = "nfs.fattr3.size == 264032"
+        checkDFilterCount(dfilter, 1)
+
+    def test_uint64_2(self, checkDFilterCount):
+        dfilter = "nfs.fattr3.size == 264000"
+        checkDFilterCount(dfilter, 0)
diff --git a/test/suite_dfilter/group_integer_1byte.py b/test/suite_dfilter/group_integer_1byte.py
deleted file mode 100644
index c7d2f541c7..0000000000
--- a/test/suite_dfilter/group_integer_1byte.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2013 by Gilbert Ramirez <gram@alumni.rice.edu>
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-import unittest
-import fixtures
-from suite_dfilter.dfiltertest import *
-
-
-@fixtures.uses_fixtures
-class case_integer_1_byte(unittest.TestCase):
-
-    trace_file = "ipx_rip.pcap"
-
-    def test_ipx_1(self, checkDFilterCount):
-        dfilter = "ipx.src.net == 0x28"
-        checkDFilterCount(dfilter, 1)
-
-    def test_ipx_2(self, checkDFilterCount):
-        dfilter = "ipx.src.net == 0x29"
-        checkDFilterCount(dfilter, 0)
diff --git a/test/suite_dfilter/group_ipv4.py b/test/suite_dfilter/group_ipv4.py
index cf93de83b7..07b958dfd8 100644
--- a/test/suite_dfilter/group_ipv4.py
+++ b/test/suite_dfilter/group_ipv4.py
@@ -11,10 +11,6 @@ from suite_dfilter.dfiltertest import *
 class case_ipv4(unittest.TestCase):
     trace_file = "nfs.pcap"
 
-    def test_uint64_1(self, checkDFilterCount):
-        dfilter = "nfs.fattr3.size == 264032"
-        checkDFilterCount(dfilter, 1)
-
     def test_eq_1(self, checkDFilterCount):
         dfilter = "ip.src == 172.25.100.14"
         checkDFilterCount(dfilter, 1)
diff --git a/test/suite_dfilter/group_bytes_ipv6.py b/test/suite_dfilter/group_ipv6.py
index 70d1f35217..70d1f35217 100644
--- a/test/suite_dfilter/group_bytes_ipv6.py
+++ b/test/suite_dfilter/group_ipv6.py
diff --git a/test/suite_dfilter/group_string_type.py b/test/suite_dfilter/group_string.py
index fcb860ff54..902f6bb5cc 100644
--- a/test/suite_dfilter/group_string_type.py
+++ b/test/suite_dfilter/group_string.py
@@ -183,3 +183,19 @@ class case_string(unittest.TestCase):
     def test_value_string_1(self, checkDFilterCount):
         dfilter = 'tcp.checksum.status == "Unverified" || tcp.checksum.status == "Good"'
         checkDFilterCount(dfilter, 1)
+
+@fixtures.uses_fixtures
+class case_stringz(unittest.TestCase):
+    trace_file = "tftp.pcap"
+
+    def test_stringz_1(self, checkDFilterCount):
+        dfilter = 'tftp.type == octet'
+        checkDFilterCount(dfilter, 1)
+
+    def test_stringz_2(self, checkDFilterCount):
+        dfilter = 'tftp.type == "octet"'
+        checkDFilterCount(dfilter, 1)
+
+    def test_stringz_3(self, checkDFilterCount):
+        dfilter = 'tftp.type == junk'
+        checkDFilterCount(dfilter, 0)
diff --git a/test/suite_dfilter/group_stringz.py b/test/suite_dfilter/group_stringz.py
deleted file mode 100644
index bfc337dceb..0000000000
--- a/test/suite_dfilter/group_stringz.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2013 by Gilbert Ramirez <gram@alumni.rice.edu>
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-import unittest
-import fixtures
-from suite_dfilter.dfiltertest import *
-
-
-@fixtures.uses_fixtures
-class case_stringz(unittest.TestCase):
-    trace_file = "tftp.pcap"
-
-    def test_stringz_1(self, checkDFilterCount):
-        dfilter = 'tftp.type == octet'
-        checkDFilterCount(dfilter, 1)
-
-    def test_stringz_2(self, checkDFilterCount):
-        dfilter = 'tftp.type == "octet"'
-        checkDFilterCount(dfilter, 1)
-
-    def test_stringz_3(self, checkDFilterCount):
-        dfilter = 'tftp.type == junk'
-        checkDFilterCount(dfilter, 0)
-
diff --git a/test/suite_dfilter/group_time_type.py b/test/suite_dfilter/group_time.py
index c5918ac4d7..85cd21d1cb 100644
--- a/test/suite_dfilter/group_time_type.py
+++ b/test/suite_dfilter/group_time.py
@@ -100,3 +100,19 @@ class case_time(unittest.TestCase):
         dfilter = 'frame.time == "mrt 1, 2000 00:00:00"'
         error = '"mrt 1, 2000 00:00:00" is not a valid absolute time. Example: "Nov 12, 1999 08:55:44.123" or "2011-07-04 12:34:56"'
         checkDFilterFail(dfilter, error)
+
+@fixtures.uses_fixtures
+class case_time_relative(unittest.TestCase):
+    trace_file = "nfs.pcap"
+
+    def test_relative_time_1(self, checkDFilterCount):
+        dfilter = "frame.time_delta == 0.7"
+        checkDFilterCount(dfilter, 1)
+
+    def test_relative_time_2(self, checkDFilterCount):
+        dfilter = "frame.time_delta > 0.7"
+        checkDFilterCount(dfilter, 0)
+
+    def test_relative_time_3(self, checkDFilterCount):
+        dfilter = "frame.time_delta < 0.7"
+        checkDFilterCount(dfilter, 1)
diff --git a/test/suite_dfilter/group_time_relative.py b/test/suite_dfilter/group_time_relative.py
deleted file mode 100644
index 3cb4f60586..0000000000
--- a/test/suite_dfilter/group_time_relative.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2013 by Gilbert Ramirez <gram@alumni.rice.edu>
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-import unittest
-import fixtures
-from suite_dfilter.dfiltertest import *
-
-
-@fixtures.uses_fixtures
-class case_time_relative(unittest.TestCase):
-    trace_file = "nfs.pcap"
-
-    def test_relative_time_1(self, checkDFilterCount):
-        dfilter = "frame.time_delta == 0.7"
-        checkDFilterCount(dfilter, 1)
-
-    def test_relative_time_2(self, checkDFilterCount):
-        dfilter = "frame.time_delta > 0.7"
-        checkDFilterCount(dfilter, 0)
-
-    def test_relative_time_3(self, checkDFilterCount):
-        dfilter = "frame.time_delta < 0.7"
-        checkDFilterCount(dfilter, 1)
-
diff --git a/test/suite_dfilter/group_uint64.py b/test/suite_dfilter/group_uint64.py
deleted file mode 100644
index 2da7f45b70..0000000000
--- a/test/suite_dfilter/group_uint64.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (c) 2013 by Gilbert Ramirez <gram@alumni.rice.edu>
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-import unittest
-import fixtures
-from suite_dfilter.dfiltertest import *
-
-
-@fixtures.uses_fixtures
-class case_uint64(unittest.TestCase):
-    trace_file = "nfs.pcap"
-
-    def test_uint64_1(self, checkDFilterCount):
-        dfilter = "nfs.fattr3.size == 264032"
-        checkDFilterCount(dfilter, 1)
-
-    def test_uint64_2(self, checkDFilterCount):
-        dfilter = "nfs.fattr3.size == 264000"
-        checkDFilterCount(dfilter, 0)