Skip to content

Commit

Permalink
Merge pull request #133 from discipl/enforce-import
Browse files Browse the repository at this point in the history
Fixed enforce import, added extra language node tests
  • Loading branch information
TristanAlbers authored May 23, 2022
2 parents 149c402 + b089c2e commit e40cdfc
Show file tree
Hide file tree
Showing 13 changed files with 578 additions and 66 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ data class Language(
val claimant: String,
val create: String,
val terminate: String,
val enforce: String,
val dutyComponents: String,
val explanation: String,
val actor: String,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class FlintLanguageParserTest {
val language = languageParser.importedLanguage
val correctLanguage: Language = Language("Dutch","naam","daden","feiten",
"plichten","functie","referentie","taak-eigenaar","eiser",
"maak","beindig","taak-onderdelen","uitleg","actie-ondernemer",
"maak","beindig","handhaven","taak-onderdelen","uitleg","actie-ondernemer",
"actie","object","ontvanger","pre-conditie","taal","bronnen",
"tekst","Vind lijn in Bron","geldig vanaf","geldig tot","labels",
"versie","geverifieerd","gevalideerd","gepubliceerd","selecteer versie")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ internal class FlintParserTest {
val language = flintParser.getLanguage()
val correctLanguage: Language = Language("Dutch","naam","daden","feiten",
"plichten","functie","referentie","taak-eigenaar","eiser",
"maak","beindig","taak-onderdelen","uitleg","actie-ondernemer",
"maak","beindig","handhaven","taak-onderdelen","uitleg","actie-ondernemer",
"actie","object","ontvanger","pre-conditie","taal","bronnen",
"tekst","Vind lijn in Bron","geldig vanaf","geldig tot","labels",
"versie","geverifieerd","gevalideerd","gepubliceerd","selecteer versie")
Expand All @@ -237,7 +237,7 @@ internal class FlintParserTest {
val language = flintParser.getLanguage()
val correctLanguage: Language = Language("English","name","acts","facts",
"duties","function","references","duty-holder","claimaint",
"create","terminate","duty-components","explanation","actor",
"create","terminate","enforce","duty-components","explanation","actor",
"action","object","recipient","preconditions","language","sources",
"text","Find line in Source","valid from","valid to","tags",
"version","verified","validated","publicized","select version")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"claimant": "eiser",
"create": "maak",
"terminate": "beindig",
"enforce": "handhaven",
"dutyComponents": "taak-onderdelen",
"explanation": "uitleg",
"actor": "actie-ondernemer",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"claimant": "eiser",
"create": "maak",
"terminate": "beindig",
"enforce": "handhaven",
"dutyComponents": "taak-onderdelen",
"explanation": "uitleg",
"actor": "actie-ondernemer",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"claimant": "claimaint",
"create": "create",
"terminate": "terminate",
"enforce": "enforce",
"dutyComponents": "duty-components",
"explanation": "explanation",
"actor": "actor",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"claimant": "claimaint",
"create": "create",
"terminate": "terminate",
"enforce": "enforce",
"dutyComponents": "duty-components",
"explanation": "explanation",
"actor": "actor",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"claimant": "claimaint",
"create": "create",
"terminate": "terminate",
"enforce": "enforce",
"dutyComponents": "duty-components",
"explanation": "explanation",
"actor": "actor",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"claimant": "claimaint",
"create": "create",
"terminate": "terminate",
"enforce": "enforce",
"dutyComponents": "duty-components",
"explanation": "explanation",
"actor": "actor",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"claimant": "claimaint",
"create": "create",
"terminate": "terminate",
"enforce": "enforce",
"dutyComponents": "duty-components",
"explanation": "explanation",
"actor": "actor",
Expand Down
8 changes: 4 additions & 4 deletions code/solutions/Flint.plugin/models/Flint.plugin.plugin.mps
Original file line number Diff line number Diff line change
Expand Up @@ -6073,8 +6073,8 @@
<node concept="37vLTw" id="5BwUVa5m1RA" role="2Oq$k0">
<ref role="3cqZAo" node="5BwUVa5m1TJ" resolve="importedLanguage" />
</node>
<node concept="liA8E" id="5BwUVa5m1RB" role="2OqNvi">
<ref role="37wK5l" to="5qsh:~Language.getDutyComponents()" resolve="getDutyComponents" />
<node concept="liA8E" id="7NvjjCVVq5G" role="2OqNvi">
<ref role="37wK5l" to="5qsh:~Language.getEnforce()" resolve="getEnforce" />
</node>
</node>
<node concept="2OqwBi" id="5BwUVa5m1RC" role="37vLTJ">
Expand Down Expand Up @@ -23463,8 +23463,8 @@
<node concept="37vLTw" id="5fVLlSDdaEV" role="2Oq$k0">
<ref role="3cqZAo" node="5fVLlSDd3ft" resolve="importedLanguage" />
</node>
<node concept="liA8E" id="3b5Mgwq$23f" role="2OqNvi">
<ref role="37wK5l" to="5qsh:~Language.getDutyComponents()" resolve="getDutyComponents" />
<node concept="liA8E" id="7NvjjCVVeoh" role="2OqNvi">
<ref role="37wK5l" to="5qsh:~Language.getEnforce()" resolve="getEnforce" />
</node>
</node>
<node concept="2OqwBi" id="5fVLlSDc3cb" role="37vLTJ">
Expand Down
Loading

0 comments on commit e40cdfc

Please sign in to comment.