fixed WebObjectDefinition Scope/ObjectScope handling

src/Spring/Spring.Web/Objects/Factory/Support/ObjectScope.cs

@@ -26,10 +26,15 @@ namespace Spring.Objects.Factory.Support
     /// <author>Aleksandar Seovic</author>
     public enum ObjectScope
     {
+        ///<summary>
+        /// 
+        ///</summary>
+        Singleton = 0,
+
         /// <summary>
         /// Application scope.
         /// </summary>
-        Application = 0,
+        Application = Singleton,
 
         /// <summary>
         /// Session scope.
@@ -41,6 +46,11 @@ namespace Spring.Objects.Factory.Support
         /// </summary>
         Request = 2,
 
+        /// <summary>
+        /// 
+        /// </summary>
+        Prototype = -1,
+
         /// <summary>
         /// Default scope (currently
         /// <see cref="Spring.Objects.Factory.Support.ObjectScope.Application"/>).

test/Spring/Spring.Web.Tests/Objects/Factory/Support/WebObjectDefinitionTests.cs

@@ -0,0 +1,66 @@
+#region License
+
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#endregion
+
+using System;
+using NUnit.Framework;
+using Spring.Objects.Factory.Config;
+
+namespace Spring.Objects.Factory.Support
+{
+    /// <summary>
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    [TestFixture]
+    public class WebObjectDefinitionTests
+    {
+        [Test]
+        public void UnderstandsObjectScopeSingleton()
+        {
+            RootWebObjectDefinition rwod = new RootWebObjectDefinition(typeof(object), new ConstructorArgumentValues(), new MutablePropertyValues());
+            rwod.IsSingleton = true;
+            Assert.IsFalse(rwod.IsPage);
+            Assert.IsTrue(rwod.IsSingleton);
+            Assert.IsFalse(rwod.IsPrototype);
+            Assert.AreEqual(ObjectScope.Singleton, ((IWebObjectDefinition)rwod).Scope);
+            Assert.AreEqual(ObjectScope.Application, ((IWebObjectDefinition)rwod).Scope);
+        }
+
+        [Test]
+        public void UnderstandsObjectScopePrototype()
+        {
+            RootWebObjectDefinition rwod = new RootWebObjectDefinition(typeof(object), new ConstructorArgumentValues(), new MutablePropertyValues());
+            rwod.IsSingleton = false;
+            Assert.IsFalse(rwod.IsPage);
+            Assert.IsFalse(rwod.IsSingleton);
+            Assert.IsTrue(rwod.IsPrototype);
+            Assert.AreEqual(ObjectScope.Prototype, ((IWebObjectDefinition)rwod).Scope);
+        }
+
+//        [Test]
+//        public void UnderstandsObjectScopeForPages()
+//        {
+//            RootWebObjectDefinition rwod = new RootWebObjectDefinition("pagename.aspx", new MutablePropertyValues());            
+//            Assert.IsTrue(rwod.IsPage);
+//            Assert.IsFalse(rwod.IsSingleton);
+//            Assert.IsTrue(rwod.IsPrototype);
+//            Assert.AreEqual(ObjectScope.Prototype, ((IWebObjectDefinition)rwod).Scope);
+//        }
+    }
+}

test/Spring/Spring.Web.Tests/Spring.Web.Tests.2008.csproj

@@ -100,6 +100,7 @@
     <Compile Include="Globalization\Resolvers\DefaultWebCultureResolverTests.cs" />
     <Compile Include="MyNUnitAddinHelper.cs" />
     <Compile Include="Objects\Factory\Support\WebObjectDefinitionFactoryTests.cs" />
+    <Compile Include="Objects\Factory\Support\WebObjectDefinitionTests.cs" />
     <Compile Include="Objects\Factory\Support\WebObjectFactoryTests.cs">
       <SubType>Code</SubType>
     </Compile>