ben/brouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Reformat whole codebase using Android Studio

Browse source
This commit is contained in:
Manuel Fuhr 2022-07-11 06:30:17 +02:00
parent d5322667d5
commit c15913c1ab
161 changed files with 15124 additions and 18537 deletions
Download patch file Download diff file Expand all files Collapse all files

19
brouter-server/src/test/java/btools/server/IntegrityCheckTest.java
View file

@ -8,24 +8,21 @@ import org.junit.Test;
import btools.mapaccess.PhysicalFile;
public class IntegrityCheckTest
{
public class IntegrityCheckTest {
private File workingDir;
@Test
public void integrityTest() throws Exception
{
URL resulturl = this.getClass().getResource( "/testtrack0.gpx" );
Assert.assertTrue( "reference result not found: ", resulturl != null );
File resultfile = new File( resulturl.getFile() );
public void integrityTest() throws Exception {
URL resulturl = this.getClass().getResource("/testtrack0.gpx");
Assert.assertTrue("reference result not found: ", resulturl != null);
File resultfile = new File(resulturl.getFile());
workingDir = resultfile.getParentFile();
File segmentDir = new File( workingDir, "/../../../../brouter-map-creator/build/resources/test/tmp/segments" );
File segmentDir = new File(workingDir, "/../../../../brouter-map-creator/build/resources/test/tmp/segments");
File[] files = segmentDir.listFiles();
for ( File f : files )
{
PhysicalFile.checkFileIntegrity( f );
for (File f : files) {
PhysicalFile.checkFileIntegrity(f);
}
}

54
brouter-server/src/test/java/btools/server/RouterTest.java
View file

@ -4,75 +4,73 @@ import java.util.*;
import org.junit.Assert;
import org.junit.Test;
import java.net.URL;
import java.io.File;
import btools.router.*;
import btools.mapaccess.*;
public class RouterTest
{
public class RouterTest {
private File workingDir;
@Test
public void routerTest() throws Exception
{
URL resulturl = this.getClass().getResource( "/testtrack0.gpx" );
Assert.assertTrue( "reference result not found: ", resulturl != null );
public void routerTest() throws Exception {
URL resulturl = this.getClass().getResource("/testtrack0.gpx");
Assert.assertTrue("reference result not found: ", resulturl != null);
File resultfile = new File(resulturl.getFile());
workingDir = resultfile.getParentFile();
String msg;
// first test: route within dreiech test-map crossing tile border
msg = calcRoute( 8.720897, 50.002515, 8.723658, 49.997510, "testtrack" );
msg = calcRoute(8.720897, 50.002515, 8.723658, 49.997510, "testtrack");
// error message from router?
Assert.assertTrue( "routing failed: " + msg, msg == null );
Assert.assertTrue("routing failed: " + msg, msg == null);
// if the track didn't change, we expect the first alternative also
File a1 = new File( workingDir, "testtrack1.gpx" );
Assert.assertTrue( "result content missmatch", a1.exists() );
File a1 = new File(workingDir, "testtrack1.gpx");
Assert.assertTrue("result content missmatch", a1.exists());
// second test: to-point far off
msg = calcRoute( 8.720897, 50.002515, 16.723658, 49.997510, "notrack" );
msg = calcRoute(8.720897, 50.002515, 16.723658, 49.997510, "notrack");
Assert.assertTrue( msg, msg != null && msg.indexOf( "not found" ) >= 0 );
Assert.assertTrue(msg, msg != null && msg.indexOf("not found") >= 0);
}
private String calcRoute( double flon, double flat, double tlon, double tlat, String trackname ) throws Exception
{
private String calcRoute(double flon, double flat, double tlon, double tlat, String trackname) throws Exception {
String wd = workingDir.getAbsolutePath();
List<OsmNodeNamed> wplist = new ArrayList<OsmNodeNamed>();
OsmNodeNamed n;
n = new OsmNodeNamed();
n.name = "from";
n.ilon = 180000000 + (int)(flon*1000000 + 0.5);
n.ilat = 90000000 + (int)(flat*1000000 + 0.5);
wplist.add( n );
n.ilon = 180000000 + (int) (flon * 1000000 + 0.5);
n.ilat = 90000000 + (int) (flat * 1000000 + 0.5);
wplist.add(n);
n = new OsmNodeNamed();
n.name = "to";
n.ilon = 180000000 + (int)(tlon*1000000 + 0.5);
n.ilat = 90000000 + (int)(tlat*1000000 + 0.5);
wplist.add( n );
n.ilon = 180000000 + (int) (tlon * 1000000 + 0.5);
n.ilat = 90000000 + (int) (tlat * 1000000 + 0.5);
wplist.add(n);
RoutingContext rctx = new RoutingContext();
rctx.localFunction = wd + "/../../../../misc/profiles2/trekking.brf";
// c.setAlternativeIdx( 1 );
RoutingEngine re = new RoutingEngine(
wd + "/" + trackname,
wd + "/" + trackname,
new File ( wd, "/../../../../brouter-map-creator/build/resources/test/tmp/segments"),
wplist,
rctx );
wd + "/" + trackname,
wd + "/" + trackname,
new File(wd, "/../../../../brouter-map-creator/build/resources/test/tmp/segments"),
wplist,
rctx);
re.doRun(0);
re.doRun( 0 );
return re.getErrorMessage();
}