diff options
5 files changed, 60 insertions, 107 deletions
diff --git a/groot-bootstrap/src/test/java/com/geedgenetworks/bootstrap/main/LogoTest.java b/groot-bootstrap/src/test/java/com/geedgenetworks/bootstrap/main/LogoTest.java index aeb9d4b..672ec2f 100644 --- a/groot-bootstrap/src/test/java/com/geedgenetworks/bootstrap/main/LogoTest.java +++ b/groot-bootstrap/src/test/java/com/geedgenetworks/bootstrap/main/LogoTest.java @@ -1,12 +1,12 @@ package com.geedgenetworks.bootstrap.main; import com.geedgenetworks.common.config.Constants; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class LogoTest { @Test public void testOutputLogo() { - Assert.assertTrue(Constants.GROOT_LOGO.length() > 0); + Assertions.assertTrue(Constants.GROOT_LOGO.length() > 0); } } diff --git a/groot-bootstrap/src/test/java/com/geedgenetworks/bootstrap/main/simple/JobAggTest.java b/groot-bootstrap/src/test/java/com/geedgenetworks/bootstrap/main/simple/JobAggTest.java index fa9c2dd..d8df53f 100644 --- a/groot-bootstrap/src/test/java/com/geedgenetworks/bootstrap/main/simple/JobAggTest.java +++ b/groot-bootstrap/src/test/java/com/geedgenetworks/bootstrap/main/simple/JobAggTest.java @@ -15,28 +15,17 @@ import com.typesafe.config.Config; import com.typesafe.config.ConfigObject; import com.typesafe.config.ConfigUtil; import com.typesafe.config.ConfigValueFactory; -import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration; -import org.apache.flink.test.util.MiniClusterWithClientResource; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.Test; + import java.nio.file.Path; import java.util.List; import java.util.Map; import java.util.Set; - +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class JobAggTest { - @ClassRule - public static MiniClusterWithClientResource flinkCluster = - new MiniClusterWithClientResource( - new MiniClusterResourceConfiguration.Builder() - .setNumberSlotsPerTaskManager(1) - .setNumberTaskManagers(1) - .build()); - @Test public void testSplitForAgg() { @@ -62,18 +51,18 @@ public class JobAggTest { JobExecution jobExecution = new JobExecution(config, grootStreamConfig); jobExecution.execute(); - Assert.assertEquals(4, CollectSink.values.size()); - Assert.assertEquals("2", CollectSink.values.get(1).getExtractedFields().get("sessions").toString()); - Assert.assertEquals("3.5", CollectSink.values.get(1).getExtractedFields().get("pkts").toString()); - Assert.assertEquals("2", CollectSink.values.get(1).getExtractedFields().get("log_id_first").toString()); - Assert.assertEquals("1", CollectSink.values.get(1).getExtractedFields().get("log_id_last").toString()); - Assert.assertEquals("4", CollectSink.values.get(1).getExtractedFields().get("pktsmax").toString()); - Assert.assertEquals("3", CollectSink.values.get(1).getExtractedFields().get("pktsmin").toString()); + Assertions.assertEquals(4, CollectSink.values.size()); + Assertions.assertEquals("2", CollectSink.values.get(1).getExtractedFields().get("sessions").toString()); + Assertions.assertEquals("3.5", CollectSink.values.get(1).getExtractedFields().get("pkts").toString()); + Assertions.assertEquals("2", CollectSink.values.get(1).getExtractedFields().get("log_id_first").toString()); + Assertions.assertEquals("1", CollectSink.values.get(1).getExtractedFields().get("log_id_last").toString()); + Assertions.assertEquals("4", CollectSink.values.get(1).getExtractedFields().get("pktsmax").toString()); + Assertions.assertEquals("3", CollectSink.values.get(1).getExtractedFields().get("pktsmin").toString()); List<String> list = (List<String>) CollectSink.values.get(1).getExtractedFields().get("client_ip_list"); Set<String> set = (Set<String>) CollectSink.values.get(1).getExtractedFields().get("server_ip_set"); - Assert.assertEquals(1, set.size()); - Assert.assertEquals(2, list.size()); - Assert.assertEquals("2", CollectSink.values.get(1).getExtractedFields().get("count").toString()); + Assertions.assertEquals(1, set.size()); + Assertions.assertEquals(2, list.size()); + Assertions.assertEquals("2", CollectSink.values.get(1).getExtractedFields().get("count").toString()); } } diff --git a/groot-bootstrap/src/test/java/com/geedgenetworks/bootstrap/main/simple/JobDosTest.java b/groot-bootstrap/src/test/java/com/geedgenetworks/bootstrap/main/simple/JobDosTest.java index bd4f9d8..d9e8925 100644 --- a/groot-bootstrap/src/test/java/com/geedgenetworks/bootstrap/main/simple/JobDosTest.java +++ b/groot-bootstrap/src/test/java/com/geedgenetworks/bootstrap/main/simple/JobDosTest.java @@ -15,11 +15,8 @@ import com.typesafe.config.Config; import com.typesafe.config.ConfigObject; import com.typesafe.config.ConfigUtil; import com.typesafe.config.ConfigValueFactory; -import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration; -import org.apache.flink.test.util.MiniClusterWithClientResource; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.nio.file.Path; import java.util.Map; @@ -27,13 +24,6 @@ import java.util.Map; public class JobDosTest { - @ClassRule - public static MiniClusterWithClientResource flinkCluster = - new MiniClusterWithClientResource( - new MiniClusterResourceConfiguration.Builder() - .setNumberSlotsPerTaskManager(1) - .setNumberTaskManagers(1) - .build()); @Test public void testSplit() { @@ -59,34 +49,32 @@ public class JobDosTest { JobExecution jobExecution = new JobExecution(config, grootStreamConfig); jobExecution.execute(); - // Assert.assertEquals(7, CollectSink.values.size()); + Assertions.assertEquals(3, CollectSink.values.size()); + Assertions.assertEquals("200", CollectSink.values.get(1).getExtractedFields().get("sessions").toString()); + Assertions.assertEquals("2000", CollectSink.values.get(1).getExtractedFields().get("packets").toString()); + Assertions.assertEquals("20000", CollectSink.values.get(1).getExtractedFields().get("bytes").toString()); + Assertions.assertEquals("66.67", CollectSink.values.get(1).getExtractedFields().get("session_rate").toString()); + Assertions.assertEquals("666.67", CollectSink.values.get(1).getExtractedFields().get("packet_rate").toString()); + Assertions.assertEquals("53333.33", CollectSink.values.get(1).getExtractedFields().get("bit_rate").toString()); - Assert.assertEquals(3, CollectSink.values.size()); - Assert.assertEquals("200", CollectSink.values.get(1).getExtractedFields().get("sessions").toString()); - Assert.assertEquals("2000", CollectSink.values.get(1).getExtractedFields().get("packets").toString()); - Assert.assertEquals("20000", CollectSink.values.get(1).getExtractedFields().get("bytes").toString()); - Assert.assertEquals("66.67", CollectSink.values.get(1).getExtractedFields().get("session_rate").toString()); - Assert.assertEquals("666.67", CollectSink.values.get(1).getExtractedFields().get("packet_rate").toString()); - Assert.assertEquals("53333.33", CollectSink.values.get(1).getExtractedFields().get("bit_rate").toString()); + Assertions.assertTrue( CollectSink.values.get(1).getExtractedFields().containsKey("log_id")); + Assertions.assertTrue(CollectSink.values.get(1).getExtractedFields().containsKey("recv_time")); + Assertions.assertEquals("1729476003", CollectSink.values.get(1).getExtractedFields().get("end_time").toString()); + Assertions.assertEquals("1729476000", CollectSink.values.get(1).getExtractedFields().get("start_time").toString()); + Assertions.assertEquals("1729476003", CollectSink.values.get(1).getExtractedFields().get("end_time").toString()); + Assertions.assertEquals("3", CollectSink.values.get(1).getExtractedFields().get("duration").toString()); - Assert.assertTrue( CollectSink.values.get(1).getExtractedFields().containsKey("log_id")); - Assert.assertTrue(CollectSink.values.get(1).getExtractedFields().containsKey("recv_time")); - Assert.assertEquals("1729476003", CollectSink.values.get(1).getExtractedFields().get("end_time").toString()); - Assert.assertEquals("1729476000", CollectSink.values.get(1).getExtractedFields().get("start_time").toString()); - Assert.assertEquals("1729476003", CollectSink.values.get(1).getExtractedFields().get("end_time").toString()); - Assert.assertEquals("3", CollectSink.values.get(1).getExtractedFields().get("duration").toString()); + Assertions.assertEquals("1.2.2.2", CollectSink.values.get(1).getExtractedFields().get("destination_ip").toString()); + Assertions.assertEquals("1.1.1.1", CollectSink.values.get(1).getExtractedFields().get("source_ip").toString()); - Assert.assertEquals("1.2.2.2", CollectSink.values.get(1).getExtractedFields().get("destination_ip").toString()); - Assert.assertEquals("1.1.1.1", CollectSink.values.get(1).getExtractedFields().get("source_ip").toString()); - - Assert.assertEquals("CN", CollectSink.values.get(1).getExtractedFields().get("source_country").toString()); - Assert.assertEquals("1.1.1.1", CollectSink.values.get(1).getExtractedFields().get("source_ip").toString()); - Assert.assertEquals("1.2.2.2", CollectSink.values.get(1).getExtractedFields().get("destination_ip").toString()); - Assert.assertEquals("US", CollectSink.values.get(1).getExtractedFields().get("destination_country").toString()); - Assert.assertEquals("123", CollectSink.values.get(1).getExtractedFields().get("rule_uuid").toString()); + Assertions.assertEquals("CN", CollectSink.values.get(1).getExtractedFields().get("source_country").toString()); + Assertions.assertEquals("1.1.1.1", CollectSink.values.get(1).getExtractedFields().get("source_ip").toString()); + Assertions.assertEquals("1.2.2.2", CollectSink.values.get(1).getExtractedFields().get("destination_ip").toString()); + Assertions.assertEquals("US", CollectSink.values.get(1).getExtractedFields().get("destination_country").toString()); + Assertions.assertEquals("123", CollectSink.values.get(1).getExtractedFields().get("rule_uuid").toString()); } diff --git a/groot-bootstrap/src/test/java/com/geedgenetworks/bootstrap/main/simple/JobEtlTest.java b/groot-bootstrap/src/test/java/com/geedgenetworks/bootstrap/main/simple/JobEtlTest.java index 1fc62d0..cf45474 100644 --- a/groot-bootstrap/src/test/java/com/geedgenetworks/bootstrap/main/simple/JobEtlTest.java +++ b/groot-bootstrap/src/test/java/com/geedgenetworks/bootstrap/main/simple/JobEtlTest.java @@ -15,28 +15,15 @@ import com.typesafe.config.Config; import com.typesafe.config.ConfigObject; import com.typesafe.config.ConfigUtil; import com.typesafe.config.ConfigValueFactory; -import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration; -import org.apache.flink.test.util.MiniClusterWithClientResource; import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.Test; import java.nio.file.Path; import java.util.Map; - -import static org.junit.Assert.assertTrue; -import static org.junit.jupiter.api.Assertions.assertEquals; - +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class JobEtlTest { - @ClassRule - public static MiniClusterWithClientResource flinkCluster = - new MiniClusterWithClientResource( - new MiniClusterResourceConfiguration.Builder() - .setNumberSlotsPerTaskManager(1) - .setNumberTaskManagers(1) - .build()); @Test public void testEtl() { @@ -61,23 +48,23 @@ public class JobEtlTest { JobExecution jobExecution = new JobExecution(config, grootStreamConfig); jobExecution.execute(); - Assert.assertEquals(1, CollectSink.values.size()); - Assert.assertEquals("BASE", CollectSink.values.get(0).getExtractedFields().get("decoded_as").toString()); - Assert.assertEquals("google.com", CollectSink.values.get(0).getExtractedFields().get("server_domain").toString()); - assertTrue(1000000000 < Integer.parseInt(CollectSink.values.get(0).getExtractedFields().get("recv_time").toString())); - assertTrue(1000000000 < Integer.parseInt(CollectSink.values.get(0).getExtractedFields().get("processing_time").toString())); - assertTrue(0 != Long.parseLong(CollectSink.values.get(0).getExtractedFields().get("log_id").toString())); - Assert.assertEquals("http://192.168.44.12:9098/hos/traffic_policy_capture_file_bucket/test", CollectSink.values.get(0).getExtractedFields().get("packet_capture_file").toString()); - Assert.assertEquals("[2600:1015:b002::,255.255.255.255]", CollectSink.values.get(0).getExtractedFields().get("ip_string").toString()); - Assert.assertEquals("hello", CollectSink.values.get(0).getExtractedFields().get("mail_attachment_name").toString()); - Assert.assertEquals("aGVsbG8=", CollectSink.values.get(0).getExtractedFields().get("old_mail_attachment_name").toString()); - - Assert.assertEquals("MULTIPATH_ETHERNET", CollectSink.values.get(0).getExtractedFields().get("tunnels_schema_type").toString()); - Assert.assertEquals(36, CollectSink.values.get(0).getExtractedFields().get("log_uuid").toString().length()); - Assert.assertEquals(36, CollectSink.values.get(0).getExtractedFields().get("log_uuid_v7").toString().length()); - Assert.assertEquals("dacad383-8355-5493-9e1e-20ef5cd8b8fd", CollectSink.values.get(0).getExtractedFields().get("ip_uuid").toString()); - - Assert.assertEquals("2024-01-18 17:01:57.095", CollectSink.values.get(0).getExtractedFields().get("start_time").toString()); + Assertions.assertEquals(1, CollectSink.values.size()); + Assertions.assertEquals("BASE", CollectSink.values.get(0).getExtractedFields().get("decoded_as").toString()); + Assertions.assertEquals("google.com", CollectSink.values.get(0).getExtractedFields().get("server_domain").toString()); + Assertions.assertTrue(1000000000 < Integer.parseInt(CollectSink.values.get(0).getExtractedFields().get("recv_time").toString())); + Assertions.assertTrue(1000000000 < Integer.parseInt(CollectSink.values.get(0).getExtractedFields().get("processing_time").toString())); + Assertions.assertTrue(0 != Long.parseLong(CollectSink.values.get(0).getExtractedFields().get("log_id").toString())); + Assertions.assertEquals("http://192.168.44.12:9098/hos/traffic_policy_capture_file_bucket/test", CollectSink.values.get(0).getExtractedFields().get("packet_capture_file").toString()); + Assertions.assertEquals("[2600:1015:b002::,255.255.255.255]", CollectSink.values.get(0).getExtractedFields().get("ip_string").toString()); + Assertions.assertEquals("hello", CollectSink.values.get(0).getExtractedFields().get("mail_attachment_name").toString()); + Assertions.assertEquals("aGVsbG8=", CollectSink.values.get(0).getExtractedFields().get("old_mail_attachment_name").toString()); + + Assertions.assertEquals("MULTIPATH_ETHERNET", CollectSink.values.get(0).getExtractedFields().get("tunnels_schema_type").toString()); + Assertions.assertEquals(36, CollectSink.values.get(0).getExtractedFields().get("log_uuid").toString().length()); + Assertions.assertEquals(36, CollectSink.values.get(0).getExtractedFields().get("log_uuid_v7").toString().length()); + Assertions.assertEquals("dacad383-8355-5493-9e1e-20ef5cd8b8fd", CollectSink.values.get(0).getExtractedFields().get("ip_uuid").toString()); + + Assertions.assertEquals("2024-01-18 17:01:57.095", CollectSink.values.get(0).getExtractedFields().get("start_time").toString()); diff --git a/groot-bootstrap/src/test/java/com/geedgenetworks/bootstrap/main/simple/JobSplitTest.java b/groot-bootstrap/src/test/java/com/geedgenetworks/bootstrap/main/simple/JobSplitTest.java index 577b293..5d7f470 100644 --- a/groot-bootstrap/src/test/java/com/geedgenetworks/bootstrap/main/simple/JobSplitTest.java +++ b/groot-bootstrap/src/test/java/com/geedgenetworks/bootstrap/main/simple/JobSplitTest.java @@ -15,27 +15,16 @@ import com.typesafe.config.Config; import com.typesafe.config.ConfigObject; import com.typesafe.config.ConfigUtil; import com.typesafe.config.ConfigValueFactory; -import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration; -import org.apache.flink.test.util.MiniClusterWithClientResource; import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.Test; - +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.nio.file.Path; import java.util.Map; -import static org.junit.Assert.assertTrue; public class JobSplitTest { - @ClassRule - public static MiniClusterWithClientResource flinkCluster = - new MiniClusterWithClientResource( - new MiniClusterResourceConfiguration.Builder() - .setNumberSlotsPerTaskManager(1) - .setNumberTaskManagers(1) - .build()); @Test public void testSplit() { @@ -61,7 +50,7 @@ public class JobSplitTest { JobExecution jobExecution = new JobExecution(config, grootStreamConfig); jobExecution.execute(); - Assert.assertEquals(7, CollectSink.values.size()); + Assertions.assertEquals(7, CollectSink.values.size()); } } |
