Fix tests and smells

xenon-middleware · Apr 17, 2019 · b161702 · b161702
1 parent c5d8b7f
commit b161702
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/src/main/java/nl/esciencecenter/xenon/grpc/MapUtils.java b/src/main/java/nl/esciencecenter/xenon/grpc/MapUtils.java
@@ -7,7 +7,6 @@
 
 import io.grpc.Status;
 import io.grpc.StatusException;
-import nl.esciencecenter.xenon.credentials.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -20,6 +19,13 @@
 import nl.esciencecenter.xenon.XenonException;
 import nl.esciencecenter.xenon.XenonPropertyDescription;
 import nl.esciencecenter.xenon.adaptors.NotConnectedException;
+import nl.esciencecenter.xenon.credentials.CertificateCredential;
+import nl.esciencecenter.xenon.credentials.Credential;
+import nl.esciencecenter.xenon.credentials.CredentialMap;
+import nl.esciencecenter.xenon.credentials.DefaultCredential;
+import nl.esciencecenter.xenon.credentials.KeytabCredential;
+import nl.esciencecenter.xenon.credentials.PasswordCredential;
+import nl.esciencecenter.xenon.credentials.UserCredential;
 import nl.esciencecenter.xenon.filesystems.InvalidPathException;
 import nl.esciencecenter.xenon.filesystems.NoSuchPathException;
 import nl.esciencecenter.xenon.filesystems.PathAlreadyExistsException;
@@ -137,6 +143,7 @@ private static Credential mapCredentialMap(XenonProto.CredentialMap credentialMa
                 break;
             case KEYTAB_CREDENTIAL:
                 cred = new CredentialMap(mapKeyTabCredential(credentialMap.getKeytabCredential()));
+                break;
             case FALLBACK_NOT_SET:
                 break;
         }

diff --git a/src/test/java/nl/esciencecenter/xenon/grpc/filesystems/FileSystemServiceBlockingTest.java b/src/test/java/nl/esciencecenter/xenon/grpc/filesystems/FileSystemServiceBlockingTest.java
@@ -649,7 +649,7 @@ public void getAdaptorDescription() throws XenonException {
 
     @Test
     public void getAdaptorDescription_unknown() throws XenonException {
-        thrown.expectMessage("NOT_FOUND: nl.esciencecenter.xenon.UnknownAdaptorException: FileSystem adaptor: Adaptor 'bigstore' not found");
+        thrown.expectMessage("NOT_FOUND: nl.esciencecenter.xenon.UnknownAdaptorException: AdaptorLoader adaptor: Adaptor 'bigstore' not found");
 
         XenonProto.AdaptorName request = XenonProto.AdaptorName.newBuilder()
             .setName("bigstore")

diff --git a/src/test/java/nl/esciencecenter/xenon/grpc/schedulers/SchedulerServiceBlockingTest.java b/src/test/java/nl/esciencecenter/xenon/grpc/schedulers/SchedulerServiceBlockingTest.java
@@ -111,7 +111,7 @@ public void getAdaptorDescription() throws Exception {
 
     @Test
     public void getAdaptorDescription_unknown() throws XenonException {
-        thrown.expectMessage("NOT_FOUND: nl.esciencecenter.xenon.UnknownAdaptorException: Scheduler adaptor: Adaptor 'bigcompute' not found");
+        thrown.expectMessage("NOT_FOUND: nl.esciencecenter.xenon.UnknownAdaptorException: AdaptorLoader adaptor: Adaptor 'bigcompute' not found");
 
         XenonProto.AdaptorName request = XenonProto.AdaptorName.newBuilder()
             .setName("bigcompute")

diff --git a/src/test/java/nl/esciencecenter/xenon/grpc/schedulers/maputils/MapJobDescriptionTest.java b/src/test/java/nl/esciencecenter/xenon/grpc/schedulers/maputils/MapJobDescriptionTest.java
@@ -78,6 +78,7 @@ public void custom() {
         expected.setJobOptions(opts);
         expected.setName("myjobname");
         expected.setMaxMemory(4096);
+        expected.setSchedulerArguments("schedarg1", "schedarg2");
         assertEquals(expected, response);
         assertEquals(schedulerArgs, response.getSchedulerArguments());
     }