-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Cleanup null validation when configuration image (#768)
* Cleanup null validation when configuration image
- Loading branch information
1 parent
c3a5d64
commit 42842a8
Showing
3 changed files
with
105 additions
and
104 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
102 changes: 102 additions & 0 deletions
102
...re/src/test/java/com/google/cloud/tools/jib/configuration/ContainerConfigurationTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| /* | ||
| * Copyright 2018 Google LLC. All rights reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not | ||
| * use this file except in compliance with the License. You may obtain a copy of | ||
| * the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations under | ||
| * the License. | ||
| */ | ||
|
|
||
| package com.google.cloud.tools.jib.configuration; | ||
|
|
||
| import com.google.cloud.tools.jib.configuration.Port.Protocol; | ||
| import com.google.common.collect.ImmutableMap; | ||
| import java.util.Arrays; | ||
| import java.util.HashMap; | ||
| import java.util.Hashtable; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.TreeMap; | ||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
|
|
||
| /** Tests for {@link ContainerConfiguration}. */ | ||
| public class ContainerConfigurationTest { | ||
|
|
||
| @Test | ||
| public void testBuilder_nullValues() { | ||
| // Java arguments element should not be null. | ||
| try { | ||
| ContainerConfiguration.builder().setProgramArguments(Arrays.asList("first", null)); | ||
| Assert.fail("The IllegalArgumentException should be thrown."); | ||
| } catch (IllegalArgumentException ex) { | ||
| Assert.assertNull(ex.getMessage()); | ||
| } | ||
|
|
||
| // Entrypoint element should not be null. | ||
| try { | ||
| ContainerConfiguration.builder().setEntrypoint(Arrays.asList("first", null)); | ||
| Assert.fail("The IllegalArgumentException should be thrown."); | ||
| } catch (IllegalArgumentException ex) { | ||
| Assert.assertNull(ex.getMessage()); | ||
| } | ||
|
|
||
| // Exposed ports element should not be null. | ||
| List<Port> badPorts = Arrays.asList(new Port(1000, Protocol.TCP), null); | ||
| try { | ||
| ContainerConfiguration.builder().setExposedPorts(badPorts); | ||
| Assert.fail("The IllegalArgumentException should be thrown."); | ||
| } catch (IllegalArgumentException ex) { | ||
| Assert.assertNull(ex.getMessage()); | ||
| } | ||
|
|
||
| // Labels element should not be null. | ||
| Map<String, String> badLabels = new HashMap<>(); | ||
| badLabels.put("label-key", null); | ||
| try { | ||
| ContainerConfiguration.builder().setLabels(badLabels); | ||
| Assert.fail("The IllegalArgumentException should be thrown."); | ||
| } catch (IllegalArgumentException ex) { | ||
| Assert.assertNull(ex.getMessage()); | ||
| } | ||
|
|
||
| // Environment keys element should not be null. | ||
| Map<String, String> nullKeyMap = new HashMap<>(); | ||
| nullKeyMap.put(null, "value"); | ||
|
|
||
| try { | ||
| ContainerConfiguration.builder().setEnvironment(nullKeyMap); | ||
| Assert.fail("The IllegalArgumentException should be thrown."); | ||
| } catch (IllegalArgumentException ex) { | ||
| Assert.assertNull(ex.getMessage()); | ||
| } | ||
|
|
||
| // Environment values element should not be null. | ||
| Map<String, String> nullValueMap = new HashMap<>(); | ||
| nullValueMap.put("key", null); | ||
| try { | ||
| ContainerConfiguration.builder().setEnvironment(nullValueMap); | ||
| Assert.fail("The IllegalArgumentException should be thrown."); | ||
| } catch (IllegalArgumentException ex) { | ||
| Assert.assertNull(ex.getMessage()); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| @SuppressWarnings("JdkObsolete") // for hashtable | ||
| public void testBuilder_environmentMapTypes() { | ||
| // Can accept empty environment. | ||
| ContainerConfiguration.builder().setEnvironment(ImmutableMap.of()).build(); | ||
|
|
||
| // Can handle other map types (https://github.com/GoogleContainerTools/jib/issues/632) | ||
| ContainerConfiguration.builder().setEnvironment(new TreeMap<>()); | ||
| ContainerConfiguration.builder().setEnvironment(new Hashtable<>()); | ||
| } | ||
| } |