From b92645ac5647d6c12f0ff2af214c6c4ef6e58680 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 21 Feb 2010 17:59:00 -0800 Subject: MySQL tests pass, except T016_RandomSogWithSceneParts. Total mystery as to why that test doesn't show in panda. --- OpenSim/Data/Tests/BasicAssetTest.cs | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'OpenSim/Data/Tests/BasicAssetTest.cs') diff --git a/OpenSim/Data/Tests/BasicAssetTest.cs b/OpenSim/Data/Tests/BasicAssetTest.cs index 25aed61..967d70d 100644 --- a/OpenSim/Data/Tests/BasicAssetTest.cs +++ b/OpenSim/Data/Tests/BasicAssetTest.cs @@ -73,17 +73,23 @@ namespace OpenSim.Data.Tests a2.Data = asset1; a3.Data = asset1; + a1.Metadata.ContentType = "application/octet-stream"; + a2.Metadata.ContentType = "application/octet-stream"; + a3.Metadata.ContentType = "application/octet-stream"; + PropertyScrambler scrambler = new PropertyScrambler() .DontScramble(x => x.Data) .DontScramble(x => x.ID) .DontScramble(x => x.FullID) .DontScramble(x => x.Metadata.ID) + .DontScramble(x => x.Metadata.ContentType) .DontScramble(x => x.Metadata.FullID); scrambler.Scramble(a1); scrambler.Scramble(a2); scrambler.Scramble(a3); + db.StoreAsset(a1); db.StoreAsset(a2); db.StoreAsset(a3); -- cgit v1.1 From 7665aad002ef066fc31fa9497225d2668641c769 Mon Sep 17 00:00:00 2001 From: John Hurliman Date: Mon, 22 Feb 2010 13:27:17 -0800 Subject: * Adds CreatorID to asset metadata. This is just the plumbing to support CreatorID, it doesn't modify database backends or OAR files to support storing/loading it --- OpenSim/Data/Tests/BasicAssetTest.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'OpenSim/Data/Tests/BasicAssetTest.cs') diff --git a/OpenSim/Data/Tests/BasicAssetTest.cs b/OpenSim/Data/Tests/BasicAssetTest.cs index 25aed61..58a17c2 100644 --- a/OpenSim/Data/Tests/BasicAssetTest.cs +++ b/OpenSim/Data/Tests/BasicAssetTest.cs @@ -66,9 +66,9 @@ namespace OpenSim.Data.Tests [Test] public void T010_StoreSimpleAsset() { - AssetBase a1 = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture); - AssetBase a2 = new AssetBase(uuid2, "asset two", (sbyte)AssetType.Texture); - AssetBase a3 = new AssetBase(uuid3, "asset three", (sbyte)AssetType.Texture); + AssetBase a1 = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, UUID.Zero); + AssetBase a2 = new AssetBase(uuid2, "asset two", (sbyte)AssetType.Texture, UUID.Zero); + AssetBase a3 = new AssetBase(uuid3, "asset three", (sbyte)AssetType.Texture, UUID.Zero); a1.Data = asset1; a2.Data = asset1; a3.Data = asset1; -- cgit v1.1 From df76e95aa2dc9f3f3a0c546761b7624adc183ed0 Mon Sep 17 00:00:00 2001 From: John Hurliman Date: Mon, 22 Feb 2010 14:18:59 -0800 Subject: Changed asset CreatorID to a string --- OpenSim/Data/Tests/BasicAssetTest.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'OpenSim/Data/Tests/BasicAssetTest.cs') diff --git a/OpenSim/Data/Tests/BasicAssetTest.cs b/OpenSim/Data/Tests/BasicAssetTest.cs index 9ec294d..770926e 100644 --- a/OpenSim/Data/Tests/BasicAssetTest.cs +++ b/OpenSim/Data/Tests/BasicAssetTest.cs @@ -66,9 +66,9 @@ namespace OpenSim.Data.Tests [Test] public void T010_StoreSimpleAsset() { - AssetBase a1 = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, UUID.Zero); - AssetBase a2 = new AssetBase(uuid2, "asset two", (sbyte)AssetType.Texture, UUID.Zero); - AssetBase a3 = new AssetBase(uuid3, "asset three", (sbyte)AssetType.Texture, UUID.Zero); + AssetBase a1 = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, UUID.Zero.ToString()); + AssetBase a2 = new AssetBase(uuid2, "asset two", (sbyte)AssetType.Texture, UUID.Zero.ToString()); + AssetBase a3 = new AssetBase(uuid3, "asset three", (sbyte)AssetType.Texture, UUID.Zero.ToString()); a1.Data = asset1; a2.Data = asset1; a3.Data = asset1; -- cgit v1.1 From 763285aaf16283a2bad09359f9accf9b78e41c19 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Tue, 2 Mar 2010 07:29:41 -0800 Subject: Fixed SQL tests. --- OpenSim/Data/Tests/BasicAssetTest.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'OpenSim/Data/Tests/BasicAssetTest.cs') diff --git a/OpenSim/Data/Tests/BasicAssetTest.cs b/OpenSim/Data/Tests/BasicAssetTest.cs index 770926e..e80cff9 100644 --- a/OpenSim/Data/Tests/BasicAssetTest.cs +++ b/OpenSim/Data/Tests/BasicAssetTest.cs @@ -73,15 +73,12 @@ namespace OpenSim.Data.Tests a2.Data = asset1; a3.Data = asset1; - a1.Metadata.ContentType = "application/octet-stream"; - a2.Metadata.ContentType = "application/octet-stream"; - a3.Metadata.ContentType = "application/octet-stream"; - PropertyScrambler scrambler = new PropertyScrambler() .DontScramble(x => x.Data) .DontScramble(x => x.ID) .DontScramble(x => x.FullID) .DontScramble(x => x.Metadata.ID) + .DontScramble(x => x.Metadata.CreatorID) .DontScramble(x => x.Metadata.ContentType) .DontScramble(x => x.Metadata.FullID); -- cgit v1.1