Perform more tests for property types.

EliotVU · Jan 14, 2023 · 889b671 · 889b671
1 parent 0ac5033
commit 889b671
Show file tree

Hide file tree

Showing 8 changed files with 131 additions and 12 deletions.
diff --git a/Test/upk/TestUC2/Classes/DefaultProperties.uc b/Test/upk/TestUC2/Classes/DefaultProperties.uc
@@ -1,8 +1,21 @@
-class DefaultProperties extends Object;
+class DefaultProperties extends DefaultPropertiesBase;
 
 // Primitives
-var string String;
+var byte Byte;
+var int Int;
+// var bool Bool;
 var float Float;
+var name NameProperty;
+// var string[255] String;
+var string String;
+
+// var delegate<OnDelegate> Delegate;
+var Object Object;
+var Class<DefaultProperties> MetaClass;
+
+// FixedArray
+var byte ByteFixedArray[2];
+var int IntFixedArray[2];
 
 // Structs
 var Guid Guid;
@@ -17,12 +30,30 @@ var Color Color;
 var Box Box;
 
 var Matrix Matrix;
+var pointer Pointer;
+
+delegate OnDelegate();
+private function InternalOnDelegate();
 
 defaultproperties
 {
+    BoolTrue=true
+    BoolFalse=false
+
+    Byte=255
+    Int=1000
+	Float=.0123456789
+    NameProperty="Name"
 	// ASCII
 	String="String_\"\\\0\a\b\f\n\r\t\v"
-	Float=.0123456789
+
+    Object=Object'DefaultProperties'
+    MetaClass=Class'DefaultProperties'
+
+    ByteFixedArray[0]=1
+    IntFixedArray[0]=1
+    IntFixedArray[1]=2
+
 	Vector=(X=1.0,Y=2.0,Z=3.0)
 	Plane=(W=0.0,X=1.0,Y=2.0,Z=3.0)
 	Rotator=(Pitch=180,Yaw=90,Roll=45)
@@ -33,4 +64,12 @@ defaultproperties
 	Color=(B=20,G=40,R=80,A=160)
 	Box=(Min=(X=0,Y=1,Z=2),Max=(X=0,Y=2,Z=1),IsValid=1)
 	Matrix=(XPlane=(W=0,X=1,Y=2,Z=3),YPlane=(W=4,X=5,Y=6,Z=7),ZPlane=(W=8,X=9,Y=10,Z=11),WPlane=(W=12,X=13,Y=14,Z=15))
-}
+
+    Pointer=+1
+
+//    begin object name=__DefaultProperties class=DefaultProperties
+//        OnDelegate=none
+//    end object
+    OnDelegate=DefaultProperties.InternalOnDelegate
+    //Delegate=__DefaultProperties.InternalOnDelegate
+}
diff --git a/Test/upk/TestUC2/Classes/DefaultPropertiesBase.uc b/Test/upk/TestUC2/Classes/DefaultPropertiesBase.uc
@@ -0,0 +1,11 @@
+class DefaultPropertiesBase extends Object;
+
+// Primitives
+var bool BoolTrue, BoolFalse;
+
+defaultproperties
+{
+    // Reversed to test inheritance.
+    BoolTrue=false
+    BoolFalse=true
+}
diff --git a/Test/upk/TestUC2/TestUC2.u b/Test/upk/TestUC2/TestUC2.u
diff --git a/Test/upk/TestUC3/Classes/DefaultProperties.uc b/Test/upk/TestUC3/Classes/DefaultProperties.uc
@@ -1,8 +1,21 @@
-class DefaultProperties extends Object;
+class DefaultProperties extends DefaultPropertiesBase;
 
 // Primitives
-var string String;
+var byte Byte;
+var int Int;
+// var bool Bool;
 var float Float;
+var name NameProperty;
+// var string[255] String;
+var string String;
+
+var Object Object;
+var Class<DefaultProperties> MetaClass;
+var delegate<OnDelegate> Delegate;
+
+// FixedArray
+var byte ByteFixedArray[2];
+var int IntFixedArray[2];
 
 // Structs
 var Guid Guid;
@@ -19,11 +32,31 @@ var LinearColor LinearColor;
 var Box Box;
 var Matrix Matrix;
 
