SDK version 3

.gitignore

@@ -33,7 +33,6 @@
 *.idb
 
 # Kernel Module Compile Results
-*.mod*
 *.cmd
 modules.order
 Module.symvers
@@ -50,10 +49,6 @@ dkms.conf
 
 # Compiled Dynamic libraries
 
-# Fortran module files
-*.mod
-*.smod
-
 # Compiled Static libraries
 *.lai
 
@@ -165,16 +160,6 @@ Temporary Items
 # Visual Studio 2015 database file
 *.VC.db
 
-# Compiled Object files
-
-# Precompiled Headers
-
-# Compiled Dynamic libraries
-
-# Fortran module files
-
-# Compiled Static libraries
-
 # Executables
 *.ipa
 
@@ -547,10 +532,12 @@ NakamaBlueprintsTest/DerivedDataCache
 NakamaBlueprintsTest/Saved
 NakamaBlueprintsTest/Binaries
 
-NakamaTest/Plugins/Nakama
-NakamaTest/Intermediate
-NakamaTest/Saved
-NakamaTest/Binaries
+IntegrationTests/Plugins/Nakama
+IntegrationTests/Plugins/Satori
+IntegrationTests/Intermediate
+IntegrationTests/DerivedDataCache
+IntegrationTests/Saved
+IntegrationTests/Binaries
 
 Nakama/Intermediate
 Nakama/Saved
@@ -563,3 +550,16 @@ Satori/Binaries
 vcpkg_installed/
 /NakamaBlueprintsTest/Content/Developers
 /NakamaBlueprintsTest/Content/Collections
+.env
+proto/
+Reports/IntegrationTests/index.html
+Reports/IntegrationTests/index.json
+Reports/NakamaProfile/
+/IntegrationTests/Reports
+NakamaTest/Binaries
+NakamaTest/DerivedDataCache
+NakamaTest/Intermediate/
+NakamaTest/Saved/
+Reports
+IntegrationTests/satori/
+IntegrationTests/dashboards/

IntegrationTests/.editorconfig

