New Shader Graph serialization format

LocalTestProjects/HDRP_DebugCrossFade_Tests/Packages/manifest.json

@@ -15,7 +15,7 @@
     "com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core",
     "com.unity.render-pipelines.high-definition": "file:../../../com.unity.render-pipelines.high-definition",
     "com.unity.shadergraph": "file:../../../com.unity.shadergraph",
-    "com.unity.test-framework": "1.0.13",
+    "com.unity.test-framework": "1.1.14",
     "com.unity.testframework.graphics": "file:../../../com.unity.testframework.graphics",
     "com.unity.testing.hdrp": "file:../../../com.unity.testing.hdrp",
     "com.unity.textmeshpro": "2.0.1",

TestProjects/HDRP_DXR_Tests/Packages/manifest.json

@@ -13,8 +13,8 @@
     "com.unity.render-pipelines.high-definition": "file:../../../com.unity.render-pipelines.high-definition",
     "com.unity.render-pipelines.high-definition-config": "file:../LocalPackages/com.unity.render-pipelines.high-definition-config",
     "com.unity.shadergraph": "file:../../../com.unity.shadergraph",
-    "com.unity.test-framework": "1.1.11",
-    "com.unity.testframework.graphics": "7.1.12-preview",
+    "com.unity.test-framework": "1.1.14",
+    "com.unity.testframework.graphics": "7.1.13-preview",
     "com.unity.testing.hdrp": "file:../../../com.unity.testing.hdrp",
     "com.unity.textmeshpro": "3.0.0-preview.1",
     "com.unity.timeline": "1.2.6",

TestProjects/HDRP_PerformanceTests/Packages/manifest.json

@@ -8,8 +8,8 @@
     "com.unity.render-pipelines.high-definition-config": "file:../../../com.unity.render-pipelines.high-definition-config",
     "com.unity.shaderanalysis": "file:../../../com.unity.shaderanalysis",
     "com.unity.shadergraph": "file:../../../com.unity.shadergraph",
-    "com.unity.test-framework.build": "0.0.1-preview.3",
-    "com.unity.test-framework": "1.1.11",
+    "com.unity.test-framework.build": "0.0.1-preview.12",
+    "com.unity.test-framework": "1.1.14",
     "com.unity.test-framework.performance": "2.0.8-preview",
     "com.unity.testing.graphics-performance": "file:../../../com.unity.testing.graphics-performance",
     "com.unity.ugui": "1.0.0",

TestProjects/HDRP_RuntimeTests/Packages/manifest.json

@@ -7,10 +7,10 @@
     "com.unity.render-pipelines.high-definition": "file:../../../com.unity.render-pipelines.high-definition",
     "com.unity.render-pipelines.high-definition-config": "file:../../../com.unity.render-pipelines.high-definition-config",
     "com.unity.shadergraph": "file:../../../com.unity.shadergraph",
-    "com.unity.test-framework": "1.1.5",
-    "com.unity.test-framework.build": "0.0.1-preview.3",
-    "com.unity.test-framework.utp-reporter": "0.1.3-preview.17",
-    "com.unity.testframework.graphics": "7.1.12-preview",
+    "com.unity.test-framework": "1.1.14",
+    "com.unity.test-framework.build": "0.0.1-preview.12",
+    "com.unity.test-framework.utp-reporter": "1.0.0-preview",
+    "com.unity.testframework.graphics": "7.1.13-preview",
     "com.unity.testing.hdrp": "file:../../../com.unity.testing.hdrp",
     "com.unity.ugui": "1.0.0",
     "com.unity.visualeffectgraph": "file:../../../com.unity.visualeffectgraph",

TestProjects/HDRP_Tests/Packages/manifest.json

@@ -7,8 +7,8 @@
     "com.unity.render-pipelines.high-definition": "file:../../../com.unity.render-pipelines.high-definition",
     "com.unity.render-pipelines.high-definition-config": "file:../../../com.unity.render-pipelines.high-definition-config",
     "com.unity.shadergraph": "file:../../../com.unity.shadergraph",
-    "com.unity.test-framework": "1.1.5",
-    "com.unity.testframework.graphics": "7.1.12-preview",
+    "com.unity.test-framework": "1.1.14",
+    "com.unity.testframework.graphics": "7.1.13-preview",
     "com.unity.testing.hdrp": "file:../../../com.unity.testing.hdrp",
     "com.unity.ugui": "1.0.0",
     "com.unity.visualeffectgraph": "file:../../../com.unity.visualeffectgraph",

TestProjects/SRP_SmokeTest/Packages/manifest.json

