Skip to content
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

Jump to bottom

Add xtext project for contracts #896

Merged
merged 4 commits into from
Feb 8, 2025
Merged

Add xtext project for contracts #896

merged 4 commits into from
Feb 8, 2025

Conversation

Felix-Schmid
Copy link

Currently with a dummy implementation to be extended later.

@Felix-Schmid
Add xtext project for contracts
2942668 
Currently with a dummy implementation to be extended later.
@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 21, 2024 •
edited
Loading

Test Results

   113 files  +   71     113 suites  +71   49s ⏱️ +14s
29 181 tests +7 101  29 181 ✅ +7 101  0 💤 ±0  0 ❌ ±0 
29 182 runs  +7 101  29 182 ✅ +7 101  0 💤 ±0  0 ❌ ±0 

Results for commit adb5630. ± Comparison against base commit 49e590a.

This pull request removes 10 and adds 7111 tests. Note that renamed tests count towards both. 
org.eclipse.fordiac.ide.test.model.value.ValueConverterTest ‑ toStringTest(ValueConverter, String, Object)[27] StructValueConverter [NumericValueConverter], (a := 17, b := 4), {a=17, b=4}
org.eclipse.fordiac.ide.test.model.value.ValueConverterTest ‑ toStringTest(ValueConverter, String, Object)[28] StructValueConverter [StringValueConverter], (a := 'ab,xy', b := 'ab,$',xy'), {a=ab,xy, b=ab,',xy}
org.eclipse.fordiac.ide.test.model.value.ValueConverterTest ‑ toStringTest(ValueConverter, String, Object)[29] StructValueConverter [ArrayValueConverter [StringValueConverter]], (a := ['abc', 'ab,xy', 'ab,$',xy'], b := ['test', 'value']), {a=[abc, ab,xy, ab,',xy], b=[test, value]}
org.eclipse.fordiac.ide.test.model.value.ValueConverterTest ‑ toValueTest(ValueConverter, Object, String)[43] ArrayValueConverter [NumericValueConverter], class java.lang.IllegalArgumentException, 
org.eclipse.fordiac.ide.test.model.value.ValueConverterTest ‑ toValueTest(ValueConverter, Object, String)[45] ArrayValueConverter [NumericValueConverter], class java.lang.IllegalArgumentException, NoArray
org.eclipse.fordiac.ide.test.model.value.ValueConverterTest ‑ toValueTest(ValueConverter, Object, String)[46] ArrayValueConverter [NumericValueConverter], class java.lang.IllegalArgumentException, [17,,]
org.eclipse.fordiac.ide.test.model.value.ValueConverterTest ‑ toValueTest(ValueConverter, Object, String)[47] ArrayValueConverter [NumericValueConverter], class java.lang.IllegalArgumentException, [4
org.eclipse.fordiac.ide.test.model.value.ValueConverterTest ‑ toValueTest(ValueConverter, Object, String)[48] StructValueConverter [NumericValueConverter], {a=17, b=4}, (a:=17,b:=4)
org.eclipse.fordiac.ide.test.model.value.ValueConverterTest ‑ toValueTest(ValueConverter, Object, String)[49] StructValueConverter [StringValueConverter], {a=ab,xy, b=ab,',xy}, (a:='ab,xy',b:='ab,$',xy')
org.eclipse.fordiac.ide.test.model.value.ValueConverterTest ‑ toValueTest(ValueConverter, Object, String)[50] StructValueConverter [ArrayValueConverter [StringValueConverter]], {a=[abc, ab,xy, ab,',xy], b=[test, value]}, (a:=['abc','ab,xy','ab,$',xy'],b:=['test','value'])

org.eclipse.fordiac.ide.application.commands.FlattenSubAppCommandTest ‑ testCommand(String, StateInitializer, StateVerifier, Iterable, CommandExecutor, CommandExecutor, TestInfo) 10: Start with two FBs in FBNetwork : Execute until Command 1: Create SubApp
org.eclipse.fordiac.ide.application.commands.FlattenSubAppCommandTest ‑ testCommand(String, StateInitializer, StateVerifier, Iterable, CommandExecutor, CommandExecutor, TestInfo) 11: Start with two FBs in FBNetwork : Execute until Command 1: Create SubApp, run Undo
org.eclipse.fordiac.ide.application.commands.FlattenSubAppCommandTest ‑ testCommand(String, StateInitializer, StateVerifier, Iterable, CommandExecutor, CommandExecutor, TestInfo) 12: Start with two FBs in FBNetwork : Execute until Command 1: Create SubApp, run Undo, run Redo
org.eclipse.fordiac.ide.application.commands.FlattenSubAppCommandTest ‑ testCommand(String, StateInitializer, StateVerifier, Iterable, CommandExecutor, CommandExecutor, TestInfo) 13: Start with two FBs in FBNetwork : Execute until Command 2: Flatten SubApp
org.eclipse.fordiac.ide.application.commands.FlattenSubAppCommandTest ‑ testCommand(String, StateInitializer, StateVerifier, Iterable, CommandExecutor, CommandExecutor, TestInfo) 14: Start with two FBs in FBNetwork : Execute until Command 2: Flatten SubApp, run Undo
org.eclipse.fordiac.ide.application.commands.FlattenSubAppCommandTest ‑ testCommand(String, StateInitializer, StateVerifier, Iterable, CommandExecutor, CommandExecutor, TestInfo) 15: Start with two FBs in FBNetwork : Execute until Command 2: Flatten SubApp, run Undo, run Redo
org.eclipse.fordiac.ide.application.commands.FlattenSubAppCommandTest ‑ testCommand(String, StateInitializer, StateVerifier, Iterable, CommandExecutor, CommandExecutor, TestInfo) 16: Start with two FBs in FBNetwork : Execute all Commands interspersed with Undo and Redo
org.eclipse.fordiac.ide.application.commands.FlattenSubAppCommandTest ‑ testCommand(String, StateInitializer, StateVerifier, Iterable, CommandExecutor, CommandExecutor, TestInfo) 17: Start with two FBs in FBNetwork : Verify initial State
org.eclipse.fordiac.ide.application.commands.FlattenSubAppCommandTest ‑ testCommand(String, StateInitializer, StateVerifier, Iterable, CommandExecutor, CommandExecutor, TestInfo) 18: Start with two FBs in FBNetwork : Execute until Command 1: Create Data Connections
org.eclipse.fordiac.ide.application.commands.FlattenSubAppCommandTest ‑ testCommand(String, StateInitializer, StateVerifier, Iterable, CommandExecutor, CommandExecutor, TestInfo) 19: Start with two FBs in FBNetwork : Execute until Command 1: Create Data Connections, run Undo
…

♻️ This comment has been updated with latest results.

@Felix-Schmid
Copy link
Author

Ok, I just saw that there are build errors, will make an update soon.

@Felix-Schmid
Copy link
Author

Requesting review for this PR, since my next one is dependent on this. @bwiesmayr

bwiesmayr
bwiesmayr reviewed Feb 7, 2025
View reviewed changes
Copy link
Contributor

@bwiesmayr bwiesmayr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The copyright headers aren't all correct.
They should be as abundantly as possible, because we tend to have automated checks that they are there, hence, the formatting also often matters.

Please check the jdt.prefs and the MANIFEST-files (comments below).

...s/org.eclipse.fordiac.ide.contractspec/src/org/eclipse/fordiac/ide/GenerateContractSpec.mwe2 Show resolved Hide resolved
...iac.ide.contractspec/src-gen/org/eclipse/fordiac/ide/services/ContractSpecGrammarAccess.java Outdated Show resolved Hide resolved
...ctspec/src-gen/org/eclipse/fordiac/ide/parser/antlr/internal/InternalContractSpecParser.java Outdated Show resolved Hide resolved
...c.ide.contractspec/src-gen/org/eclipse/fordiac/ide/contractSpec/util/ContractSpecSwitch.java Outdated Show resolved Hide resolved
plugins/org.eclipse.fordiac.ide.contractspec/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
eclipse.preferences.version=1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

did you copy them from another plugin? we usually have the same prefs on all plugins

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those were the default. I now copied all the .prefs files from the globalconstantseditor plugins.

plugins/org.eclipse.fordiac.ide.contractspec.ui/.settings/org.eclipse.jdt.core.prefs Outdated
org.eclipse.jdt.core.compiler.compliance=21
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=enabled
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think these are identical in all projects, did you check the other pref files?

plugins/org.eclipse.fordiac.ide.contractspec.ui.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
org.eclipse.jdt.core.compiler.compliance=21
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think these are identical in all projects, did you check the other pref files?

plugins/org.eclipse.fordiac.ide.contractspec.ui.tests/META-INF/MANIFEST.MF Outdated Show resolved Hide resolved
...gen/org/eclipse/fordiac/ide/ide/contentassist/antlr/internal/InternalContractSpecParser.java Outdated Show resolved Hide resolved
@bwiesmayr bwiesmayr merged commit e5123e5 into eclipse-4diac:develop Feb 8, 2025
4 checks passed
@Felix-Schmid Felix-Schmid deleted the contractspec-plugin branch February 8, 2025 11:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bwiesmayr bwiesmayr bwiesmayr approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Felix-Schmid @bwiesmayr