@@ -0,0 +1,91 @@
+[*.{cpp,h}]
+
+# Naming convention rules (note: currently need to be ordered from more to less specific)
+
+cpp_naming_rule.aactor_prefixed.symbols                    = aactor_class
+cpp_naming_rule.aactor_prefixed.style                      = aactor_style
+
+cpp_naming_rule.swidget_prefixed.symbols                   = swidget_class
+cpp_naming_rule.swidget_prefixed.style                     = swidget_style
+
+cpp_naming_rule.uobject_prefixed.symbols                   = uobject_class
+cpp_naming_rule.uobject_prefixed.style                     = uobject_style
+
+cpp_naming_rule.booleans_prefixed.symbols                 = boolean_vars
+cpp_naming_rule.booleans_prefixed.style                   = boolean_style
+
+cpp_naming_rule.structs_prefixed.symbols                   = structs
+cpp_naming_rule.structs_prefixed.style                     = unreal_engine_structs
+
+cpp_naming_rule.enums_prefixed.symbols                     = enums
+cpp_naming_rule.enums_prefixed.style                       = unreal_engine_enums
+
+cpp_naming_rule.templates_prefixed.symbols                 = templates
+cpp_naming_rule.templates_prefixed.style                   = unreal_engine_templates
+
+cpp_naming_rule.general_names.symbols                      = all_symbols
+cpp_naming_rule.general_names.style                        = unreal_engine_default
+
+# Naming convention symbols         
+
+cpp_naming_symbols.aactor_class.applicable_kinds           = class
+cpp_naming_symbols.aactor_class.applicable_type            = AActor
+
+cpp_naming_symbols.swidget_class.applicable_kinds          = class
+cpp_naming_symbols.swidget_class.applicable_type           = SWidget
+
+cpp_naming_symbols.uobject_class.applicable_kinds          = class
+cpp_naming_symbols.uobject_class.applicable_type           = UObject
+
+cpp_naming_symbols.boolean_vars.applicable_kinds          = local,parameter,field
+cpp_naming_symbols.boolean_vars.applicable_type           = bool
+
+cpp_naming_symbols.enums.applicable_kinds                  = enum
+
+cpp_naming_symbols.templates.applicable_kinds              = template_class
+
+cpp_naming_symbols.structs.applicable_kinds                = struct
+
+cpp_naming_symbols.all_symbols.applicable_kinds            = *
+
+# Naming convention styles
+
+cpp_naming_style.unreal_engine_default.capitalization      = pascal_case
+cpp_naming_style.unreal_engine_default.required_prefix     =
+cpp_naming_style.unreal_engine_default.required_suffix     =
+cpp_naming_style.unreal_engine_default.word_separator      =
+
+cpp_naming_style.unreal_engine_enums.capitalization        = pascal_case
+cpp_naming_style.unreal_engine_enums.required_prefix       = E
+cpp_naming_style.unreal_engine_enums.required_suffix       =
+cpp_naming_style.unreal_engine_enums.word_separator        =
+
+cpp_naming_style.unreal_engine_templates.capitalization    = pascal_case
+cpp_naming_style.unreal_engine_templates.required_prefix   = T
+cpp_naming_style.unreal_engine_templates.required_suffix   =
+cpp_naming_style.unreal_engine_templates.word_separator    =
+
+cpp_naming_style.unreal_engine_structs.capitalization      = pascal_case
+cpp_naming_style.unreal_engine_structs.required_prefix     = F
+cpp_naming_style.unreal_engine_structs.required_suffix     =
+cpp_naming_style.unreal_engine_structs.word_separator      =
+
+cpp_naming_style.uobject_style.capitalization              = pascal_case
+cpp_naming_style.uobject_style.required_prefix             = U
+cpp_naming_style.uobject_style.required_suffix             =
+cpp_naming_style.uobject_style.word_separator              =
+
+cpp_naming_style.aactor_style.capitalization               = pascal_case
+cpp_naming_style.aactor_style.required_prefix              = A
+cpp_naming_style.aactor_style.required_suffix              =
+cpp_naming_style.aactor_style.word_separator               =
+
+cpp_naming_style.swidget_style.capitalization              = pascal_case
+cpp_naming_style.swidget_style.required_prefix             = S
+cpp_naming_style.swidget_style.required_suffix             =
+cpp_naming_style.swidget_style.word_separator              =
+
+cpp_naming_style.boolean_style.capitalization              = pascal_case
+cpp_naming_style.boolean_style.required_prefix             = b
+cpp_naming_style.boolean_style.required_suffix             =
+cpp_naming_style.boolean_style.word_separator              =

IntegrationTests/.vsconfig

@@ -0,0 +1,20 @@
+{
+  "version": "1.0",
+  "components": [
+    "Component.Unreal.Debugger",
+    "Component.Unreal.Ide",
+    "Microsoft.Net.Component.4.6.2.TargetingPack",
+    "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL",
+    "Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64",
+    "Microsoft.VisualStudio.Component.VC.14.44.17.14.ATL",
+    "Microsoft.VisualStudio.Component.VC.14.44.17.14.x86.x64",
+    "Microsoft.VisualStudio.Component.VC.Llvm.Clang",
+    "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
+    "Microsoft.VisualStudio.Component.Windows11SDK.22621",
+    "Microsoft.VisualStudio.Workload.CoreEditor",
+    "Microsoft.VisualStudio.Workload.ManagedDesktop",
+    "Microsoft.VisualStudio.Workload.NativeCrossPlat",
+    "Microsoft.VisualStudio.Workload.NativeDesktop",
+    "Microsoft.VisualStudio.Workload.NativeGame"
+  ]
+}

NakamaTest/Config/DefaultEngine.ini → IntegrationTests/Config/DefaultEngine.ini

@@ -2,8 +2,8 @@
 
 [/Script/EngineSettings.GameMapsSettings]
 GameInstanceClass=/Script/Engine.GameInstance