+var array<bool> BoolArray;
+
+delegate OnDelegate();
+private function InternalOnDelegate();
+
 defaultproperties
 {
+    BoolTrue=true
+    BoolFalse=false
+
+    Byte=255
+    Int=1000
+	Float=.0123456789
+    NameProperty="Name"
 	// ASCII
 	String="String_\"\\\0\a\b\f\n\r\t\v"
-	Float=.0123456789
+
+    Object=Object'DefaultProperties'
+    MetaClass=Class'DefaultProperties'
+    Delegate=InternalOnDelegate
+
+    ByteFixedArray[0]=1
+    IntFixedArray[0]=1
+    IntFixedArray[1]=2
+
 	Vector=(X=1.0,Y=2.0,Z=3.0)
 	Vector4=(X=1.0,Y=2.0,Z=3.0,W=4.0)
 	Vector2D=(X=1.0,Y=2.0)
@@ -43,4 +76,9 @@ defaultproperties
 		ZPlane=(W=8,X=9,Y=10,Z=11),
 		WPlane=(W=12,X=13,Y=14,Z=15)
 	)}
-}
+
+    BoolArray(0)=true
+    BoolArray(1)=false
+
+    OnDelegate=DefaultProperties.InternalOnDelegate
+}
diff --git a/Test/upk/TestUC3/Classes/DefaultPropertiesBase.uc b/Test/upk/TestUC3/Classes/DefaultPropertiesBase.uc
@@ -0,0 +1,11 @@
+class DefaultPropertiesBase extends Object;
+
+// Primitives
+var bool BoolTrue, BoolFalse;
+
+defaultproperties
+{
+    // Reversed to test inheritance.
+    BoolTrue=false
+    BoolFalse=true
+}
diff --git a/Test/upk/TestUC3/TestUC3.u b/Test/upk/TestUC3/TestUC3.u
diff --git a/Test/upk/UE2PackageContentTests.cs b/Test/upk/UE2PackageContentTests.cs
@@ -44,10 +44,20 @@ public void TestScriptContent()
             void AssertDefaults(UnrealPackage unrealPackage)
             {
                 var defaults = AssertDefaultPropertiesClass(unrealPackage);
-                AssertPropertyTagFormat(defaults, "String",
-                    "\"String_\\\"\\\\0abfnrtv\"");
+                AssertPropertyTagFormat(defaults, "BoolTrue",
+                    "true");
+                AssertPropertyTagFormat(defaults, "BoolFalse",
+                    "false");
+                AssertPropertyTagFormat(defaults, "Byte",
+                    "255");
+                AssertPropertyTagFormat(defaults, "Int",
+                    "1000");
                 AssertPropertyTagFormat(defaults, "Float",
                     "0.0123457");
+                AssertPropertyTagFormat(defaults, "NameProperty",
+                    "\"Name\"");
+                AssertPropertyTagFormat(defaults, "String",
+                    "\"String_\\\"\\\\0abfnrtv\"");
                 AssertPropertyTagFormat(defaults, "Vector",
                     "(X=1.0000000,Y=2.0000000,Z=3.0000000)");
                 // Not atomic!

diff --git a/Test/upk/UE3PackageContentTests.cs b/Test/upk/UE3PackageContentTests.cs
@@ -27,10 +27,20 @@ public void TestScriptContent()
             void AssertDefaults(UnrealPackage unrealPackage)
             {
                 var defaults = AssertDefaultPropertiesClass(unrealPackage);
-                //UnrealPackageTests.AssertPropertyTagFormat(defaults, "String",
-                //    "\"String_\\\"\\\\0abf\\\\n\\\\rtv\"");
+                AssertPropertyTagFormat(defaults, "BoolTrue",
+                    "true");
+                AssertPropertyTagFormat(defaults, "BoolFalse",
+                    "false");
+                AssertPropertyTagFormat(defaults, "Byte",
+                    "255");
+                AssertPropertyTagFormat(defaults, "Int",
+                    "1000");
                 AssertPropertyTagFormat(defaults, "Float",
                     "0.0123457");
+                AssertPropertyTagFormat(defaults, "NameProperty",
+                    "\"Name\"");
+                //UnrealPackageTests.AssertPropertyTagFormat(defaults, "String",
+                //    "\"String_\\\"\\\\0abf\\\\n\\\\rtv\"");
                 AssertPropertyTagFormat(defaults, "Vector",
                     "(X=1.0000000,Y=2.0000000,Z=3.0000000)");
                 AssertPropertyTagFormat(defaults, "Vector4",