Simplify Mode

Remove mode testing covered elsewhere, remove handling of empty
string for mode

3 files changed, 9 insertions, 65 deletions

diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Mode.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Mode.java
index da6e7d975cb..fdc2b886701 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Mode.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Mode.java
@@ -31,9 +31,6 @@ class Mode {
 
     Mode(String modeString) {
         switch (modeString.toLowerCase()) {
-            case "" :
-                mode = ModeName.DEFAULT;
-                break;
             case "default" :
                 mode = ModeName.DEFAULT;
                 break;
@@ -41,7 +38,7 @@ class Mode {
                 mode = ModeName.MEMORYCACHE;
                 break;
             default:
-                throw new IllegalArgumentException("Unrecognized mode'" + modeString + "' supplied");
+                throw new IllegalArgumentException("Unrecognized mode '" + modeString + "' supplied");
         }
     }
 
diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ModeTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ModeTest.java
deleted file mode 100644
index 1a6bbd11b59..00000000000
--- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ModeTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.config.proxy;
-
-import org.junit.Test;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
-/**
- * @author hmusum
- */
-public class ModeTest {
-
-    @Test
-    public void basic() {
-        Mode mode = new Mode();
-        assertModeName(Mode.ModeName.DEFAULT, mode);
-        assertTrue(mode.isDefault());
-
-        mode = new Mode("");
-        assertModeName(Mode.ModeName.DEFAULT, mode);
-        assertTrue(mode.isDefault());
-
-        mode = new Mode(Mode.ModeName.DEFAULT.name());
-        assertModeName(Mode.ModeName.DEFAULT, mode);
-        assertTrue(mode.isDefault());
-
-        mode = new Mode(Mode.ModeName.MEMORYCACHE.name());
-        assertModeName(Mode.ModeName.MEMORYCACHE, mode);
-        assertTrue(mode.isMemoryCache());
-
-        assertTrue(new Mode(Mode.ModeName.DEFAULT.name()).requiresConfigSource());
-
-        assertFalse(new Mode(Mode.ModeName.MEMORYCACHE.name()).requiresConfigSource());
-
-        Set<String> modes = new HashSet<>();
-        for (Mode.ModeName modeName : Mode.ModeName.values()) {
-            modes.add(modeName.name().toLowerCase());
-        }
-
-        assertThat(Mode.modes(), is(modes));
-
-        assertFalse(Mode.validModeName("foo"));
-
-        assertThat(mode.toString(), is(Mode.ModeName.MEMORYCACHE.name().toLowerCase()));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void failWhenInvalidMode() {
-        new Mode("invalid_mode");
-    }
-
-    private void assertModeName(Mode.ModeName expected, Mode actual) {
-        assertThat(actual.name(), is(expected.name().toLowerCase()));
-    }
-}
diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ProxyServerTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ProxyServerTest.java
index 803f5c85b5c..1c64631d205 100644
--- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ProxyServerTest.java
+++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ProxyServerTest.java
@@ -78,6 +78,14 @@ public class ProxyServerTest {
             assertThat(proxy.getMode().name(), is(mode));
         }
 
+        // Try setting an invalid mode
+        try {
+            proxy.setMode("invalid");
+            assert (false);
+        } catch (IllegalArgumentException e) {
+            assertEquals("Unrecognized mode 'invalid' supplied", e.getMessage());
+        }
+
         // Also switch to DEFAULT mode, as that is not covered above
         proxy.setMode("default");
         assertTrue(proxy.getMode().isDefault());