-EditorStartupMap=/Game/Maps/EmptyMap.EmptyMap
-GameDefaultMap=/Game/Maps/EmptyMap.EmptyMap
+EditorStartupMap=/Game/Maps/menu.menu
+GameDefaultMap=/Game/Maps/menu.menu
 
 [/Script/HardwareTargeting.HardwareTargetingSettings]
 TargetedHardwareClass=Desktop
@@ -12,9 +12,9 @@ DefaultGraphicsPerformance=Maximum
 AppliedDefaultGraphicsPerformance=Maximum
 
 [/Script/Engine.Engine]
-+ActiveGameNameRedirects=(OldGameName="TP_Blank",NewGameName="/Script/NakamaTest")
-+ActiveGameNameRedirects=(OldGameName="/Script/TP_Blank",NewGameName="/Script/NakamaTest")
-+ActiveClassRedirects=(OldClassName="TP_BlankGameModeBase",NewClassName="NakamaTestGameModeBase")
++ActiveGameNameRedirects=(OldGameName="TP_Blank",NewGameName="/Script/IntegrationTests")
++ActiveGameNameRedirects=(OldGameName="/Script/TP_Blank",NewGameName="/Script/IntegrationTests")
++ActiveClassRedirects=(OldClassName="TP_BlankGameModeBase",NewClassName="IntegrationTestsGameModeBase")
 
 [/Script/Engine.NetworkSettings]
 n.VerifyPeer=False

NakamaTest/NakamaTest.uproject → IntegrationTests/IntegrationTests.uproject

@@ -1,11 +1,11 @@
 {
 	"FileVersion": 3,
-	"EngineAssociation": "{EDE4B98B-4F6E-CD0F-7410-B3B99E43CB35}",
+	"EngineAssociation": "{C151EFA4-4AB5-6266-C2AA-BCA83C7CC033}",
 	"Category": "",
 	"Description": "",
 	"Modules": [
 		{
-			"Name": "NakamaTest",
+			"Name": "IntegrationTests",
 			"Type": "Runtime",
 			"LoadingPhase": "Default"
 		}
@@ -15,6 +15,10 @@
 			"Name": "Nakama",
 			"Enabled": true
 		},
+		{
+			"Name": "Satori",
+			"Enabled": true
+		},
 		{
 			"Name": "AutomationDriverTests",
 			"Enabled": true
@@ -30,6 +34,18 @@
 		{
 			"Name": "RuntimeTests",
 			"Enabled": true
+		},
+		{
+			"Name": "ModelViewViewModel",
+			"Enabled": true
+		},
+		{
+			"Name": "VisualStudioTools",
+			"Enabled": true,
+			"SupportedTargetPlatforms": [
+				"Win64"
+			],
+			"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/362651520df94e4fa65492dbcba44ae2"
 		}
 	]
-}
+}

IntegrationTests/README.md

