Author: husted
Date: Thu Sep 28 12:21:57 2006
New Revision: 450976
URL: http://svn.apache.org/viewvc?view=rev&rev=450976
Log:
Fixes to accomdate recent improvements to the ID and RelatedID handling.
Modified:
struts/sandbox/trunk/overdrive/Nexus/Core/RequestCommand.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ProcessorCommand.cs
struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/Catalog.cs
struts/sandbox/trunk/overdrive/Nexus/Test/BaseNexusTest.cs
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/RequestCommand.cs
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/overdrive/Nexus/Core/RequestCommand.cs?view=diff&rev=450976&r1=450975&r2=450976
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/RequestCommand.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/RequestCommand.cs Thu Sep 28
12:21:57 2006
@@ -69,7 +69,10 @@
public virtual IList RequiredIDs
{
- get { return _RequiredIDs; }
+ get
+ {
+ return _RequiredIDs;
+ }
set { _RequiredIDs = value; }
}
@@ -99,7 +102,12 @@
public virtual IList RelatedIDs
{
- get { return _RelatedIDs; }
+ get
+ {
+ if (_RelatedIDs==null)
+ _RelatedIDs = new ArrayList();
+ return _RelatedIDs;
+ }
set { _RelatedIDs = value; }
}
Modified:
struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ProcessorCommand.cs
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ProcessorCommand.cs?view=diff&rev=450976&r1=450975&r2=450976
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ProcessorCommand.cs
(original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ProcessorCommand.cs
Thu Sep 28 12:21:57 2006
@@ -192,10 +192,11 @@
IDictionary combined = new Hashtable();
IList relatedIDs = context.CommandBin.RelatedIDs; //
outer list
// Add Command ID to related list (since we
store outcome under our own ID)
+ // This code relies on RelatedIDs being lazily
instantiated.
string id = context.CommandBin.ID;
bool found_self = relatedIDs.Contains(id);
if (!found_self) relatedIDs.Add(id);
- if (relatedIDs != null) foreach (string i in
relatedIDs) combined[i] = i;
+ foreach (string i in relatedIDs) combined[i] = i;
IList requiredIDs = context.CommandBin.RequiredIDs; //
inner list
if (requiredIDs != null) foreach (string i in
requiredIDs) combined[i] = i;
return combined.Keys;
Modified: struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/Catalog.cs
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/Catalog.cs?view=diff&rev=450976&r1=450975&r2=450976
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/Catalog.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/Catalog.cs Thu Sep 28
12:21:57 2006
@@ -184,7 +184,7 @@
public IRequestContext GetRequestContext(IRequestCommand
command)
{
- IRequestContext context = null;
+ IRequestContext context;
try
{
context = command.NewContext();
Modified: struts/sandbox/trunk/overdrive/Nexus/Test/BaseNexusTest.cs
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/overdrive/Nexus/Test/BaseNexusTest.cs?view=diff&rev=450976&r1=450975&r2=450976
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Test/BaseNexusTest.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Test/BaseNexusTest.cs Thu Sep 28
12:21:57 2006
@@ -125,7 +125,7 @@
///
public void AssertNoFault(IViewHelper helper )
{
- FaultText(helper.Fault);
+ if (helper.HasFault) FaultText(helper.Fault) ;
}
/// <summary>
@@ -266,6 +266,16 @@
}
/// <summary>
+ /// Virtual method for populating a context
+ /// for an insert test.
+ /// </summary>
+ /// <param name="context"></param>
+ protected virtual void PopulateInsert(IDictionary context)
+ {
+ Populate(context);
+ }
+
+ /// <summary>
/// Insert and then delete a new record,
/// calling the Populate method to fill the context with the
appropriate values.
/// </summary>
@@ -276,7 +286,7 @@
protected IRequestContext AssertInsertDelete(string insertId,
string keyId, string keyValue, string deleteId)
{
IRequestContext context =
catalog.GetRequestContext(insertId);
- Populate(context);
+ PopulateInsert(context);
context[keyId] = String.Empty;
catalog.ExecuteRequest(context);
