Skip to content

Making filename of setup_file(s) associated with indatasuts items more intuitive #417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
damascenodiego merged 8 commits into from
Aug 4, 2026
Merged

Making filename of setup_file(s) associated with indatasuts items more intuitive #417

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
43c284f
adding step_id to `setup_file`(name)
damascenodiego Aug 3, 2026
9a68394
get varId ...
damascenodiego Aug 3, 2026
d52af51
indatasuts action is not-a-null
damascenodiego Aug 3, 2026
9272e3c
access action act then act.field then check act.field
damascenodiego Aug 3, 2026
0102067
removed field casting
damascenodiego Aug 3, 2026
623059a
created `boolean isPrintableAssignment(Field)`
damascenodiego Aug 4, 2026
36f5166
Checking if field.exp != null
damascenodiego Aug 4, 2026
fc3b809
removing unused function
damascenodiego Aug 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 38 additions & 66 deletions .../nl.asml.matala.generator.fast/src/nl/asml/matala/generator/fast/FromConcreteToFast.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import nl.asml.matala.generator.docgen.DocGen
import nl.esi.xtext.actions.actions.Action
import nl.esi.xtext.actions.actions.AssignmentAction
import nl.esi.xtext.actions.actions.RecordFieldAssignmentAction
import nl.esi.xtext.expressions.expression.Field
import nl.esi.xtext.expressions.expression.Expression
import nl.esi.xtext.expressions.expression.ExpressionNullLiteral
import nl.esi.xtext.expressions.expression.ExpressionRecord
Expand Down Expand Up @@ -143,7 +144,10 @@ class FromConcreteToFast extends AbstractGenerator implements IStandardProjectGe
}
return false
}


def boolean isPrintableAssignment(Field field) {
return !(field.exp instanceof ExpressionNullLiteral)
}

def boolean isPrintableAssignment(Action act) {
return switch (act) {
Expand Down Expand Up @@ -744,6 +748,7 @@ class FromConcreteToFast extends AbstractGenerator implements IStandardProjectGe

var era = (act.fieldAccess as ExpressionRecordAccess)
var stepId = getStepId(era)
var varId = getVarId(era)

// get sut-var name and type
var stepInst = new Step
Expand All @@ -754,31 +759,33 @@ class FromConcreteToFast extends AbstractGenerator implements IStandardProjectGe
// 4.6) Check if this action is a printable assignment (aka not-a-null assignment)
if (isPrintableAssignment(act)) {
for (field : (act.exp as ExpressionRecord).fields) {
var lhs = new KeyValue
// get sut-var field name and assigned value
lhs.key = field.recordField.name
lhs.value = ExpressionsParser::generateExpression(field.exp, '''''').toString

// should it become a file on its own?
var String match = findMatchingRecordName('.' + lhs.key, setup_file_names)
if (match instanceof String) {
// Create new step instance
var new_rstep = new Step
// field name (key), type, and value
new_rstep.id = lhs.key
new_rstep.variableName = lhs.key
new_rstep.type = field.recordField.type.type.name
new_rstep.recordExp = lhs.value
// path for json input_file in "filePath / field name + step ID"
new_rstep.inputFile = new_rstep.inputFile + new_rstep.id + '_' +
stepId + '.json'
// point lhs value to input_file
var format = '''"#valueof(global.params['testcase_data'] + '%s')"'''
lhs.value = String.format(format, new_rstep.inputFile)
// Add to list of step reference of step
stepInst.stepRefs.add(new_rstep)
if (isPrintableAssignment(field)) {
var lhs = new KeyValue
// get sut-var field name and assigned value
lhs.key = field.recordField.name
lhs.value = ExpressionsParser::generateExpression(field.exp, '''''').toString

// should it become a file on its own?
var String match = findMatchingRecordName('.' + lhs.key, setup_file_names)
if (match instanceof String) {
// Create new step instance
var new_rstep = new Step
// field name (key), type, and value
new_rstep.id = lhs.key
new_rstep.variableName = lhs.key
new_rstep.type = field.recordField.type.type.name
new_rstep.recordExp = lhs.value
// path for json input_file in "filePath / field name + step ID"
new_rstep.inputFile = new_rstep.inputFile + varId + '_' + new_rstep.id + '_' + //TODO
stepId + '.json'
// point lhs value to input_file
var format = '''"#valueof(global.params['testcase_data'] + '%s')"'''
lhs.value = String.format(format, new_rstep.inputFile)
// Add to list of step reference of step
stepInst.stepRefs.add(new_rstep)
}
stepInst.parameters.add(lhs)
}
stepInst.parameters.add(lhs)
}
}
tsi.indatasuts.add(stepInst)
Expand All @@ -799,11 +806,14 @@ class FromConcreteToFast extends AbstractGenerator implements IStandardProjectGe
}

private def String getStepId(ExpressionRecordAccess expr) {
var varLabel = expr.field.name
var ioLabel = (expr.record as ExpressionRecordAccess).field.name
//var ioLabel = (expr.record as ExpressionRecordAccess).field.name
var stepLabel = ((expr.record as ExpressionRecordAccess).record as ExpressionVariable).variable.name
return stepLabel
// return ioLabel + '_' + stepLabel
}

private def String getVarId(ExpressionRecordAccess expr) {
var varLabel = expr.field.name
return varLabel
}

private def Step createStep(TestSpecificationInstance tsi, TestDefinition model, RunStep s) {
Expand Down Expand Up @@ -867,42 +877,4 @@ class FromConcreteToFast extends AbstractGenerator implements IStandardProjectGe
return stepInst
}

private def Step createDataSuts(TestSpecificationInstance tsi, RecordFieldAssignmentAction act) {
var stepInst = new Step
var era = (act.fieldAccess as ExpressionRecordAccess)
// 4.2) Step ID
stepInst.id = era.field.name
stepInst.variableName = era.field.name
// 4.3) Step type (defined via UI text box, e.g., SUT.OperationName)
stepInst.type = era.field.type.type.name

// 4.6) Check if this action is a printable assignment (aka not-a-null assignment)
if (isPrintableAssignment(act)) {
for (field : (act.exp as ExpressionRecord).fields) {
var lhs = new KeyValue
lhs.key = field.recordField.name
lhs.value = ExpressionsParser::generateExpression(field.exp, '''''').toString
// 4.9) check if record field assignment should be in its own json file
var String match = findMatchingRecordName('.' + lhs.key, record_def_file_names)
if (match instanceof String) {
// Create new step instance and fill all details there
var new_rstep = new Step
new_rstep.id = lhs.key
new_rstep.variableName = lhs.key
new_rstep.recordExp = lhs.value
new_rstep.type = field.recordField.type.type.name
new_rstep.inputFile = tsi.filePath
new_rstep.parameters.add(lhs) // Added DB 29.05.2025
// Add to list of step reference of step
stepInst.stepRefs.add(new_rstep)
} else {
// 4.9.2) record field assignment has it own json
stepInst.parameters.add(lhs)
}
}
}

return stepInst
}

}
Loading