@@ -5,8 +5,8 @@
     "com.unity.render-pipelines.high-definition-config": "file:../../../com.unity.render-pipelines.high-definition-config",
     "com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal",
     "com.unity.shadergraph": "file:../../../com.unity.shadergraph",
-    "com.unity.test-framework": "1.1.5",
-    "com.unity.testframework.graphics": "7.1.12-preview",
+    "com.unity.test-framework": "1.1.14",
+    "com.unity.testframework.graphics": "7.1.13-preview",
     "com.unity.ugui": "1.0.0",
     "com.unity.visualeffectgraph": "file:../../../com.unity.visualeffectgraph",
     "com.unity.xr.legacyinputhelpers": "2.1.2",
@@ -41,8 +41,8 @@
     "com.unity.modules.vr": "1.0.0",
     "com.unity.modules.wind": "1.0.0",
     "com.unity.modules.xr": "1.0.0",
-	"com.unity.test-framework.utp-reporter": "0.1.3-preview.17",
-    "com.unity.test-framework.build": "0.0.1-preview.3"
+	"com.unity.test-framework.utp-reporter": "1.0.0-preview",
+    "com.unity.test-framework.build": "0.0.1-preview.12"
   },
   "testables": [
     "com.unity.render-pipelines.core",

TestProjects/ShaderGraph/Assets/CommonAssets/Editor/AddAllNodesTest.cs

@@ -32,7 +32,7 @@ public void ClearGraph()
                 var allNodes = m_Graph.GetNodes<AbstractMaterialNode>().ToArray();
                 foreach (var node in allNodes)
                 {
-                    if(m_Graph.activeOutputNodeGuid != node.guid)
+                    if(m_Graph.outputNode != node)
                         m_Graph.RemoveNode(node);
                 }
             }

TestProjects/ShaderGraph/Assets/CommonAssets/Editor/EdgeTypeConversionTests.cs

@@ -6,6 +6,7 @@
 using UnityEditor.Graphing;
 using UnityEditor.Graphing.Util;
 using UnityEditor.Rendering;
+using UnityEditor.ShaderGraph.Serialization;
 using UnityEngine;
 
 namespace UnityEditor.ShaderGraph.UnitTests
@@ -17,9 +18,10 @@ public void Initialize(string graphPath)
             hideFlags = HideFlags.HideAndDontSave;
 
             var textGraph = File.ReadAllText(graphPath, Encoding.UTF8);
-            graph = JsonUtility.FromJson<GraphData>(textGraph);
+            graph = new GraphData();
             graph.messageManager = new MessageManager();
             graph.assetGuid = AssetDatabase.AssetPathToGUID(graphPath);
+            MultiJson.Deserialize(graph, textGraph);
             graph.OnEnable();
             graph.ValidateGraph();
         }
@@ -59,7 +61,7 @@ public void TestAllCombos()
                 var edge = m_Graph.GetEdges(slot.slotReference).FirstOrDefault();
                 if (edge == null) continue;
 
-                var outputNode = m_Graph.GetNodeFromGuid(edge.outputSlot.nodeGuid);
+                var outputNode = edge.outputSlot.node;
                 var outputSlot = outputNode.GetOutputSlots<MaterialSlot>().First(s => s.id == edge.outputSlot.slotId);
                 var curOutputType = outputSlot.valueType.ToConcreteSlotValueType();
 
