Refactor: Remove PDSF file handlers and related classes
- Deleted Header.cs, Point.cs, Row.cs, Run.cs, Summary.cs, and SummarySegment.cs from Adaptation.FileHandlers.pdsf. - Removed associated source generation context classes. - Updated project file to exclude removed files. - Adjusted tests to reflect changes in file structure and logic.
This commit is contained in:
@ -1001,22 +1001,22 @@ public class AdaptationTesting : ISMTP
|
||||
{
|
||||
try
|
||||
{
|
||||
if (!string.IsNullOrEmpty(fileConnectorConfigurationTuple.Item2.ErrorTargetFileLocation))
|
||||
if (!string.IsNullOrEmpty(fileConnectorConfigurationTuple.Item2.ErrorTargetFileLocation) && !fileConnectorConfigurationTuple.Item2.ErrorTargetFileLocation.Contains("10."))
|
||||
{
|
||||
if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.ErrorTargetFileLocation))
|
||||
_ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.ErrorTargetFileLocation);
|
||||
}
|
||||
if (!string.IsNullOrEmpty(fileConnectorConfigurationTuple.Item2.SourceFileLocation))
|
||||
if (!string.IsNullOrEmpty(fileConnectorConfigurationTuple.Item2.SourceFileLocation) && !fileConnectorConfigurationTuple.Item2.SourceFileLocation.Contains("10."))
|
||||
{
|
||||
if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.SourceFileLocation))
|
||||
_ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.SourceFileLocation);
|
||||
}
|
||||
if (!string.IsNullOrEmpty(fileConnectorConfigurationTuple.Item2.TargetFileLocation))
|
||||
if (!string.IsNullOrEmpty(fileConnectorConfigurationTuple.Item2.TargetFileLocation) && !fileConnectorConfigurationTuple.Item2.TargetFileLocation.Contains("10."))
|
||||
{
|
||||
if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.TargetFileLocation))
|
||||
_ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.TargetFileLocation);
|
||||
}
|
||||
if (!string.IsNullOrEmpty(fileConnectorConfigurationTuple.Item2.AlternateTargetFolder))
|
||||
if (!string.IsNullOrEmpty(fileConnectorConfigurationTuple.Item2.AlternateTargetFolder) && !fileConnectorConfigurationTuple.Item2.AlternateTargetFolder.Contains("10."))
|
||||
{
|
||||
if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.AlternateTargetFolder.Split('|')[0]))
|
||||
_ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.AlternateTargetFolder.Split('|')[0]);
|
||||
|
||||
@ -2,49 +2,60 @@
|
||||
// recipes-and-patterns.js under IndexOf
|
||||
// RecipesAndPatternsMatch
|
||||
// ($('dcp.HGCV1/csv/Index', 0) + 1) == $('dcp.HGCV1/csv/Count', 0)
|
||||
// getValue('HGCV', $('dcp.HGCV1/csv/Count', 0), $('dcp.HGCV1/csv/SetupFile', ''), $('dcp.HGCV1/csv/Pattern', ''), getContextData('2', 'cds.NULL_DATA', ''));
|
||||
// getValue('HGCV', $('dcp.HGCV1/csv/Lot', ''), $('dcp.HGCV1/csv/Count', 0), $('dcp.HGCV1/csv/SetupFile', ''), $('dcp.HGCV1/csv/Pattern', ''), getContextData('2', 'cds.NULL_DATA', ''));
|
||||
|
||||
function getValue(tool, patternSize, recipe, pattern, json) {
|
||||
function getValue(tool, lot, patternSize, recipe, pattern, json) {
|
||||
let result;
|
||||
if (tool == undefined || tool.length === 0 || patternSize == undefined || patternSize.length === 0 || recipe == undefined || recipe.length === 0 || pattern == undefined || pattern.length === 0 || json == undefined || json.length === 0)
|
||||
result = 'A) Invalid input!';
|
||||
if (pattern === 'ONEPT.PAT' && lot.toUpperCase().indexOf('EP') > -1)
|
||||
result = '1';
|
||||
else if (pattern === 'ONEPT.PAT' && lot.toUpperCase().indexOf('LO') > -1)
|
||||
result = '1';
|
||||
else if (pattern === 'ONEPT.PAT' && lot.toUpperCase().indexOf('MI') > -1)
|
||||
result = '1';
|
||||
else if (pattern === 'ONEPT.PAT' && lot.toUpperCase().indexOf('HI') > -1)
|
||||
result = '1';
|
||||
else if (pattern === 'ONEPT.PAT' && lot.toUpperCase().indexOf('TH') > -1)
|
||||
result = '1';
|
||||
else {
|
||||
let parsed;
|
||||
try {
|
||||
parsed = JSON.parse(json);
|
||||
} catch (error) {
|
||||
parsed = null;
|
||||
}
|
||||
if (parsed == null)
|
||||
result = 'B) Invalid input!';
|
||||
else if (parsed.rds == undefined || parsed.rds.prodSpec == undefined || parsed.rds.prodSpec.recipesAndPatterns == undefined)
|
||||
result = 'C) No Spec!';
|
||||
if (tool == undefined || tool.length === 0 || patternSize == undefined || patternSize.length === 0 || recipe == undefined || recipe.length === 0 || pattern == undefined || pattern.length === 0 || json == undefined || json.length === 0)
|
||||
result = 'A) Invalid input!';
|
||||
else {
|
||||
let toolMatches = [];
|
||||
for (let index = 0; index < parsed.rds.prodSpec.recipesAndPatterns.length; index++) {
|
||||
if (parsed.rds.prodSpec.recipesAndPatterns[index].tool === tool) {
|
||||
toolMatches.push(parsed.rds.prodSpec.recipesAndPatterns[index]);
|
||||
}
|
||||
let parsed;
|
||||
try {
|
||||
parsed = JSON.parse(json);
|
||||
} catch (error) {
|
||||
parsed = null;
|
||||
}
|
||||
if (toolMatches == null || toolMatches.length === 0)
|
||||
result = 'Tool [' + tool + '] not found in OI API results!';
|
||||
if (parsed == null)
|
||||
result = 'B) Invalid input!';
|
||||
else if (parsed.rds == undefined || parsed.rds.prodSpec == undefined || parsed.rds.prodSpec.recipesAndPatterns == undefined)
|
||||
result = 'C) No Spec!';
|
||||
else {
|
||||
let debug = '';
|
||||
let matches = 0;
|
||||
for (let index = 0; index < toolMatches.length; index++) {
|
||||
debug += 'patternSize: ' + toolMatches[index].patternSize +
|
||||
'; recipe: ' + toolMatches[index].recipe +
|
||||
'; pattern: ' + toolMatches[index].pattern + ';~';
|
||||
if (toolMatches[index].patternSize == patternSize &&
|
||||
toolMatches[index].recipe.toLowerCase() == recipe.toLowerCase() &&
|
||||
toolMatches[index].pattern.toLowerCase() == pattern.toLowerCase()) {
|
||||
matches++;
|
||||
let toolMatches = [];
|
||||
for (let index = 0; index < parsed.rds.prodSpec.recipesAndPatterns.length; index++) {
|
||||
if (parsed.rds.prodSpec.recipesAndPatterns[index].tool === tool) {
|
||||
toolMatches.push(parsed.rds.prodSpec.recipesAndPatterns[index]);
|
||||
}
|
||||
}
|
||||
if (matches > 0)
|
||||
result = '1';
|
||||
if (toolMatches == null || toolMatches.length === 0)
|
||||
result = 'Tool [' + tool + '] not found in OI API results!';
|
||||
else {
|
||||
result = 'Value not matched~Run~patternSize: ' + patternSize + '; recipe: ' + recipe + '; pattern: ' + pattern + ';~API~' + debug;
|
||||
let debug = '';
|
||||
let matches = 0;
|
||||
for (let index = 0; index < toolMatches.length; index++) {
|
||||
debug += 'patternSize: ' + toolMatches[index].patternSize +
|
||||
';~recipe: ' + toolMatches[index].recipe +
|
||||
';~pattern: ' + toolMatches[index].pattern + ';~';
|
||||
if (toolMatches[index].patternSize == patternSize &&
|
||||
toolMatches[index].recipe.toLowerCase() == recipe.toLowerCase() &&
|
||||
toolMatches[index].pattern.toLowerCase() == pattern.toLowerCase()) {
|
||||
matches++;
|
||||
}
|
||||
}
|
||||
if (matches > 0)
|
||||
result = '1';
|
||||
else
|
||||
result = 'Value not matched~Run~patternSize: ' + patternSize + ';~recipe: ' + recipe + ';~pattern: ' + pattern + ';~API~' + debug;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -52,8 +63,9 @@ function getValue(tool, patternSize, recipe, pattern, json) {
|
||||
return result;
|
||||
}
|
||||
|
||||
getValue('HGCV', 9, '6IN4_10.SET', '6_9PLUS.PAT', '{"rds":{"prodSpec":{"recipesAndPatterns":[{"recipe":"6IN4_10.SET","pattern":"6_9PLUS.PAT","patternSize":9,"tool":"HGCV"}]}}}');
|
||||
getValue('HGCV', 'TESTLO1234', 9, '6IN4_10.SET', '6_9PLUS.PAT', '{"rds":{"prodSpec":{"recipesAndPatterns":[{"recipe":"6IN4_10.SET","pattern":"6_9PLUS.PAT","patternSize":9,"tool":"HGCV"}]}}}');
|
||||
|
||||
let lot;
|
||||
let json;
|
||||
let tool;
|
||||
let recipe;
|
||||
@ -62,57 +74,58 @@ let patternSize;
|
||||
|
||||
tool = 'HGCV'
|
||||
patternSize = 9;
|
||||
lot = 'TESTLO1234';
|
||||
recipe = '6IN4_10.SET';
|
||||
pattern = '6_9PLUS.PAT';
|
||||
json = '{"rds":{"prodSpec":{"recipesAndPatterns":[{"recipe":"6IN4_10.SET","pattern":"6_9PLUS.PAT","patternSize":9,"tool":"HGCV"}]}}}';
|
||||
const testA = getValue(tool, patternSize, recipe, pattern, json);
|
||||
const testA = getValue(tool, lot, patternSize, recipe, pattern, json);
|
||||
if (testA !== '1')
|
||||
throw 'Test A failed: ' + testA;
|
||||
tool = null;
|
||||
const testB = getValue(tool, patternSize, recipe, pattern, json);
|
||||
const testB = getValue(tool, lot, patternSize, recipe, pattern, json);
|
||||
if (testB !== 'A) Invalid input!')
|
||||
throw 'Test L failed: ' + testB;
|
||||
tool = '';
|
||||
const testC = getValue(tool, patternSize, recipe, pattern, json);
|
||||
const testC = getValue(tool, lot, patternSize, recipe, pattern, json);
|
||||
if (testC !== 'A) Invalid input!')
|
||||
throw 'Test M failed: ' + testC;
|
||||
patternSize = null;
|
||||
const testD = getValue(tool, patternSize, recipe, pattern, json);
|
||||
const testD = getValue(tool, lot, patternSize, recipe, pattern, json);
|
||||
if (testD !== 'A) Invalid input!')
|
||||
throw 'Test J failed: ' + testD;
|
||||
patternSize = '';
|
||||
const testE = getValue(tool, patternSize, recipe, pattern, json);
|
||||
const testE = getValue(tool, lot, patternSize, recipe, pattern, json);
|
||||
if (testE !== 'A) Invalid input!')
|
||||
throw 'Test K failed: ' + testE;
|
||||
recipe = null;
|
||||
const testF = getValue(tool, patternSize, recipe, pattern, json);
|
||||
const testF = getValue(tool, lot, patternSize, recipe, pattern, json);
|
||||
if (testF !== 'A) Invalid input!')
|
||||
throw 'Test F failed: ' + testF;
|
||||
recipe = '';
|
||||
const testG = getValue(tool, patternSize, recipe, pattern, json);
|
||||
const testG = getValue(tool, lot, patternSize, recipe, pattern, json);
|
||||
if (testG !== 'A) Invalid input!')
|
||||
throw 'Test G failed: ' + testG;
|
||||
pattern = null;
|
||||
const testH = getValue(tool, patternSize, recipe, pattern, json);
|
||||
const testH = getValue(tool, lot, patternSize, recipe, pattern, json);
|
||||
if (testH !== 'A) Invalid input!')
|
||||
throw 'Test H failed: ' + testH;
|
||||
pattern = '';
|
||||
const testI = getValue(tool, patternSize, recipe, pattern, json);
|
||||
const testI = getValue(tool, lot, patternSize, recipe, pattern, json);
|
||||
if (testI !== 'A) Invalid input!')
|
||||
throw 'Test I failed: ' + testI;
|
||||
json = '';
|
||||
const testK = getValue(tool, patternSize, recipe, pattern, json);
|
||||
const testK = getValue(tool, lot, patternSize, recipe, pattern, json);
|
||||
if (testK !== 'A) Invalid input!')
|
||||
throw 'Test B failed: ' + testK;
|
||||
json = 'invalid';
|
||||
const testL = getValue(tool, patternSize, recipe, pattern, json);
|
||||
const testL = getValue(tool, lot, patternSize, recipe, pattern, json);
|
||||
if (testL !== 'B) Invalid input!')
|
||||
throw 'Test C failed: ' + testL;
|
||||
json = '{"rds":{}}';
|
||||
const testM = getValue(tool, patternSize, recipe, pattern, json);
|
||||
const testM = getValue(tool, lot, patternSize, recipe, pattern, json);
|
||||
if (testM !== 'C) No Spec!')
|
||||
throw 'Test D failed: ' + testM;
|
||||
json = '{"rds":{"prodSpec":{"recipesAndPatterns":[]}}}';
|
||||
const testN = getValue(tool, patternSize, recipe, pattern, json);
|
||||
const testN = getValue(tool, lot, patternSize, recipe, pattern, json);
|
||||
if (testN !== 'Tool [HGCV] not found in OI API results!')
|
||||
throw 'Test E failed: ' + testN;
|
||||
throw 'Test E failed: ' + testN;
|
||||
Reference in New Issue
Block a user