Author: husted
Date: Fri Apr 8 16:56:49 2005
New Revision: 160640
URL: http://svn.apache.org/viewcvs?view=rev&rev=160640
Log:
OVR-5
* Implement enough code to pass first test (select all entries from database).
Added:
struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/
struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/AppCommand.cs
struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/BaseList.cs
struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Query/SelectAll.xml
Modified:
struts/sandbox/trunk/overdrive/PhoneBook/Core/App.cs
struts/sandbox/trunk/overdrive/PhoneBook/Core/Core.csproj
struts/sandbox/trunk/overdrive/PhoneBook/Test/Commands/SelectAllTest.cs
struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/Catalog.xml
struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Query/default.xml
struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Query/properties.xml
struts/sandbox/trunk/overdrive/PhoneBook/Test/Test.csproj
struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Query/properties.xml
struts/sandbox/trunk/overdrive/PhoneBook/Web/sqlmap.config
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Core/App.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Core/App.cs?view=diff&r1=160639&r2=160640
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/App.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/App.cs Fri Apr 8 16:56:49
2005
@@ -23,7 +23,7 @@
/// <summary>
/// Token for user_name property.
/// </summary>
- public const string USER_NAME = "user";
+ public const string USER_NAME = "user_name";
/// <summary>
/// Token for extension property.
Added: struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/AppCommand.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/AppCommand.cs?view=auto&rev=160640
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/AppCommand.cs (added)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/AppCommand.cs Fri
Apr 8 16:56:49 2005
@@ -0,0 +1,17 @@
+using IBatisNet.DataMapper;
+using Nexus.Core;
+
+namespace PhoneBook.Core.Commands
+{
+ /// <summary>
+ /// Add data access methods to RequestCommand.
+ /// </summary>
+ public abstract class AppCommand : RequestCommand
+ {
+ public SqlMapper Mapper ()
+ {
+ // return IBatisNet.DataMapper.Mapper.Instance();
+ return IBatisNet.DataMapper.Mapper.Instance();
+ }
+ }
+}
\ No newline at end of file
Added: struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/BaseList.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/BaseList.cs?view=auto&rev=160640
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/BaseList.cs (added)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/BaseList.cs Fri Apr
8 16:56:49 2005
@@ -0,0 +1,18 @@
+using System.Collections;
+using Nexus.Core;
+
+namespace PhoneBook.Core.Commands
+{
+ /// <summary>
+ /// Execute database statement for ID and set result as outcome.
+ /// </summary>
+ public class BaseList : AppCommand
+ {
+ public override bool RequestExecute (IRequestContext context)
+ {
+ IList rows = Mapper ().QueryForList (ID, null);
+ context.Outcome = rows;
+ return CONTINUE;
+ }
+ }
+}
\ No newline at end of file
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Core/Core.csproj
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Core/Core.csproj?view=diff&r1=160639&r2=160640
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/Core.csproj (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/Core.csproj Fri Apr 8
16:56:49 2005
@@ -79,6 +79,21 @@
AssemblyName = "System.Xml"
HintPath =
"..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
/>
+ <Reference
+ Name = "IBatisNet.DataMapper"
+ AssemblyName = "IBatisNet.DataMapper"
+ HintPath = "..\..\iBatisNet.bin\IBatisNet.DataMapper.dll"
+ />
+ <Reference
+ Name = "Nexus.Core"
+ AssemblyName = "Nexus.Core"
+ HintPath = "..\..\Nexus\Core\bin\Debug\Nexus.Core.dll"
+ />
+ <Reference
+ Name = "Agility.Core"
+ AssemblyName = "Agility.Core"
+ HintPath = "..\..\Nexus\Core\bin\Debug\Agility.Core.dll"
+ />
</References>
</Build>
<Files>
@@ -94,6 +109,16 @@
BuildAction = "Compile"
/>
<Folder RelPath = "bin\Debug\" />
+ <File
+ RelPath = "Commands\AppCommand.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Commands\BaseList.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
</Include>
</Files>
</CSHARP>
Modified:
struts/sandbox/trunk/overdrive/PhoneBook/Test/Commands/SelectAllTest.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/Commands/SelectAllTest.cs?view=diff&r1=160639&r2=160640
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/Commands/SelectAllTest.cs
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/Commands/SelectAllTest.cs Fri
Apr 8 16:56:49 2005
@@ -25,19 +25,14 @@
[TestFixture]
public class SelectAllTest : BaseTest
{
-
+
/// <summary>
- /// SelectAll and succeed.
+ /// Assert result of SelectAll, after another method runs the
command.
/// </summary>
- /// <remarks>
- /// Nonfunctional work in progress.
- /// </remarks>
- [Test]
- public void SelectAll_Pass ()
+ /// <param name="context">Context with result to
assert.</param>
+ public void SelectAll_Result(IRequestContext context)
{
- // TODO: Write code to pass text [OVR-5]
- IRequestContext context = controller.ExecuteContext
(App.SELECT_ALL);
- Assert.IsTrue (context.IsNominal,"Expected command to
pass.");
+ AssertNominal(context);
Assert.IsTrue (context.HasOutcome,"Expected command to
set an Outcome.");
IList list = context.Outcome as IList;
bool notEmpty = ((list!=null) && (list.Count>0));
@@ -50,6 +45,29 @@
valid = valid && row.Contains (key);
}
Assert.IsTrue (valid,"Expected row to contain all
keys.");
+ }
+
+ /// <summary>
+ /// SelectAll and succeed, without using Catalog.
+ /// </summary>
+ [Test]
+ public void SelectAll_Pass_Without_Catalog ()
+ {
+ BaseList command = new BaseList();
+ command.ID = App.SELECT_ALL;
+ IRequestContext context = command.NewContext ();
+ command.Execute(context);
+ SelectAll_Result(context);
+ }
+
+ /// <summary>
+ /// SelectAll and succeed, using catalog.
+ /// </summary>
+ [Test]
+ public void SelectAll_Pass ()
+ {
+ IRequestContext context = controller.ExecuteContext
(App.SELECT_ALL);
+ SelectAll_Result(context);
}
}
}
Modified:
struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/Catalog.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/Catalog.xml?view=diff&r1=160639&r2=160640
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/Catalog.xml
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/Catalog.xml
Fri Apr 8 16:56:49 2005
@@ -3,6 +3,10 @@
"http://www.springframework.net/dtd/spring-objects.dtd";>
<objects>
+ <object id="select_all" type="PhoneBook.Core.Commands.BaseList,
PhoneBook.Core">
+ <property name="ID"><value>select_all</value></property>
+ </object>
+
</objects>
Added:
struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Query/SelectAll.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Query/SelectAll.xml?view=auto&rev=160640
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Query/SelectAll.xml
(added)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Query/SelectAll.xml
Fri Apr 8 16:56:49 2005
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<sqlMap
+ namespace="PhoneBook"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:noNamespaceSchemaLocation="SqlMap.xsd" >
+
+ <statements>
+ <select id="select_all" resultClass="Hashtable">
+ SELECT
+ pk_entry,
+ last_name,
+ first_name,
+ extension,
+ user_name,
+ editor,
+ hired,
+ hours
+ FROM entry
+ </select>
+ </statements>
+
+</sqlMap>
Modified:
struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Query/default.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Query/default.xml?view=diff&r1=160639&r2=160640
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Query/default.xml
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Query/default.xml
Fri Apr 8 16:56:49 2005
@@ -5,8 +5,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="SqlMap.xsd" >
+<!--
<alias>
<typeAlias alias="KeyValue"
type="Agility.Extras.KeyValue,Agility.Extras" />
</alias>
+-->
</sqlMap>
Modified:
struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Query/properties.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Query/properties.xml?view=diff&r1=160639&r2=160640
==============================================================================
---
struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Query/properties.xml
(original)
+++
struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Query/properties.xml
Fri Apr 8 16:56:49 2005
@@ -2,6 +2,6 @@
<settings>
<add key="provider" value="ByteFx" />
<add key="development"
value="Host=localhost;Database=phonebook;Username=root" />
- <add key="production"
value="Host=zippy;Database=phonebook;Username=zippy;Password=butth34d" />
+ <add key="production"
value="Host=zippy;Database=phonebook;Username=phonebookApp;Password=p1nH34d" />
</settings>
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Test/Test.csproj
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/Test.csproj?view=diff&r1=160639&r2=160640
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/Test.csproj (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/Test.csproj Fri Apr 8
16:56:49 2005
@@ -86,11 +86,6 @@
AssemblyFolderKey = "hklm\dn\nunit.framework"
/>
<Reference
- Name = "Core"
- Project = "{3150F3E8-9A04-4FED-B16F-CEA57756E934}"
- Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
- />
- <Reference
Name = "Nexus.Core"
AssemblyName = "Nexus.Core"
HintPath = "..\..\Nexus\Core\bin\Debug\Nexus.Core.dll"
@@ -103,7 +98,17 @@
<Reference
Name = "Agility.Core"
AssemblyName = "Agility.Core"
- HintPath = "..\..\Agility\Core\bin\Debug\Agility.Core.dll"
+ HintPath = "..\..\Nexus\Core\bin\Debug\Agility.Core.dll"
+ />
+ <Reference
+ Name = "ByteFX.MySqlClient"
+ AssemblyName = "ByteFX.MySqlClient"
+ HintPath = "..\..\iBatisNet.bin\ByteFX.MySqlClient.dll"
+ />
+ <Reference
+ Name = "PhoneBook.Core"
+ AssemblyName = "PhoneBook.Core"
+ HintPath = "..\Core\bin\Debug\PhoneBook.Core.dll"
/>
</References>
</Build>
@@ -120,6 +125,14 @@
BuildAction = "Compile"
/>
<File
+ RelPath = "bin\Debug\providers.config"
+ BuildAction = "None"
+ />
+ <File
+ RelPath = "bin\Debug\sqlmap.config"
+ BuildAction = "None"
+ />
+ <File
RelPath = "Commands\SelectAllTest.cs"
SubType = "Code"
BuildAction = "Compile"
@@ -138,6 +151,10 @@
/>
<File
RelPath = "Resources\Query\properties.xml"
+ BuildAction = "Content"
+ />
+ <File
+ RelPath = "Resources\Query\SelectAll.xml"
BuildAction = "Content"
/>
</Include>
Modified:
struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Query/properties.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Query/properties.xml?view=diff&r1=160639&r2=160640
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Query/properties.xml
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Query/properties.xml
Fri Apr 8 16:56:49 2005
@@ -2,6 +2,6 @@
<settings>
<add key="provider" value="ByteFx" />
<add key="development"
value="Host=localhost;Database=phonebook;Username=root" />
- <add key="production"
value="Host=zippy;Database=phonebook;Username=zippy;Password=butth34d" />
+ <add key="production"
value="Host=zippy;Database=phonebook;Username=phonebookApp;Password=p1nH34d" />
</settings>
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/sqlmap.config
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/sqlmap.config?view=diff&r1=160639&r2=160640
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/sqlmap.config (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/sqlmap.config Fri Apr 8
16:56:49 2005
@@ -17,6 +17,7 @@
<sqlMaps>
<sqlMap resource="/Resources/Query/default.xml"/>
+ <sqlMap resource="/Resources/Query/SelectAll.xml"/>
</sqlMaps>
</sqlMapConfig>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
