gamestate analyser wip

tests/entity.rs

@@ -195,7 +195,5 @@ fn entity_test(input_file: &str, snapshot_file: &str) {
 
 #[test]
 fn entity_test_short() {
-    better_panic::install();
-
     entity_test("data/small.dem", "data/small_entities.json");
 }

tests/sendprops.rs

@@ -7,7 +7,9 @@ use std::fs;
 
 use std::collections::{HashMap, HashSet};
 use tf_demo_parser::demo::message::Message;
-use tf_demo_parser::demo::packet::datatable::{ParseSendTable, SendTable, SendTableName};
+use tf_demo_parser::demo::packet::datatable::{
+    ParseSendTable, SendTable, SendTableName, ServerClass,
+};
 use tf_demo_parser::demo::packet::stringtable::StringTableEntry;
 use tf_demo_parser::demo::parser::MessageHandler;
 use tf_demo_parser::demo::sendprop::SendPropDefinition;
@@ -30,7 +32,7 @@ impl MessageHandler for SendPropAnalyser {
         false
     }
 
-    fn handle_data_tables(&mut self, tables: &[ParseSendTable]) {
+    fn handle_data_tables(&mut self, tables: &[ParseSendTable], server_classes: &[ServerClass]) {
         self.tables = tables.to_vec()
     }
 

tests/tests.rs

@@ -1,6 +1,7 @@
 use pretty_assertions::assert_eq;
 use std::fs;
 
+use tf_demo_parser::demo::parser::gamestateanalyser::{GameState, GameStateAnalyser};
 use tf_demo_parser::{Demo, DemoParser, MatchState, MessageType, MessageTypeAnalyser};
 
 fn snapshot_test(input_file: &str, snapshot_file: &str) {
@@ -32,6 +33,21 @@ fn test_message_types(input_file: &str, snapshot_file: &str) {
     assert_eq!(expected, message_types);
 }
 
+fn game_state_test(input_file: &str, snapshot_file: &str) {
+    let file = fs::read(input_file).expect("Unable to read file");
+    let demo = Demo::new(file);
+    let (_, state) =
+        DemoParser::parse_with_analyser(demo.get_stream(), GameStateAnalyser::new()).unwrap();
+
+    let expected: GameState = serde_json::from_slice(
+        fs::read(snapshot_file)
+            .expect("Unable to read file")
+            .as_slice(),
+    )
+    .unwrap();
+    assert_eq!(expected, state);
+}
+
 #[test]
 fn snapshot_test_small() {
     snapshot_test("data/small.dem", "data/small.json");
@@ -56,3 +72,13 @@ fn snapshot_test_malformed_cvar() {
 fn snapshot_test_decal() {
     snapshot_test("data/decal.dem", "data/decal.json");
 }
+
+#[test]
+fn game_state_test_small() {
+    game_state_test("data/small.dem", "data/small_game_state.json");
+}
+
+#[test]
+fn game_state_test_gully() {
+    game_state_test("data/gully.dem", "data/gully_game_state.json");
+}