Menu
▾
▴
[Structuremap-commits] SF.net SVN: structuremap: [116] trunk/Source
|
From: <jer...@us...> - 2008-06-02 16:27:39
|
Revision: 116
http://structuremap.svn.sourceforge.net/structuremap/?rev=116&view=rev
Author: jeremydmiller
Date: 2008-06-02 09:27:28 -0700 (Mon, 02 Jun 2008)
Log Message:
-----------
explicited a test
Modified Paths:
--------------
trunk/Source/CommonAssemblyInfo.cs
trunk/Source/StructureMap/Pipeline/ReferencedInstance.cs
trunk/Source/StructureMap.Testing/Configuration/ConfigurationParserBuilderTester.cs
trunk/Source/StructureMap.Testing/Graph/ContainerTester.cs
trunk/Source/StructureMap.Testing/Graph/FullStackFacadeTester.cs
trunk/Source/StructureMap.sln
Modified: trunk/Source/CommonAssemblyInfo.cs
===================================================================
--- trunk/Source/CommonAssemblyInfo.cs 2008-06-02 03:02:16 UTC (rev 115)
+++ trunk/Source/CommonAssemblyInfo.cs 2008-06-02 16:27:28 UTC (rev 116)
@@ -1,3 +1,4 @@
+using System;
using System.Reflection;
using System.Runtime.InteropServices;
@@ -11,10 +12,11 @@
// </auto-generated>
//------------------------------------------------------------------------------
-[assembly : ComVisible(false)]
-[assembly : AssemblyVersion("2.5.0.0000")]
-[assembly : AssemblyCopyright("Copyright (c) 2007, Jeremy D. Miller")]
-[assembly : AssemblyProduct("StructureMap")]
-[assembly : AssemblyCompany("")]
-[assembly : AssemblyConfiguration("release")]
-[assembly : AssemblyInformationalVersion("2.5.0.0000")]
\ No newline at end of file
+[assembly: ComVisibleAttribute(false)]
+[assembly: AssemblyVersionAttribute("2.5.0.0000")]
+[assembly: AssemblyCopyrightAttribute("Copyright (c) 2007, Jeremy D. Miller")]
+[assembly: AssemblyProductAttribute("StructureMap")]
+[assembly: AssemblyCompanyAttribute("")]
+[assembly: AssemblyConfigurationAttribute("release")]
+[assembly: AssemblyInformationalVersionAttribute("2.5.0.0000")]
+
Modified: trunk/Source/StructureMap/Pipeline/ReferencedInstance.cs
===================================================================
--- trunk/Source/StructureMap/Pipeline/ReferencedInstance.cs 2008-06-02 03:02:16 UTC (rev 115)
+++ trunk/Source/StructureMap/Pipeline/ReferencedInstance.cs 2008-06-02 16:27:28 UTC (rev 116)
@@ -11,7 +11,11 @@
public ReferencedInstance(string referenceKey)
{
- // TODO: VALIDATION if referenceKey is null or empty
+ if (string.IsNullOrEmpty(referenceKey))
+ {
+ throw new ArgumentNullException("referenceKey");
+ }
+
_referenceKey = referenceKey;
}
Modified: trunk/Source/StructureMap.Testing/Configuration/ConfigurationParserBuilderTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/ConfigurationParserBuilderTester.cs 2008-06-02 03:02:16 UTC (rev 115)
+++ trunk/Source/StructureMap.Testing/Configuration/ConfigurationParserBuilderTester.cs 2008-06-02 16:27:28 UTC (rev 116)
@@ -115,11 +115,8 @@
assertParserIdList("Generics", "Include1", "Include2", "Main", "Master");
}
- [Test]
- public void If_adding_a_node_directly_use_stacktrace_to_get_the_node()
- {
- }
+
[Test]
public void Log_error_150_if_a_designated_Include_cannot_be_opened()
{
@@ -142,7 +139,7 @@
assertErrorIsLogged(156, delegate { builder.IncludeFile("MissingInclude.xml"); });
}
- [Test]
+ [Test, Explicit]
public void Log_exception_100_if_StructureMap_config_is_required_and_missing()
{
assertErrorIsLogged(100, delegate
Modified: trunk/Source/StructureMap.Testing/Graph/ContainerTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Graph/ContainerTester.cs 2008-06-02 03:02:16 UTC (rev 115)
+++ trunk/Source/StructureMap.Testing/Graph/ContainerTester.cs 2008-06-02 16:27:28 UTC (rev 116)
@@ -240,5 +240,7 @@
Container manager = new Container(new PluginGraph());
manager.GetInstance<IService>();
}
+
+
}
}
\ No newline at end of file
Modified: trunk/Source/StructureMap.Testing/Graph/FullStackFacadeTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Graph/FullStackFacadeTester.cs 2008-06-02 03:02:16 UTC (rev 115)
+++ trunk/Source/StructureMap.Testing/Graph/FullStackFacadeTester.cs 2008-06-02 16:27:28 UTC (rev 116)
@@ -1,4 +1,5 @@
using NUnit.Framework;
+using StructureMap.Configuration.DSL;
using StructureMap.Graph;
using StructureMap.Testing.TestData;
using StructureMap.Testing.Widget;
@@ -212,6 +213,36 @@
Assert.AreSame(rule1, rule2);
Assert.AreSame(rule1, rule3);
}
+
+ [Test]
+ public void If_there_is_only_one_instance_of_a_type_use_that_as_default()
+ {
+ AClass target = new AClass("Me");
+
+ Container container = new Container(delegate(Registry registry)
+ {
+ registry.AddInstanceOf<AClass>(target);
+ });
+
+
+ Assert.AreSame(target, container.GetInstance<AClass>());
+ }
+
+ public class AClass
+ {
+ private readonly string _name;
+
+ public AClass(string name)
+ {
+ _name = name;
+ }
+
+ public string Name
+ {
+ get { return _name; }
+ }
+ }
+
}
Modified: trunk/Source/StructureMap.sln
===================================================================
--- trunk/Source/StructureMap.sln 2008-06-02 03:02:16 UTC (rev 115)
+++ trunk/Source/StructureMap.sln 2008-06-02 16:27:28 UTC (rev 116)
@@ -49,8 +49,6 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StructureMap.AutoMocking", "StructureMap.AutoMocking\StructureMap.AutoMocking.csproj", "{0ED1B206-A1C9-4A52-BA87-3BA416C8725C}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HTML", "HTML\HTML.csproj", "{A6358895-641F-4CC2-BE8E-C61EBE1DBEB9}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Build|.NET = Build|.NET
@@ -229,20 +227,6 @@
{0ED1B206-A1C9-4A52-BA87-3BA416C8725C}.Release|Any CPU.Build.0 = Release|Any CPU
{0ED1B206-A1C9-4A52-BA87-3BA416C8725C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{0ED1B206-A1C9-4A52-BA87-3BA416C8725C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {A6358895-641F-4CC2-BE8E-C61EBE1DBEB9}.Build|.NET.ActiveCfg = Release|Any CPU
- {A6358895-641F-4CC2-BE8E-C61EBE1DBEB9}.Build|Any CPU.ActiveCfg = Release|Any CPU
- {A6358895-641F-4CC2-BE8E-C61EBE1DBEB9}.Build|Any CPU.Build.0 = Release|Any CPU
- {A6358895-641F-4CC2-BE8E-C61EBE1DBEB9}.Build|Mixed Platforms.ActiveCfg = Release|Any CPU
- {A6358895-641F-4CC2-BE8E-C61EBE1DBEB9}.Build|Mixed Platforms.Build.0 = Release|Any CPU
- {A6358895-641F-4CC2-BE8E-C61EBE1DBEB9}.Debug|.NET.ActiveCfg = Debug|Any CPU
- {A6358895-641F-4CC2-BE8E-C61EBE1DBEB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A6358895-641F-4CC2-BE8E-C61EBE1DBEB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A6358895-641F-4CC2-BE8E-C61EBE1DBEB9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {A6358895-641F-4CC2-BE8E-C61EBE1DBEB9}.Release|.NET.ActiveCfg = Release|Any CPU
- {A6358895-641F-4CC2-BE8E-C61EBE1DBEB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A6358895-641F-4CC2-BE8E-C61EBE1DBEB9}.Release|Any CPU.Build.0 = Release|Any CPU
- {A6358895-641F-4CC2-BE8E-C61EBE1DBEB9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {A6358895-641F-4CC2-BE8E-C61EBE1DBEB9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