@@ -0,0 +1,61 @@
+# Nakama Test Project
+This is a test Unreal Engine project testing the core features of the Nakama Unreal Engine plugin.
+
+# Build and Test
+Build the Nakama plugin and place it in the Plugins folder.
+
+Follow these instructions to package the example project:
+
+https://docs.unrealengine.com/4.27/en-US/Basics/Projects/Packaging/
+
+Follow these instructions to package the test project:
+
+https://docs.unrealengine.com/4.27/en-US/Basics/Projects/Packaging/
+
+### Windows
+
+To build the test, run:
+
+`$UNREAL_ENGINE/Engine/Build/BatchFiles/RunUAT.sh BuildCookRun -targetconfig=Debug -project="$NAKAMA_UNREAL/IntegrationTests/IntegrationTests.uproject" -noP4 -installed -utf8output -build -cook -stage -package -verbose -stdout -nohostplatform -useshellexecute`
+
+To run the test, run:
+
+```bash
+./IntegrationTests/Saved/StagedBuilds/Windows/IntegrationTests.exe -nullrhi -verbose -ExecCmds="Automation RunTests IntegrationTests.Core"
+```
+
+There appears to be a problem with logging to stdout on Windows, so you'll need to obtain the test logs from `IntegrationTests\Saved\StagedBuilds\Windows\IntegrationTests\Saved\Logs\IntegrationTests.log`.
+
+### Mac
+
+To build the test, run:
+
+`$UNREAL_ENGINE/Engine/Build/BatchFiles/RunUAT.sh BuildCookRun -project="$NAKAMA_UNREAL/IntegrationTests/IntegrationTests.uproject" -targetConfig=Debug -noP4 -platform=Mac -Architecture_Mac=arm64 -targetconfig=Debug -installed -unrealexe=UnrealEditor -utf8output -build -cook -stage -package -verbose`
+
+To run the test, run:
+
+`./IntegrationTests/Binaries/Mac/IntegrationTests.app/Contents/MacOS/IntegrationTests -nullrhi -stdout -forcelogflush -ExecCmds="Automation RunTests IntegrationTests.Core"`
+
+You can pass `List` instead to the `Automation` command to view all tests. It will include engine tests.
+
+You can also pass `-LogCmds="<LogCategory> verbose"` where `<LogCategory>` is one of those defined by `DEFINE_LOG_CATEGORY`.
+
+### Linux
+
+To build the test, run:
+
+`$UNREAL_ENGINE/Engine/Build/BatchFiles/RunUAT.sh BuildCookRun -project="$NAKAMA_UNREAL/IntegrationTests/IntegrationTests.uproject" -clientconfig=Test -noP4 -platform=Linux -targetconfig=Debug -installed  -utf8output -build -cook -stage -package -verbose`
+
+To run the test:
+
+`IntegrationTests/Binaries/Linux/IntegrationTests-Linux-Test -nullrhi -stdout -forcelogflush -ExecCmds="Automation RunTests IntegrationTests.Core"`
+
+To debug with LLDB on Mac:
+
+`lldb ${NAKAMA_UNREAL}/IntegrationTests/Binaries/Mac/IntegrationTests-Mac-Test.app/Contents/MacOS/IntegrationTests-Mac-Test`
+
+Set the startup args inside the lldb shell:
+
+`settings set -- target.run-args -nullrhi -stdout -forcelogflush -ExecCmds="Automation RunTests IntegrationTests.Core"`
+
+Then call `run`.

IntegrationTests/Source/IntegrationTests.Target.cs

@@ -0,0 +1,14 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+using UnrealBuildTool;
+using System.Collections.Generic;
+
+public class IntegrationTestsTarget : TargetRules
+{
+	public IntegrationTestsTarget( TargetInfo Target) : base(Target)
+	{
+		Type = TargetType.Game;
+		ExtraModuleNames.AddRange( new string[] { "IntegrationTests" } );
+		bUseLoggingInShipping = true;
+	}
+}

IntegrationTests/Source/IntegrationTests/IntegrationTests.Build.cs

@@ -0,0 +1,14 @@
+// Copyright 2023 The Nakama Authors.
+
+using System;
+using System.IO;
+using UnrealBuildTool;
+
+public class IntegrationTests : ModuleRules
+{
+	public IntegrationTests(ReadOnlyTargetRules Target) : base(Target)
+	{
+		PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
+		PrivateDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "FieldNotification", "InputCore", "Json", "HTTP", "NakamaApi", "Nakama", "NakamaBlueprints", "SatoriApi", "Satori", "SatoriBlueprints", "WebSockets", "Slate", "SlateCore", "UMG", "ModelViewViewModel" });
+	}
+}

IntegrationTests/Source/IntegrationTests/IntegrationTests.cpp

@@ -0,0 +1,6 @@
+// Copyright 2023 The Nakama Authors.
+
+#include "IntegrationTests.h"
+#include "CoreMinimal.h"
+
+IMPLEMENT_PRIMARY_GAME_MODULE(FDefaultGameModuleImpl, IntegrationTests, "IntegrationTests");

NakamaTest/Source/NakamaTest/NakamaTest.h → IntegrationTests/Source/IntegrationTests/IntegrationTests.h

@@ -4,7 +4,7 @@
 
 #include "CoreMinimal.h"
 
-class NakamaTest : public IModuleInterface
+class IntegrationTests : public IModuleInterface
 {
 public: