Skip to content

Commit

Permalink
fix CI/test setup
Browse files Browse the repository at this point in the history
  • Loading branch information
danthe1st committed Sep 24, 2024
1 parent 3b26efb commit 0b5856d
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 11 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.dump filter=lfs diff=lfs merge=lfs -text
4 changes: 4 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
lfs: true
- name: Set up JDK
uses: actions/setup-java@v4
with:
Expand All @@ -34,6 +36,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
lfs: true
- name: Set up JDK
uses: graalvm/setup-graalvm@v1
with:
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
arebac-neo4j/testdb
*.jfr
profile*.html
*.dump

# Created by https://www.toptal.com/developers/gitignore/api/eclipse,java,maven
# Edit at https://www.toptal.com/developers/gitignore?templates=eclipse,java,maven
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,7 @@ public class Neo4JSetup {
public static Label ANSWER = Label.label("Answer");
public static Label COMMENT = Label.label("Comment");

private static GraphDatabaseService graphDb;

public static synchronized GraphDatabaseService createDatabase(Path dbDirectory, URL dumpLocation) throws IOException, IncorrectFormat, InterruptedException {
if(graphDb != null){
return graphDb;
}
boolean databaseExists = Files.exists(dbDirectory);
DatabaseManagementService databaseManagementService = createManagementService(dbDirectory);
if(!databaseExists){
Expand All @@ -63,7 +58,6 @@ private static GraphDatabaseService createDB(DatabaseManagementService databaseM
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
service.shutdown();
}));
Neo4JSetup.graphDb = graphDb;
return graphDb;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public AirbnbState() {
}

public GraphPattern nextHostPattern() {
return Scenario1.createAuthorizedCetAllReviewsFromHostGraphPattern(nextHostId());
return Scenario1Test.createAuthorizedCetAllReviewsFromHostGraphPattern(nextHostId());
}

public String nextHostId() {
Expand All @@ -97,7 +97,7 @@ public String nextHostId() {
}

public GraphPattern nextReviewerPattern() {
return Scenario1.createAuthorizedGetAllReviewsFromReviewerGraphPattern(nextReviewerId());
return Scenario1Test.createAuthorizedGetAllReviewsFromReviewerGraphPattern(nextReviewerId());
}

public String nextReviewerId() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
* The idea/scenario this file is based on was provided by the Institut für anwendungsorientierte Wissensverarbeitung at Johannes Kepler University Linz.
* The source code was written by Daniel Schmid.
*/
class Scenario1 {
class Scenario1Test {

private GraphDatabaseService database;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
* The idea/scenario this file is based on was provided by the Institut für anwendungsorientierte Wissensverarbeitung at Johannes Kepler University Linz.
* The source code was written by Daniel Schmid.
*/
class Scenario2 {
class Scenario2Test {

private GraphDatabaseService database;

Expand Down
3 changes: 3 additions & 0 deletions arebac-neo4j/src/test/resources/testdumps/airbnb/airbnb.dump
Git LFS file not shown

0 comments on commit 0b5856d

Please sign in to comment.