Merge pull request #348 from udda1996/fix-pull-all

Fix tests for 'bal dist remove' command
ballerina-platform · Mar 3, 2024 · 43ba013 · 43ba013
2 parents b8a53aa + 278eea0
commit 43ba013
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -275,9 +275,11 @@ test {
     systemProperty "swan-lake-latest-version", project.properties['swan-lake-latest-version']
     systemProperty "swan-lake-spec-version", project.properties['swan-lake-spec-version']
     systemProperty "swan-lake-latest-spec-version", project.properties['swan-lake-latest-spec-version']
+    systemProperty "swan-lake-latest-dependency-version", project.properties['swan-lake-latest-dependency-version']
     systemProperty "1-x-channel-version", project.properties['1-x-channel-version']
     systemProperty "1-x-channel-spec-version", project.properties['1-x-channel-spec-version']
     systemProperty "1-x-channel-latest-version", project.properties['1-x-channel-latest-version']
+    systemProperty "1-x-channel-dependency-version", project.properties['1-x-channel-dependency-version']
 
     useTestNG() {
         suites 'src/test/resources/testng.xml'

diff --git a/gradle.properties b/gradle.properties
@@ -6,10 +6,10 @@ jreVersion=11.0.18+10
 # For test purpose
 swan-lake-version=2201.2.0
 swan-lake-spec-version=2022R3
-swan-lake-latest-version=2201.8.4
+swan-lake-latest-version=2201.8.5
 swan-lake-latest-spec-version=2023R1
 swan-lake-latest-dependency-version=jdk-17.0.7+7-jre
 1-x-channel-version=1.2.0
 1-x-channel-dependency-version=jdk8u202-b08-jre
 1-x-channel-spec-version=2020R1
-1-x-channel-latest-version=1.2.48
+1-x-channel-latest-version=1.2.49
diff --git a/src/test/java/org/ballerinalang/distribution/TestUtils.java b/src/test/java/org/ballerinalang/distribution/TestUtils.java
@@ -189,6 +189,7 @@ private static void copyFiles() {
         try {
             Files.createDirectory(TEST_DIR);
             Files.createDirectory(DIST_PATH);
+            Files.createDirectory(DEPENDENCY_PATH);
             Files.copy(RESOURCES_DIR.resolve("ballerina-version"), DIST_PATH.resolve("ballerina-version"));
             Files.copy(RESOURCES_DIR.resolve("installer-version"), DIST_PATH.resolve("installer-version"));
         } catch (IOException e) {
@@ -300,11 +301,7 @@ public static Path getDistPath (String version) {
      * @return returns dependency path for available distributions
      */
     public static Path getDependencyPath (String version) {
-        try {
-            return DEPENDENCY_PATH.resolve(version);
-        } catch (Exception e) {
-            return null;
-        }
+        return DEPENDENCY_PATH.resolve(version);
     }
 
     /**

diff --git a/src/test/java/org/ballerinalang/distribution/UpdateToolTest.java b/src/test/java/org/ballerinalang/distribution/UpdateToolTest.java
@@ -287,7 +287,7 @@ public void testRemoveCommand() throws IOException, InterruptedException {
         output = TestUtils.executeCommand(args);
         Assert.assertTrue(output.contains("successfully removed"));
         Assert.assertFalse(Files.exists(TestUtils.getDistPath(previousChannelVersion)));
-        Assert.assertNull(TestUtils.getDependencyPath(previousChannelDependencyVersion));
+        Assert.assertFalse(Files.exists(TestUtils.getDependencyPath(previousChannelDependencyVersion)));
 
         args.add("arg1");
         output = TestUtils.executeCommand(args);
@@ -302,7 +302,7 @@ public void testRemoveCommand() throws IOException, InterruptedException {
         Assert.assertTrue(Files.exists(TestUtils.getDistPath(swanLakeLatestVersion)));
         Assert.assertFalse(Files.exists(TestUtils.getDistPath(swanLakeVersion)));
         Assert.assertFalse(Files.exists(TestUtils.getDistPath(previousChanneLatestVersion)));
-        Assert.assertNull(TestUtils.getDependencyPath(swanLakeLatestVersionDependency));
+        Assert.assertTrue(Files.exists(TestUtils.getDependencyPath(swanLakeLatestVersionDependency)));
         Assert.assertEquals(Files.list(TestUtils.getDependencyPath(swanLakeLatestVersionDependency).getParent()).count()
                 , 1);