Skip to content

Commit

Permalink
NUnit 4 API fixups
Browse files Browse the repository at this point in the history
  • Loading branch information
jas88 committed Feb 13, 2024
1 parent 335dc4d commit a077eae
Show file tree
Hide file tree
Showing 37 changed files with 159 additions and 133 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public override object[] GetChildren(object model)
case IProject p:
{
var schedule = GetScheduleIfAny(p);

if(schedule != null)
return new[] { schedule };
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public BasicAutomationCommandExecution(IBasicActivateItems activator):base(activ
{
SetImpossible("There is no Automation Repository configured");
}

}

}
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public bool Release
#endregion

#region Relationships

[NoMappingToDatabase]
public IExtractionConfiguration ExtractionConfiguration => _repository.DataExportRepository.GetObjectByID<ExtractionConfiguration>(ExtractionConfigurationId);

Expand Down Expand Up @@ -99,7 +99,7 @@ public AutomateExtraction(PluginRepository repository, DbDataReader r)
}

private ExtractionConfiguration _cachedExtractionConfiguration;


public override string ToString()
{
Expand Down Expand Up @@ -146,7 +146,7 @@ public void ClearBaselines()

foreach (var r in _repository.GetAllObjectsWithParent<SuccessfullyExtractedResults>(this))
r.DeleteInDatabase();

BaselineDate = null;
SaveToDatabase();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public void CheckTicketing(ICheckNotifier notifier)
notifier.OnCheckPerformed(new CheckEventArgs("No Ticket specified, governance will not be checked",CheckResult.Warning));
return;
}

var ticketingSystem = _repository.CatalogueRepository.GetTicketingSystem();


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class QueuedExtraction : DatabaseEntity
private DateTime _dueDate;
private string _requester;
private DateTime _requestDate;


public int ExtractionConfiguration_ID
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public AutomateExtractionRepository(IRDMPPlatformRepositoryServiceLocator reposi
CatalogueRepository = repositoryLocator.CatalogueRepository;
DataExportRepository = repositoryLocator.DataExportRepository;
}

