refactor: remove redundant test and add relevant lines to existing test

opencadc · Feb 6, 2025 · 5dde660 · 5dde660
1 parent 85f1ed9
commit 5dde660
Showing 1 changed file with 0 additions and 43 deletions.
diff --git a/skaha/src/test/java/org/opencadc/skaha/session/SessionJobBuilderTest.java b/skaha/src/test/java/org/opencadc/skaha/session/SessionJobBuilderTest.java
@@ -43,53 +43,10 @@ public void testParsing() throws Exception {
             Assert.assertFalse("Entry not replaced.", output.contains(entry.getKey()));
             Assert.assertTrue("Value not injected into file.", output.contains(entry.getValue()));
         }
-    }
-
-    @Test
-    public void testWithWithoutSecret() throws Exception {
-        final Path testBaseValuesPath = FileUtil.getFileFromResource(
-                        "test-base-values.yaml", SessionJobBuilderTest.class)
-                .toPath();
-        final String fileContent = Files.readString(testBaseValuesPath);
-
-        final Map<String, String> parametersToReplaceValues = new HashMap<>();
-        final String[] parametersToReplace = new String[] {
-            PostAction.SKAHA_SESSIONID,
-            PostAction.SKAHA_HOSTNAME,
-            PostAction.SKAHA_SESSIONTYPE,
-            PostAction.SKAHA_POSIXID
-        };
-
-        for (final String param : parametersToReplace) {
-            Assert.assertTrue("Test file is missing required field.", fileContent.contains(param));
-            parametersToReplaceValues.put(param, RandomStringUtils.randomAlphanumeric(12));
-        }
-
-        SessionJobBuilder testSubject =
-                SessionJobBuilder.fromPath(testBaseValuesPath).withParameters(parametersToReplaceValues);
-        String output = testSubject.build();
-
-        for (final Map.Entry<String, String> entry : parametersToReplaceValues.entrySet()) {
-            Assert.assertFalse("Entry not replaced.", output.contains(entry.getKey()));
-            Assert.assertTrue("Value not injected into file.", output.contains(entry.getValue()));
-        }
 
         V1Job job = (V1Job) Yaml.load(output);
         V1PodSpec podSpec = Objects.requireNonNull(job.getSpec()).getTemplate().getSpec();
         Assert.assertNotNull("PodSpec should not be null", podSpec);
-        Assert.assertNull("PodSpec should not have image pull secrets", podSpec.getImagePullSecrets());
-
-        testSubject = SessionJobBuilder.fromPath(testBaseValuesPath).withParameters(parametersToReplaceValues);
-        output = testSubject.build();
-
-        for (final Map.Entry<String, String> entry : parametersToReplaceValues.entrySet()) {
-            Assert.assertFalse("Entry not replaced.", output.contains(entry.getKey()));
-            Assert.assertTrue("Value not injected into file.", output.contains(entry.getValue()));
-        }
-
-        job = (V1Job) Yaml.load(output);
-        podSpec = Objects.requireNonNull(job.getSpec()).getTemplate().getSpec();
-        Assert.assertNotNull("PodSpec should not be null", podSpec);
         Assert.assertNull("PodSpec should have image pull secrets", podSpec.getImagePullSecrets());
     }