Skip to content

Commit 8da187b

Browse files
committed
fix FbxPrefabAutoUpdater.cs warnings
1 parent a3522f0 commit 8da187b

File tree

5 files changed

+174
-109
lines changed

5 files changed

+174
-109
lines changed

Assets/com.unity.formats.fbx.tests/FbxPrefabAutoUpdaterTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void BasicTest ()
4343
{
4444
var fbxPrefabPath = FbxPrefabAutoUpdater.FindFbxPrefabAssetPath ();
4545
Assert.IsFalse (string.IsNullOrEmpty (fbxPrefabPath));
46-
Assert.IsTrue (fbxPrefabPath.EndsWith (FbxPrefabAutoUpdater.FBX_PREFAB_FILE));
46+
Assert.IsTrue (fbxPrefabPath.EndsWith (FbxPrefabAutoUpdater.FbxPrefabFile));
4747

4848
Assert.IsTrue (FbxPrefabAutoUpdater.IsFbxAsset ("Assets/path/to/foo.fbx"));
4949
Assert.IsFalse (FbxPrefabAutoUpdater.IsFbxAsset ("Assets/path/to/foo.png"));

Assets/com.unity.formats.fbx.tests/FbxPrefabTest.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ FbxPrefabAutoUpdater.FbxPrefabUtility.FbxRepresentation Rep(GameObject go) {
187187
}
188188

189189
FbxPrefabAutoUpdater.FbxPrefabUtility.FbxRepresentation History(GameObject go) {
190-
return new FbxPrefabAutoUpdater.FbxPrefabUtility(go.GetComponent<FbxPrefab>()).GetFbxHistory();
190+
return new FbxPrefabAutoUpdater.FbxPrefabUtility(go.GetComponent<FbxPrefab>()).FbxHistory;
191191
}
192192

193193
GameObject ModifySourceFbx()
@@ -270,7 +270,7 @@ public void BasicTest() {
270270
AssertAreIdentical(newHistory, History(m_manualPrefab));
271271

272272
// Check some corner cases.
273-
Assert.AreEqual(m_source, manualFbxPrefabUtility.GetFbxAsset());
273+
Assert.AreEqual(m_source, manualFbxPrefabUtility.FbxAsset);
274274

275275
// Illegal to set the source model to something that isn't an
276276
// asset.
@@ -287,7 +287,7 @@ public void BasicTest() {
287287
// hierarchy or anything.
288288
Debug.Log("Testing SetSourceModel to null");
289289
Assert.That( () => manualFbxPrefabUtility.SetSourceModel(null), Throws.Nothing );
290-
Assert.IsNull(manualFbxPrefabUtility.GetFbxAsset());
290+
Assert.IsNull(manualFbxPrefabUtility.FbxAsset);
291291
AssertAreIdentical(newHierarchy, Rep(m_manualPrefab));
292292
AssertAreIdentical(newHistory, History(m_manualPrefab));
293293
Assert.That( () => manualFbxPrefabUtility.SyncPrefab(), Throws.Nothing );
@@ -429,7 +429,7 @@ public void TestTransformAndReparenting()
429429
GetRandomFbxFilePath(), root);
430430
SleepForFileTimestamp();
431431

432-
var destFile = new FbxPrefabAutoUpdater.FbxPrefabUtility (original.GetComponent<FbxPrefab> ()).GetFbxAssetPath ();
432+
var destFile = new FbxPrefabAutoUpdater.FbxPrefabUtility (original.GetComponent<FbxPrefab> ()).FbxAssetPath;
433433
if (System.IO.File.Exists (destFile)) {
434434
System.IO.File.Delete (destFile);
435435
}

0 commit comments

Comments
 (0)