Fix eclipse-jkube#1929: Fixed broken tests

balbusm · Jan 24, 2023 · 295b32e · 295b32e
1 parent a3450a3
commit 295b32e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/jkube-kit/config/image/src/main/java/org/eclipse/jkube/kit/config/image/ImageName.java b/jkube-kit/config/image/src/main/java/org/eclipse/jkube/kit/config/image/ImageName.java
@@ -271,14 +271,20 @@ private void parseComponentsBeforeTag(String rest) {
  registry = null;
  user = null;
  repository = parts[0];
- } else if (parts.length == 3) {
- assignRegistryUserAndRepository(parts);
  } else if (parts.length == 2) {
  if (isAlphanumeric(parts[0])) {
  assignUserAndRepository(parts);
  } else {
  assignRegistryAndRepository(parts);
  }
+ } else if (parts.length >= 3) {
+ if (isAlphanumeric(parts[0])) {
+ registry = null;
+ user = parts[0];
+ repository = rest;
+ } else {
+ assignRegistryUserAndRepository(parts);
+ }
  }
  }
 

diff --git a/...ig/image/src/test/java/org/eclipse/jkube/kit/config/image/ImageNameFullNameParseTest.java b/...ig/image/src/test/java/org/eclipse/jkube/kit/config/image/ImageNameFullNameParseTest.java
@@ -53,7 +53,7 @@ public static Stream<Object[]> validData() {
  {
  "Registry, Repo and Name", "docker.io/eclipse/eclipse_jkube",
  SimpleImageName.builder()
- .fullName("docker.io/eclipse/eclipse_jkube:latest")
+ .fullName("docker.io`/eclipse/eclipse_jkube:latest")
  .registry("docker.io")
  .user("eclipse")
  .repository("eclipse/eclipse_jkube")

diff --git a/jkube-kit/config/image/src/test/java/org/eclipse/jkube/kit/config/image/ImageNameTest.java b/jkube-kit/config/image/src/test/java/org/eclipse/jkube/kit/config/image/ImageNameTest.java
@@ -156,15 +156,15 @@ void namesUsedByDockerTests() {
  @Test
  void testImageNameWithUsernameHavingPeriods() {
  // Given
- String name = "roman.gordill/customer-service-cache:latest";
+ String name = "romangordill10/customer-service-cache:latest";
 
  // When
  ImageName imageName = new ImageName(name);
 
  // Then
  assertThat(imageName).isNotNull();
- assertThat(imageName.getUser()).isEqualTo("roman.gordill");
- assertThat(imageName.getRepository()).isEqualTo("roman.gordill/customer-service-cache");
+ assertThat(imageName.getUser()).isEqualTo("romangordill10");
+ assertThat(imageName.getRepository()).isEqualTo("romangordill10/customer-service-cache");
  assertThat(imageName.getTag()).isEqualTo("latest");
  assertThat(imageName.getRegistry()).isNull();
  }