4 files changed, 79 insertions, 0 deletions
diff --git a/tests/diagnostics/accessors.slang b/tests/diagnostics/accessors.slang
new file mode 100644
index 000000000..578c26791
--- /dev/null
+++ b/tests/diagnostics/accessors.slang
@@ -0,0 +1,20 @@
+// properties.slang
+
+// Diagnostic messages related to property/subscript accessor declarations.
+
+//DIAGNOSTIC_TEST:SIMPLE:
+
+struct Test
+{
+	property p : int
+	{
+		get(a) { return 0; }
+
+		set(a, b) { }
+	}
+
+	property q : float
+	{
+		set(c : int) { }
+	}
+}
diff --git a/tests/diagnostics/accessors.slang.expected b/tests/diagnostics/accessors.slang.expected
new file mode 100644
index 000000000..a73f31236
--- /dev/null
+++ b/tests/diagnostics/accessors.slang.expected
@@ -0,0 +1,8 @@
+result code = -1
+standard error = {
+tests/diagnostics/accessors.slang(11): error 31101: accessors other than 'set' must not have parameters
+tests/diagnostics/accessors.slang(13): error 31102: a 'set' accessor may not have more than one parameter
+tests/diagnostics/accessors.slang(18): error 31102: 'set' parameter 'c' has type 'int' which does not match the expected type 'float'
+}
+standard output = {
+}
diff --git a/tests/language-feature/properties/property-decl.slang b/tests/language-feature/properties/property-decl.slang
new file mode 100644
index 000000000..19267e42c
--- /dev/null
+++ b/tests/language-feature/properties/property-decl.slang
@@ -0,0 +1,47 @@
+// property-decl.slang
+
+//TEST(compute):COMPARE_COMPUTE:
+
+// Test that users can declare properties and access them
+// with ordinary dot syntax.
+
+struct Test
+{
+    int storage;
+
+    property value : int
+    {
+        get { return storage; }
+        set(newValue) { storage = newValue; }
+    }
+}
+
+int test(int val)
+{
+    Test t;
+    t.storage = 0;
+
+    // setter
+    t.value = val ^ 0x100;
+
+    // getter + setter
+    t.value ^= 0x1;
+
+    // getter
+    int result = t.value;
+
+    return result;
+}
+
+
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer
+RWStructuredBuffer<int> outputBuffer;
+
+[numthreads(4, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{
+    uint tid = dispatchThreadID.x;
+    int inVal = tid;
+    int outVal = test(inVal);
+    outputBuffer[tid] = outVal;
+}
diff --git a/tests/language-feature/properties/property-decl.slang.expected.txt b/tests/language-feature/properties/property-decl.slang.expected.txt
new file mode 100644
index 000000000..aae39d007
--- /dev/null
+++ b/tests/language-feature/properties/property-decl.slang.expected.txt
@@ -0,0 +1,4 @@
+101
+100
+103
+102