bring C++ and Java APIs into sync

* detect and make accessible port numbers to use for
  config server / config proxy from Java also.
* port numbers are relative to VESPA_PORT_BASE if not
  explicitly specified.
* try to make the logic in C++ and Java more similar.

1 files changed, 10 insertions, 0 deletions

diff --git a/defaults/src/test/java/com/yahoo/vespa/defaults/DefaultsTestCase.java b/defaults/src/test/java/com/yahoo/vespa/defaults/DefaultsTestCase.java
index 75da8e1146f..c9b7326758d 100644
--- a/defaults/src/test/java/com/yahoo/vespa/defaults/DefaultsTestCase.java
+++ b/defaults/src/test/java/com/yahoo/vespa/defaults/DefaultsTestCase.java
@@ -22,4 +22,14 @@ public class DefaultsTestCase {
         assertEquals("vespa", Defaults.getDefaults().vespaUser());
     }
 
+    @Test
+    public void testPortsArePositive() {
+        Defaults d = Defaults.getDefaults();
+        assertEquals(true, d.vespaPortBase() > 0);
+        assertEquals(true, d.vespaWebServicePort() > 0);
+        assertEquals(true, d.vespaConfigServerRpcPort() > 0);
+        assertEquals(true, d.vespaConfigServerHttpPort() > 0);
+        assertEquals(true, d.vespaConfigProxyRpcPort() > 0);
+    }
+
 }