protected override bool IsCompatibleType(Type type)
{
return typeof(DatabaseEntity).IsAssignableFrom(type);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ namespace LoadModules.Extensions.AutomationPlugins.Data.Repository;
public class AutomateExtractionRepositoryFinder : PluginRepositoryFinder
{
public static int Timeout = 5;

public AutomateExtractionRepositoryFinder(IRDMPPlatformRepositoryServiceLocator repositoryLocator) : base(repositoryLocator)
{

}

public override PluginRepository GetRepositoryIfAny()
{
if (RepositoryLocator.CatalogueRepository == null || RepositoryLocator.DataExportRepository == null)
return null;

var patcher = new AutomateExtractionPluginPatcher();

var compatibleServers = RepositoryLocator.CatalogueRepository.GetAllObjects<ExternalDatabaseServer>()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class SuccessfullyExtractedResults : DatabaseEntity
private string _sQL;
private int _extractableDataSet_ID;
private int _automateExtraction_ID;

public string SQL
{
get => _sQL;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ public ExecuteCommandCreateNewAutomateExtraction(IBasicActivateItems activator,I

// the project doesnt have a schedule
Schedule = existingSchedules.FirstOrDefault(s => s.Project_ID == extractionConfiguration.Project_ID);

if (Schedule == null)
{
SetImpossible($"Project {extractionConfiguration.Project} does not have an {nameof(AutomateExtractionSchedule)}");
return;
}


ExtractionConfiguration = extractionConfiguration;
var existingAutomateExtractions = AutomationRepository.GetAllObjects<AutomateExtraction>();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public ExecuteCommandCreateNewAutomateExtractionSchedule(IBasicActivateItems act
}

var existing = AutomationRepository.GetAllObjects<AutomateExtractionSchedule>();

if(existing.Any(s=>s.Project_ID == project.ID))
{
SetImpossible($"Project already has an {nameof(AutomateExtractionSchedule)}");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public void Check(ICheckNotifier notifier)
else
notifier.OnCheckPerformed(new CheckEventArgs(
$"Automated Extraction can only take place through Pipelines that include a {nameof(SuccessfullyExtractedResultsDocumenter)} plugin component", CheckResult.Fail));

var source = _automateExtractionPipeline.Source;

if (source == null)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ public BaselineHackEvaluation ExecuteHackIfAllowed(IDataLoadEventListener listen

if(validFromField == null)
return BaselineHackEvaluation.DatasetNotCompatibleWithBaselining;
//there must be an existing baseline

//there must be an existing baseline

//get the ids that the request is for
var configId = _extractDatasetCommand.Configuration.ID;
Expand All @@ -52,7 +52,7 @@ public BaselineHackEvaluation ExecuteHackIfAllowed(IDataLoadEventListener listen

//see if there is an audit of the previous execution success for this dataset
var previousSuccess = automateExtraction[0].GetSuccessIfAnyFor(_extractDatasetCommand.DatasetBundle.DataSet);

//no there is no record of a succesful extraction so a full baseline is needed
if(previousSuccess == null)
return BaselineHackEvaluation.NoCompatibleBaselineAvailable;
Expand Down Expand Up @@ -82,12 +82,12 @@ public BaselineHackEvaluation ExecuteHackIfAllowed(IDataLoadEventListener listen

//
var tblForJoin = _repository.DiscoveredServer.GetCurrentDatabase().ExpectTable("ReleaseIdentifiersSeen");

if(!tblForJoin.Exists())
throw new Exception($"Table '{tblForJoin} did not exist!");

var tableForJoinName = tblForJoin.GetFullyQualifiedName();

hackSql = $@"
AND
(
Expand Down Expand Up @@ -120,7 +120,7 @@ public ColumnInfo GetValidFromField(IDataLoadEventListener listener)
{
var col = tableInfo.ColumnInfos.SingleOrDefault(c => c.GetRuntimeName() == validFromFieldName);

//table doesn't have a
//table doesn't have a
if(col == null)
{
listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
Expand All @@ -146,7 +146,7 @@ public ColumnInfo GetValidFromField(IDataLoadEventListener listener)
));
return null;
}

//we are not a primary and we have found a primary already so ignore this col
}
else //previous one was not a primary
Expand Down Expand Up @@ -175,7 +175,7 @@ public ColumnInfo GetValidFromField(IDataLoadEventListener listener)
$"No ColumnInfos were found called '{validFromFieldName}'"));
return null;
}

listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
$"Found valid from field '{validFromField}'"));
return validFromField;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ WHERE NOT EXISTS (SELECT 1 FROM ReleaseIdentifiersSeen A2 WHERE
var cmd = new SqlCommand(sql, con);
cmd.ExecuteNonQuery();
}


tempTable.Drop();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ private DataTable ProcessPipelineData(ExtractDatasetCommand ds, DataTable toProc
{
_sql = ds.QueryBuilder.SQL;
_dataset = ds.DatasetBundle.DataSet;

var finder = new AutomateExtractionRepositoryFinder(new RepositoryProvider(ds.DataExportRepository));
_repo = finder.GetRepositoryIfAny() as AutomateExtractionRepository;

Expand All @@ -60,15 +60,15 @@ private DataTable ProcessPipelineData(ExtractDatasetCommand ds, DataTable toProc

//index ensure you can't have multiple so this shouldn't blow up
_automateExtraction = matches.Single();
//delete any old baseline records

//delete any old baseline records
var success = _automateExtraction.GetSuccessIfAnyFor(ds.DatasetBundle.DataSet);
success?.DeleteInDatabase();

_accumulator = IdentifierAccumulator.GetInstance(_dataLoadInfo);

}

foreach (var value in ds.ReleaseIdentifierSubstitutions
.SelectMany(substitution => toProcess.Rows.Cast<DataRow>(),
(substitution, dr) => dr[substitution.GetRuntimeName()])
Expand All @@ -79,7 +79,7 @@ private DataTable ProcessPipelineData(ExtractDatasetCommand ds, DataTable toProc

return toProcess;
}

private DataTable ProcessPipelineData(ExtractGlobalsCommand globalData, DataTable toProcess, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
{
listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning,
Expand All @@ -102,12 +102,12 @@ public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureEx

public void Abort(IDataLoadEventListener listener)
{

}

public void Check(ICheckNotifier notifier)
{

}

public void PreInitialize(IExtractCommand value, IDataLoadEventListener listener)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Runtime.InteropServices;

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace LoadModules.Extensions.Interactive.DeAnonymise;
public class DeAnonymiseAgainstCohort: IPluginDataFlowComponent<DataTable>, IPipelineRequirement<IBasicActivateItems>
{
/// <summary>
/// When null (default) we launch a new DeAnonymiseAgainstCohortUI in order that the user selects which cohort he wants to deanonymise against. If you set this then you can
/// When null (default) we launch a new DeAnonymiseAgainstCohortUI in order that the user selects which cohort he wants to deanonymise against. If you set this then you can
/// (for example in unit tests) specify an explicit implementation and dodge the gui.
/// </summary>
public IDeAnonymiseAgainstCohortConfigurationFulfiller ConfigurationGetter;
Expand Down Expand Up @@ -68,7 +68,7 @@ public void Abort(IDataLoadEventListener listener)
}
public void Check(ICheckNotifier notifier)
{

}

public void PreInitialize(IBasicActivateItems value, IDataLoadEventListener listener)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public partial class DeAnonymiseAgainstCohortUI : Form, IDeAnonymiseAgainstCohor
private readonly IDataExportRepository _dataExportRepository;
public IExtractableCohort ChosenCohort { get; set; }
public string OverrideReleaseIdentifier { get; set; }

public DeAnonymiseAgainstCohortUI(DataTable toProcess, IBasicActivateItems activator)
{
_toProcess = toProcess;
Expand All @@ -39,7 +39,7 @@ public DeAnonymiseAgainstCohortUI(DataTable toProcess, IBasicActivateItems activ

if (_dataExportRepository == null)
throw new Exception("DataExportRepository was not set so cannot fetch list of cohorts to advertise to user at runtime");

foreach (DataColumn column in toProcess.Columns)
{
var b = new Button
Expand All @@ -50,14 +50,14 @@ public DeAnonymiseAgainstCohortUI(DataTable toProcess, IBasicActivateItems activ
b.Click += b_Click;
}
}

void b_Click(object sender, EventArgs e)
{
OverrideReleaseIdentifier = ((Button) sender).Text;
CheckCohortHasCorrectColumns();
}


private void btnChooseCohort_Click(object sender, EventArgs e)
{
var dialog = new SelectDialog<IMapsDirectlyToDatabaseTable>(
Expand All @@ -81,7 +81,7 @@ private void CheckCohortHasCorrectColumns()
else
checksUI1.OnCheckPerformed(new CheckEventArgs($"Found column {release} in your DataTable",
CheckResult.Success));

lblExpectedReleaseIdentifierColumn.Text = release;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Runtime.InteropServices;

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public class AllowAnythingTicketing:ITicketingSystem
{
public void Check(ICheckNotifier notifier)
{

}

public bool IsValidTicketName(string ticketName)
Expand All @@ -18,7 +18,7 @@ public bool IsValidTicketName(string ticketName)

public void NavigateToTicket(string ticketName)
{

}

public TicketingReleaseabilityEvaluation GetDataReleaseabilityOfTicket(string masterTicket, string requestTicket,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public class NeverAllowAnythingTicketing:ITicketingSystem
{
public void Check(ICheckNotifier notifier)
{

}

public bool IsValidTicketName(string ticketName)
Expand All @@ -18,7 +18,7 @@ public bool IsValidTicketName(string ticketName)

public void NavigateToTicket(string ticketName)
{

}

public TicketingReleaseabilityEvaluation GetDataReleaseabilityOfTicket(string masterTicket, string requestTicket,
Expand Down
Loading

0 comments on commit a077eae

Please sign in to comment.