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.

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

Improved grammar to add support for multiple transitions #57

Merged
merged 17 commits into from
Oct 23, 2023
Merged
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5953658
changed database calls to use the changed names in recent SEP3 demo f…
wanhoff Sep 24, 2023
d08e822
added test strings with expected result for sep3 and bml in propertie…
wanhoff Apr 23, 2023
7439d8e
added recognition for several other "Datenfeld" entries.
wanhoff May 20, 2023
6aaa552
added Datenfeld as parameter for commanline and in database function …
wanhoff May 24, 2023
8cb07ac
changed test due to add percent character to grammar
wanhoff May 24, 2023
eb0014d
disabled database dependend integration tests
wanhoff May 24, 2023
fa34744
changed database calls to use the changed names in recent SEP3 demo f…
wanhoff Sep 24, 2023
5af28b5
Merge branch 'newTestFileAndDBProperties' of github.com:lat-lon/sep3-…
wanhoff Sep 24, 2023
70369e4
Merge pull request #51 from lat-lon/main
wanhoff Sep 24, 2023
f6521b8
Merge branch 'newTestFileAndDBProperties' of github.com:lat-lon/sep3-…
wanhoff Sep 24, 2023
030621a
moved properties files and fixed database connection for in database use
wanhoff Sep 24, 2023
3cec44c
added missing statement when the connection was changed with new cred…
wanhoff Sep 27, 2023
fe2114c
added support for mutliple uebergaenge
wanhoff Oct 3, 2023
cda62e7
added properties fraglich and sicher for bestandteil
wanhoff Oct 3, 2023
5ef670a
Merge branch 'main' into feature/multipleUebergaenge
wanhoff Oct 23, 2023
b48e011
Merge branch 'feature/multipleUebergaenge' of github.com:lat-lon/sep3…
wanhoff Oct 23, 2023
9a9fe79
removed double entry for df variable
wanhoff Oct 23, 2023
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
Prev Previous commit
Next Next commit
Merge branch 'main' into feature/multipleUebergaenge
wanhoff authored Oct 23, 2023
commit 5ef670ac27ffd154593914d9fce64ca97de55f44
2 changes: 1 addition & 1 deletion src/test/java/org/sep3tools/SepExamplesTest.java
Original file line number Diff line number Diff line change
@@ -34,6 +34,7 @@ public class SepExamplesTest {
@Test
public void verifyPetroExamples() {
verifySepExamples("PETRO", "src/main/resources/petrotest.properties");

}

@Test
@@ -74,7 +75,6 @@ public void verifyFarbeExamples() {
public void verifySepExamples(String df, String propFile) {

JavaConnector.setPropertiesFile(DBPROPFILENAME);

JavaConnector.setDf(df);

try {
You are viewing a condensed version of this merge commit. You can view the full changes here.