@@ -73,7 +75,7 @@ public void TestAllCombos()
                     // Verify all errors are expected
                     foreach (var message in m_Graph.messageManager.GetNodeMessages())
                     {
-                        if (message.Key.Equals(m_CFNode.guid) && message.Value.Exists(msg =>
+                        if (message.Key.Equals(m_CFNode.objectId) && message.Value.Exists(msg =>
                             msg.severity == ShaderCompilerMessageSeverity.Error))
                         {
                             Assert.IsFalse(SlotValueHelper.AreCompatible(slotValType, curOutputType),
@@ -105,17 +107,17 @@ public void RedirectNodes_DoNotAffectOutput()
                 var edge = m_Graph.GetEdges(slot.slotReference).FirstOrDefault();
                 if (edge == null) continue;
 
-                var outputNode = m_Graph.GetNodeFromGuid(edge.outputSlot.nodeGuid);
+                var outputNode = edge.outputSlot.node;
                 var outputSlot = outputNode.GetOutputSlots<MaterialSlot>().First(s => s.id == edge.outputSlot.slotId);
 
-                RedirectNodeData.Create(m_Graph, outputSlot.valueType, Vector2.zero, edge.inputSlot, edge.outputSlot, Guid.Empty);
+                RedirectNodeData.Create(m_Graph, outputSlot.valueType, Vector2.zero, edge.inputSlot, edge.outputSlot, null);
 
                 m_Graph.ValidateGraph();
 
                 // Verify all errors are expected
                 foreach (var message in m_Graph.messageManager.GetNodeMessages())
                 {
-                    if (message.Key.Equals(m_CFNode.guid) && message.Value.Exists(msg =>
+                    if (message.Key.Equals(m_CFNode.objectId) && message.Value.Exists(msg =>
                         msg.severity == ShaderCompilerMessageSeverity.Error))
                     {
                         Assert.Fail(message.Value.FirstOrDefault().message);

TestProjects/ShaderGraph/Assets/CommonAssets/Editor/ImportUpdateTests.cs

@@ -0,0 +1,57 @@
+using NUnit.Framework;
+using System.Collections;
+using System.IO;
+using UnityEditor.Graphing.Util;
+using UnityEditor.ShaderGraph.Serialization;
+using UnityEngine;
+
+namespace UnityEditor.ShaderGraph.UnitTests
+{
+    [TestFixture]
+    class ImportUpdateTests
+    {
+        public class ImportCases : IEnumerable
+        {
+            private const string kGraphsLocation = "PreviousGraphVersions/";
+            public IEnumerator GetEnumerator()
+            {
+                return Directory.GetFiles(Application.dataPath + "/../" + kGraphsLocation, "*", SearchOption.AllDirectories).GetEnumerator();
+            }
+        }
+
+        [OneTimeSetUp]
+        public void Setup()
+        {
+            if(!AssetDatabase.IsValidFolder("Assets/Testing/ImportTests"))
+            {
+                AssetDatabase.CreateFolder("Assets/Testing", "ImportTests");
+            }
+        }
+
+        [TestCaseSource(typeof(ImportCases))]
+        public void CopyOverAndImport(string assetPath)
+        {
+            string fileName = Path.GetFileName(assetPath);
+            string fileContents = File.ReadAllText(assetPath);
+            string localFilePath = "Assets/Testing/ImportTests/" + fileName;
+            File.WriteAllText(Application.dataPath + "/Testing/ImportTests/" + fileName, fileContents);
+            AssetDatabase.ImportAsset(localFilePath);
+            var graphGuid = AssetDatabase.AssetPathToGUID(localFilePath);
+            var messageManager = new MessageManager();
+            GraphData graphData = new GraphData() { assetGuid = graphGuid, messageManager = messageManager };
+            MultiJson.Deserialize(graphData, fileContents);
+            graphData.OnEnable();
+            graphData.ValidateGraph();
+        }
+
+        [OneTimeTearDown]
+        public void Cleanup()
+        {
+            foreach (string assetGuid in AssetDatabase.FindAssets("*", new string[] { "Assets/Testing/ImportTests" }))
+            {
+                Debug.Log(AssetDatabase.GUIDToAssetPath(assetGuid));
+                AssetDatabase.DeleteAsset(AssetDatabase.GUIDToAssetPath(assetGuid));
+            }
+        }
+    }
+}

TestProjects/ShaderGraph/Assets/CommonAssets/Editor/KeywordTests.cs

@@ -221,7 +221,7 @@ public void KeywordNodesHaveCorrectPorts()
 
             foreach(KeywordNode keywordNode in keywordNodes)
             {
-                ShaderKeyword keyword = m_Graph.keywords.Where(x => x.guid == keywordNode.keywordGuid).FirstOrDefault();
+                ShaderKeyword keyword = keywordNode.keyword;
                 if(keyword == null)
                 {
                     Assert.Fail("No matching Keyword found in graph.");
@@ -292,10 +292,10 @@ public void CanGetPermutationMapPerNode()
             }
 
             var keywordNodes = m_Graph.GetNodes<KeywordNode>().ToList();
-            KeywordNode booleanANode = keywordNodes.Where(x => x.keywordGuid == booleanAKeyword.guid).FirstOrDefault();
-            KeywordNode booleanBNode = keywordNodes.Where(x => x.keywordGuid == booleanBKeyword.guid).FirstOrDefault();
-            KeywordNode enumANode = keywordNodes.Where(x => x.keywordGuid == enumAKeyword.guid).FirstOrDefault();
-            KeywordNode enumBNode = keywordNodes.Where(x => x.keywordGuid == enumBKeyword.guid).FirstOrDefault();
+            KeywordNode booleanANode = keywordNodes.Where(x => x.keyword == booleanAKeyword).FirstOrDefault();
+            KeywordNode booleanBNode = keywordNodes.Where(x => x.keyword == booleanBKeyword).FirstOrDefault();
+            KeywordNode enumANode = keywordNodes.Where(x => x.keyword == enumAKeyword).FirstOrDefault();
+            KeywordNode enumBNode = keywordNodes.Where(x => x.keyword == enumBKeyword).FirstOrDefault();
             if(booleanANode == null || booleanBNode == null || enumANode == null || enumBNode == null)
             {
                 Assert.Fail("One or more Keywords Nodes not in graph.");
@@ -329,8 +329,8 @@ public void KeywordEnumCanAddAndRemovePort()
             }
 
             var keywordNodes = m_Graph.GetNodes<KeywordNode>().ToList();
-            KeywordNode enumANode = keywordNodes.Where(x => x.keywordGuid == enumAKeyword.guid).FirstOrDefault();
-            KeywordNode enumBNode = keywordNodes.Where(x => x.keywordGuid == enumBKeyword.guid).FirstOrDefault();
+            KeywordNode enumANode = keywordNodes.Where(x => x.keyword == enumAKeyword).FirstOrDefault();
+            KeywordNode enumBNode = keywordNodes.Where(x => x.keyword == enumBKeyword).FirstOrDefault();
             if (enumANode == null || enumBNode == null)
             {
                 Assert.Fail("One or more Keywords Nodes not in graph.");
@@ -353,8 +353,8 @@ public void KeywordEnumCanAddAndRemovePort()
             enumANode.UpdateNode();
             enumBNode.UpdateNode();
 
-            Assert.AreEqual(7, enumANode.GetSlots<ISlot>().Count(), "Enum A Node has incorrect # of entries after adding");
-            Assert.AreEqual(6, enumBNode.GetSlots<ISlot>().Count(), "Enum B Node has incorrect # of entries after adding");
+            Assert.AreEqual(7, enumANode.GetSlots<MaterialSlot>().Count(), "Enum A Node has incorrect # of entries after adding");
+            Assert.AreEqual(6, enumBNode.GetSlots<MaterialSlot>().Count(), "Enum B Node has incorrect # of entries after adding");
 
             enumAKeyword.entries.Remove(newEntry1);
             enumAKeyword.entries.Remove(newEntry2);
@@ -367,8 +367,8 @@ public void KeywordEnumCanAddAndRemovePort()
             enumANode.UpdateNode();
             enumBNode.UpdateNode();
 
-            Assert.AreEqual(4, enumANode.GetSlots<ISlot>().Count(), "Enum A Node has incorrect # of entries after removing");
-            Assert.AreEqual(5, enumBNode.GetSlots<ISlot>().Count(), "Enum B Node has incorrect # of entries after removing");
+            Assert.AreEqual(4, enumANode.GetSlots<MaterialSlot>().Count(), "Enum A Node has incorrect # of entries after removing");
+            Assert.AreEqual(5, enumBNode.GetSlots<MaterialSlot>().Count(), "Enum B Node has incorrect # of entries after removing");
         }
     }
 }

TestProjects/ShaderGraph/Assets/CommonAssets/Editor/PrecisionTests.cs

@@ -27,8 +27,8 @@ public void LoadGraph()
             Assert.AreNotEqual(0, previewNodes.Count, $"No PreviewNode found in {kGraphName}.");
             foreach(PreviewNode node in previewNodes)
             {
-                GroupData group = m_Graph.groups.Where(x => x.guid == node.groupGuid).FirstOrDefault();
-                Assert.NotNull(m_Graph, $"Invalid group data found for PreviewNode with guid {node.guid}");
+                GroupData group = m_Graph.groups.Where(x => x == node.group).FirstOrDefault();
+                Assert.NotNull(m_Graph, $"Invalid group data found for PreviewNode with guid {node.objectId}");
                 m_TestNodes.Add(group.title, node);
             }
         }

TestProjects/ShaderGraph/Packages/manifest.json

@@ -5,10 +5,10 @@
     "com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core",
     "com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal",
     "com.unity.shadergraph": "file:../../../com.unity.shadergraph",
-    "com.unity.test-framework": "1.1.11",
+    "com.unity.test-framework": "1.1.14",
     "com.unity.test-framework.build": "0.0.1-preview.12",
-    "com.unity.test-framework.utp-reporter": "0.1.3-preview.18",
-    "com.unity.testframework.graphics": "7.1.12-preview",
+    "com.unity.test-framework.utp-reporter": "1.0.0-preview",
+    "com.unity.testframework.graphics": "7.1.13-preview",
     "com.unity.testtools.codecoverage": "0.2.2-preview",
     "com.unity.ugui": "1.0.0",
     "com.unity.xr.interactionsubsystems": "1.0.1",