Revert "Refactored how asset/inventory types are associated with content types: gathered all the knowledge into a single class. Added the Mesh content type."

This reverts commit d3a4d67a207976cd0d116bb9021f7dfc896784e8.

Accidentally committed this when I didn't mean to yet.

1 files changed, 12 insertions, 11 deletions

diff --git a/OpenSim/Framework/Tests/UtilTest.cs b/OpenSim/Framework/Tests/UtilTest.cs
index f0d2a3f..1ca35df 100644
--- a/OpenSim/Framework/Tests/UtilTest.cs
+++ b/OpenSim/Framework/Tests/UtilTest.cs
@@ -214,13 +214,16 @@ namespace OpenSim.Framework.Tests
 
             for (int i = 0; i < contenttypes.Length; i++)
             {
-                int expected;
-                if (contenttypes[i] == "image/tga")
-                    expected = 12;  // if we know only the content-type "image/tga", then we assume the asset type is TextureTGA; not ImageTGA
+                if (SLUtil.ContentTypeToSLAssetType(contenttypes[i]) == 18)
+                {
+                    Assert.That(contenttypes[i] == "image/tga");
+                }
                 else
-                    expected = assettypes[i];
-                Assert.AreEqual(expected, SLUtil.ContentTypeToSLAssetType(contenttypes[i]),
-                            String.Format("Incorrect AssetType mapped from Content-Type {0}", contenttypes[i]));
+                {
+                    Assert.That(SLUtil.ContentTypeToSLAssetType(contenttypes[i]) == assettypes[i],
+                                "Expecting {0} but got {1}", assettypes[i],
+                                SLUtil.ContentTypeToSLAssetType(contenttypes[i]));
+                }
             }
 
             int[] inventorytypes = new int[] {-1,0,1,2,3,6,7,8,9,10,15,17,18,20};
@@ -234,7 +237,7 @@ namespace OpenSim.Framework.Tests
                                                "application/vnd.ll.primitive",
                                                "application/vnd.ll.notecard",
                                                "application/vnd.ll.folder",
-                                               "application/vnd.ll.rootfolder",
+                                               "application/octet-stream",
                                                "application/vnd.ll.lsltext",
                                                "image/x-j2c",
                                                "application/vnd.ll.primitive",
@@ -244,8 +247,7 @@ namespace OpenSim.Framework.Tests
         
             for (int i=0;i<inventorytypes.Length;i++)
             {
-                Assert.AreEqual(invcontenttypes[i], SLUtil.SLInvTypeToContentType(inventorytypes[i]),
-                    String.Format("Incorrect Content-Type mapped from InventoryType {0}", inventorytypes[i]));
+                Assert.That(SLUtil.SLInvTypeToContentType(inventorytypes[i]) == invcontenttypes[i], "Expected {0}, Got {1}", invcontenttypes[i], SLUtil.SLInvTypeToContentType(inventorytypes[i]));
             }
 
             invcontenttypes = new string[]
@@ -278,8 +280,7 @@ namespace OpenSim.Framework.Tests
 
             for (int i = 0; i < invtypes.Length; i++)
             {
-                Assert.AreEqual(invtypes[i], SLUtil.ContentTypeToSLInvType(invcontenttypes[i]),
-                    String.Format("Incorrect InventoryType mapped from Content-Type {0}", invcontenttypes[i]));
+                Assert.That(SLUtil.ContentTypeToSLInvType(invcontenttypes[i]) == invtypes[i], "Expected {0}, Got {1}", invtypes[i], SLUtil.ContentTypeToSLInvType(invcontenttypes[i]));
             }
         }
     }