From fb7c73bb0f7ac96d923705c517816a635b6d324c Mon Sep 17 00:00:00 2001 From: afischerdev Date: Tue, 8 Nov 2022 18:09:03 +0100 Subject: [PATCH 1/4] add test profiles with lookups.dat --- .../IntegrityCheckProfileTest.java | 34 +++++++++++++++++++ misc/profiles2/softaccess.brf | 1 + 2 files changed, 35 insertions(+) create mode 100644 brouter-expressions/src/test/java/btools/expressions/IntegrityCheckProfileTest.java diff --git a/brouter-expressions/src/test/java/btools/expressions/IntegrityCheckProfileTest.java b/brouter-expressions/src/test/java/btools/expressions/IntegrityCheckProfileTest.java new file mode 100644 index 0000000..eb407d7 --- /dev/null +++ b/brouter-expressions/src/test/java/btools/expressions/IntegrityCheckProfileTest.java @@ -0,0 +1,34 @@ +package btools.expressions; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + +import org.junit.Test; + +import java.io.File; +import java.io.IOException; + +public class IntegrityCheckProfileTest { + + @Test + public void integrityTestProfiles() throws IOException { + File workingDir = new File(".").getCanonicalFile(); + File profileDir = new File(workingDir, "../misc/profiles2"); + File[] files = profileDir.listFiles(); + + assertNotNull("Missing profiles", files); + + for (File f : files) { + if (f.getName().endsWith(".brf")) { + BExpressionMetaData meta = new BExpressionMetaData(); + BExpressionContext expctxWay = new BExpressionContextWay( meta ); + BExpressionContext expctxNode = new BExpressionContextNode( meta ); + meta.readMetaData( new File( profileDir, "lookups.dat") ); + expctxNode.setForeignContext(expctxWay); + expctxWay.parseFile( f, "global" ); + expctxNode.parseFile( f, "global" ); + } + } + } + +} diff --git a/misc/profiles2/softaccess.brf b/misc/profiles2/softaccess.brf index a57a969..88d5a81 100644 --- a/misc/profiles2/softaccess.brf +++ b/misc/profiles2/softaccess.brf @@ -20,3 +20,4 @@ assign costfactor ---context:node # following code refers to node tags +assign initialcost = 0 From 717f8c03d4fd30e881dc672ca054eaaf8d1108d9 Mon Sep 17 00:00:00 2001 From: afischerdev Date: Wed, 9 Nov 2022 10:00:58 +0100 Subject: [PATCH 2/4] add cmd line test profiles vs lookup --- .../expressions/IntegrityCheckProfile.java | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 brouter-expressions/src/main/java/btools/expressions/IntegrityCheckProfile.java diff --git a/brouter-expressions/src/main/java/btools/expressions/IntegrityCheckProfile.java b/brouter-expressions/src/main/java/btools/expressions/IntegrityCheckProfile.java new file mode 100644 index 0000000..5c0e182 --- /dev/null +++ b/brouter-expressions/src/main/java/btools/expressions/IntegrityCheckProfile.java @@ -0,0 +1,50 @@ +package btools.expressions; + +import java.io.File; +import java.io.IOException; + +public class IntegrityCheckProfile { + + public static void main( final java.lang.String[] args ) { + if ( args.length != 2 ) { + System.out.println( "usage: java IntegrityCheckProfile " ); + return; + } + + IntegrityCheckProfile test = new IntegrityCheckProfile(); + try { + File lookupFile = new File( args[0] ); + File profileDir = new File( args[1] ); + test.integrityTestProfiles(lookupFile, profileDir); + } catch (Exception e) { + System.err.println(e.getMessage()); + } + } + + public void integrityTestProfiles(File lookupFile, File profileDir) throws IOException, Exception { + File[] files = profileDir.listFiles(); + + if (files==null) { + System.err.println("no files " + profileDir); + return; + } + if (!lookupFile.exists()) { + System.err.println("no lookup file " + lookupFile); + return; + } + + for (File f : files) { + if (f.getName().endsWith(".brf")) { + BExpressionMetaData meta = new BExpressionMetaData(); + BExpressionContext expctxWay = new BExpressionContextWay( meta ); + BExpressionContext expctxNode = new BExpressionContextNode( meta ); + meta.readMetaData( lookupFile ); + expctxNode.setForeignContext(expctxWay); + expctxWay.parseFile( f, "global" ); + expctxNode.parseFile( f, "global" ); + System.out.println("test " + meta.lookupVersion + "."+meta.lookupMinorVersion + " " + f); + } + } + } + +} From da878abb905e94e20a3e8ff5648a1d509588f774 Mon Sep 17 00:00:00 2001 From: afischerdev Date: Wed, 9 Nov 2022 10:06:37 +0100 Subject: [PATCH 3/4] add cmd line test profiles vs lookup --- .../main/java/btools/expressions/IntegrityCheckProfile.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/brouter-expressions/src/main/java/btools/expressions/IntegrityCheckProfile.java b/brouter-expressions/src/main/java/btools/expressions/IntegrityCheckProfile.java index 5c0e182..fca229c 100644 --- a/brouter-expressions/src/main/java/btools/expressions/IntegrityCheckProfile.java +++ b/brouter-expressions/src/main/java/btools/expressions/IntegrityCheckProfile.java @@ -11,11 +11,11 @@ public class IntegrityCheckProfile { return; } - IntegrityCheckProfile test = new IntegrityCheckProfile(); + IntegrityCheckProfile test = new IntegrityCheckProfile(); try { File lookupFile = new File( args[0] ); File profileDir = new File( args[1] ); - test.integrityTestProfiles(lookupFile, profileDir); + test.integrityTestProfiles(lookupFile, profileDir); } catch (Exception e) { System.err.println(e.getMessage()); } From 70be61a81e6a353d7c0c639f65c25f7ba406c57c Mon Sep 17 00:00:00 2001 From: afischerdev Date: Thu, 10 Nov 2022 10:53:53 +0100 Subject: [PATCH 4/4] made it pretty --- .../expressions/IntegrityCheckProfile.java | 18 +++++++++--------- .../expressions/IntegrityCheckProfileTest.java | 11 +++++------ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/brouter-expressions/src/main/java/btools/expressions/IntegrityCheckProfile.java b/brouter-expressions/src/main/java/btools/expressions/IntegrityCheckProfile.java index fca229c..8579653 100644 --- a/brouter-expressions/src/main/java/btools/expressions/IntegrityCheckProfile.java +++ b/brouter-expressions/src/main/java/btools/expressions/IntegrityCheckProfile.java @@ -6,15 +6,15 @@ import java.io.IOException; public class IntegrityCheckProfile { public static void main( final java.lang.String[] args ) { - if ( args.length != 2 ) { - System.out.println( "usage: java IntegrityCheckProfile " ); + if (args.length != 2) { + System.out.println("usage: java IntegrityCheckProfile "); return; } IntegrityCheckProfile test = new IntegrityCheckProfile(); try { - File lookupFile = new File( args[0] ); - File profileDir = new File( args[1] ); + File lookupFile = new File(args[0]); + File profileDir = new File(args[1]); test.integrityTestProfiles(lookupFile, profileDir); } catch (Exception e) { System.err.println(e.getMessage()); @@ -36,12 +36,12 @@ public class IntegrityCheckProfile { for (File f : files) { if (f.getName().endsWith(".brf")) { BExpressionMetaData meta = new BExpressionMetaData(); - BExpressionContext expctxWay = new BExpressionContextWay( meta ); - BExpressionContext expctxNode = new BExpressionContextNode( meta ); - meta.readMetaData( lookupFile ); + BExpressionContext expctxWay = new BExpressionContextWay(meta); + BExpressionContext expctxNode = new BExpressionContextNode(meta); + meta.readMetaData(lookupFile); expctxNode.setForeignContext(expctxWay); - expctxWay.parseFile( f, "global" ); - expctxNode.parseFile( f, "global" ); + expctxWay.parseFile(f, "global"); + expctxNode.parseFile(f, "global"); System.out.println("test " + meta.lookupVersion + "."+meta.lookupMinorVersion + " " + f); } } diff --git a/brouter-expressions/src/test/java/btools/expressions/IntegrityCheckProfileTest.java b/brouter-expressions/src/test/java/btools/expressions/IntegrityCheckProfileTest.java index eb407d7..bd32fbf 100644 --- a/brouter-expressions/src/test/java/btools/expressions/IntegrityCheckProfileTest.java +++ b/brouter-expressions/src/test/java/btools/expressions/IntegrityCheckProfileTest.java @@ -1,7 +1,6 @@ package btools.expressions; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; import org.junit.Test; @@ -21,12 +20,12 @@ public class IntegrityCheckProfileTest { for (File f : files) { if (f.getName().endsWith(".brf")) { BExpressionMetaData meta = new BExpressionMetaData(); - BExpressionContext expctxWay = new BExpressionContextWay( meta ); - BExpressionContext expctxNode = new BExpressionContextNode( meta ); - meta.readMetaData( new File( profileDir, "lookups.dat") ); + BExpressionContext expctxWay = new BExpressionContextWay(meta); + BExpressionContext expctxNode = new BExpressionContextNode(meta); + meta.readMetaData(new File( profileDir, "lookups.dat")); expctxNode.setForeignContext(expctxWay); - expctxWay.parseFile( f, "global" ); - expctxNode.parseFile( f, "global" ); + expctxWay.parseFile(f, "global"); + expctxNode.parseFile(f, "global"); } } }