uncommenting testing code

2025-01-07 20:19:47 +00:00
parent 07dd26e11f
commit ea8e7d4073
10 changed files with 645 additions and 644 deletions
--- a/client/GroupTrackContainer_test.go
+++ b/client/GroupTrackContainer_test.go
@@ -1,267 +1,267 @@
 package client

-// import (
-// 	"fmt"
-// 	"github.com/Akilan1999/p2p-rendering-computation/server/docker"
-// 	"testing"
-// )
+import (
+	"fmt"
+	"github.com/Akilan1999/p2p-rendering-computation/server/docker"
+	"testing"
+)

-// // Testing out if a new group is getting created
-// func TestCreateGroup(t *testing.T) {
-// 	group, err := CreateGroup()
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-// 	PrettyPrint(group)
-// }
-//
-// // Testing if the group gets removed when a
-// // group ID is provided
-// func TestRemoveGroup(t *testing.T) {
-// 	// Creates a new group
-// 	group, err := CreateGroup()
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-// 	// Removes the new group
-// 	// it created
-// 	err = RemoveGroup(group.ID)
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-// }
-//
-// // Testing if container information is added
-// // to the created group
-// func TestAddContainerToGroup(t *testing.T) {
-// 	// Creates a new group
-// 	group, err := CreateGroup()
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-//
-// 	// Creating and adding the container to the
-// 	// tracked list
-// 	container1, err := docker.BuildRunContainer(0, "false", "")
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-//
-// 	// Testing the AddTrackContainer Function and adding the first container created
-// 	err = AddTrackContainer(container1, "0.0.0.0")
-// 	if err != nil {
-// 		// Killing docker container created
-// 		err = docker.StopAndRemoveContainer(container1.ID)
-// 		if err != nil {
-// 			fmt.Println(err)
-// 			t.Fail()
-// 		}
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-//
-// 	// Adds container information to the group
-// 	Group, err := AddContainerToGroup(container1.ID, group.ID)
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-//
-// 	PrettyPrint(Group)
-//
-// 	// Killing docker container created
-// 	err = docker.StopAndRemoveContainer(container1.ID)
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-//
-// 	// Removing container 1 from the tracked list
-// 	err = RemoveTrackedContainer(container1.ID)
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-//
-// 	// Removes the new group
-// 	// it created
-// 	err = RemoveGroup(group.ID)
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-//
-// }
-//
-// // Testing if the container information is removed from the group
-// func TestGroup_RemoveContainerGroup(t *testing.T) {
-// 	// Creates a new group
-// 	group, err := CreateGroup()
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-//
-// 	// Creating and adding the container to the
-// 	// tracked list
-// 	container1, err := docker.BuildRunContainer(0, "false", "")
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-//
-// 	// Testing the AddTrackContainer Function and adding the first container created
-// 	err = AddTrackContainer(container1, "0.0.0.0")
-// 	if err != nil {
-// 		// Killing docker container created
-// 		err = docker.StopAndRemoveContainer(container1.ID)
-// 		if err != nil {
-// 			fmt.Println(err)
-// 			t.Fail()
-// 		}
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-//
-// 	// Adds container information to the group
-// 	Group, err := AddContainerToGroup(container1.ID, group.ID)
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-// 	fmt.Println("Container added")
-// 	PrettyPrint(Group)
-//
-// 	// Removing docker container from the group
-// 	Group, err = RemoveContainerGroup(container1.ID, group.ID)
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-// 	fmt.Println("Container removed")
-// 	PrettyPrint(Group)
-//
-// 	// Killing docker container created
-// 	err = docker.StopAndRemoveContainer(container1.ID)
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-//
-// 	// Removing container 1 from the tracked list
-// 	err = RemoveTrackedContainer(container1.ID)
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-//
-// 	// Removes the new group
-// 	// it created
-// 	err = RemoveGroup(group.ID)
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-// }
-//
-// // Testing that container are removed from all
-// // created groups
-// // Scenario:
-// // - Create 2 groups
-// // - Add Container information to each group
-// // - Remove Container information from each group
-// func TestGroups_RemoveContainerGroups(t *testing.T) {
-// 	// Creates a new group
-// 	group, err := CreateGroup()
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-// 	// Created another group assigned to variable group 1
-// 	group1, err := CreateGroup()
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-//
-// 	// Creating and adding the container to the
-// 	// tracked list
-// 	container1, err := docker.BuildRunContainer(0, "false", "")
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-//
-// 	// Testing the AddTrackContainer Function and adding the first container created
-// 	err = AddTrackContainer(container1, "0.0.0.0")
-// 	if err != nil {
-// 		// Killing docker container created
-// 		err = docker.StopAndRemoveContainer(container1.ID)
-// 		if err != nil {
-// 			fmt.Println(err)
-// 			t.Fail()
-// 		}
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-//
-// 	// Adds container information to the group
-// 	Group, err := AddContainerToGroup(container1.ID, group.ID)
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-// 	fmt.Println("Container added")
-// 	PrettyPrint(Group)
-//
-// 	// Adds container information to the group
-// 	Group1, err := AddContainerToGroup(container1.ID, group1.ID)
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-// 	fmt.Println("Container added")
-// 	PrettyPrint(Group1)
-//
-// 	// Removing docker container from the group
-// 	err = RemoveContainerGroups(container1.ID)
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-//
-// 	// Killing docker container created
-// 	err = docker.StopAndRemoveContainer(container1.ID)
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-//
-// 	// Removing container 1 from the tracked list
-// 	err = RemoveTrackedContainer(container1.ID)
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-//
-// 	// Removes the new group
-// 	// it created
-// 	err = RemoveGroup(group.ID)
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-//
-// 	// Removes the new group
-// 	// it created
-// 	err = RemoveGroup(group1.ID)
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-// }
+// Testing out if a new group is getting created
+func TestCreateGroup(t *testing.T) {
+	group, err := CreateGroup()
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+	PrettyPrint(group)
+}
+
+// Testing if the group gets removed when a
+// group ID is provided
+func TestRemoveGroup(t *testing.T) {
+	// Creates a new group
+	group, err := CreateGroup()
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+	// Removes the new group
+	// it created
+	err = RemoveGroup(group.ID)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+}
+
+// Testing if container information is added
+// to the created group
+func TestAddContainerToGroup(t *testing.T) {
+	// Creates a new group
+	group, err := CreateGroup()
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+
+	// Creating and adding the container to the
+	// tracked list
+	container1, err := docker.BuildRunContainer(0, "false", "")
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+
+	// Testing the AddTrackContainer Function and adding the first container created
+	err = AddTrackContainer(container1, "0.0.0.0")
+	if err != nil {
+		// Killing docker container created
+		err = docker.StopAndRemoveContainer(container1.ID)
+		if err != nil {
+			fmt.Println(err)
+			t.Fail()
+		}
+		fmt.Println(err)
+		t.Fail()
+	}
+
+	// Adds container information to the group
+	Group, err := AddContainerToGroup(container1.ID, group.ID)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+
+	PrettyPrint(Group)
+
+	// Killing docker container created
+	err = docker.StopAndRemoveContainer(container1.ID)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+
+	// Removing container 1 from the tracked list
+	err = RemoveTrackedContainer(container1.ID)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+
+	// Removes the new group
+	// it created
+	err = RemoveGroup(group.ID)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+
+}
+
+// Testing if the container information is removed from the group
+func TestGroup_RemoveContainerGroup(t *testing.T) {
+	// Creates a new group
+	group, err := CreateGroup()
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+
+	// Creating and adding the container to the
+	// tracked list
+	container1, err := docker.BuildRunContainer(0, "false", "")
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+
+	// Testing the AddTrackContainer Function and adding the first container created
+	err = AddTrackContainer(container1, "0.0.0.0")
+	if err != nil {
+		// Killing docker container created
+		err = docker.StopAndRemoveContainer(container1.ID)
+		if err != nil {
+			fmt.Println(err)
+			t.Fail()
+		}
+		fmt.Println(err)
+		t.Fail()
+	}
+
+	// Adds container information to the group
+	Group, err := AddContainerToGroup(container1.ID, group.ID)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+	fmt.Println("Container added")
+	PrettyPrint(Group)
+
+	// Removing docker container from the group
+	Group, err = RemoveContainerGroup(container1.ID, group.ID)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+	fmt.Println("Container removed")
+	PrettyPrint(Group)
+
+	// Killing docker container created
+	err = docker.StopAndRemoveContainer(container1.ID)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+
+	// Removing container 1 from the tracked list
+	err = RemoveTrackedContainer(container1.ID)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+
+	// Removes the new group
+	// it created
+	err = RemoveGroup(group.ID)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+}
+
+// Testing that container are removed from all
+// created groups
+// Scenario:
+// - Create 2 groups
+// - Add Container information to each group
+// - Remove Container information from each group
+func TestGroups_RemoveContainerGroups(t *testing.T) {
+	// Creates a new group
+	group, err := CreateGroup()
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+	// Created another group assigned to variable group 1
+	group1, err := CreateGroup()
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+
+	// Creating and adding the container to the
+	// tracked list
+	container1, err := docker.BuildRunContainer(0, "false", "")
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+
+	// Testing the AddTrackContainer Function and adding the first container created
+	err = AddTrackContainer(container1, "0.0.0.0")
+	if err != nil {
+		// Killing docker container created
+		err = docker.StopAndRemoveContainer(container1.ID)
+		if err != nil {
+			fmt.Println(err)
+			t.Fail()
+		}
+		fmt.Println(err)
+		t.Fail()
+	}
+
+	// Adds container information to the group
+	Group, err := AddContainerToGroup(container1.ID, group.ID)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+	fmt.Println("Container added")
+	PrettyPrint(Group)
+
+	// Adds container information to the group
+	Group1, err := AddContainerToGroup(container1.ID, group1.ID)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+	fmt.Println("Container added")
+	PrettyPrint(Group1)
+
+	// Removing docker container from the group
+	err = RemoveContainerGroups(container1.ID)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+
+	// Killing docker container created
+	err = docker.StopAndRemoveContainer(container1.ID)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+
+	// Removing container 1 from the tracked list
+	err = RemoveTrackedContainer(container1.ID)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+
+	// Removes the new group
+	// it created
+	err = RemoveGroup(group.ID)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+
+	// Removes the new group
+	// it created
+	err = RemoveGroup(group1.ID)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+}
--- a/client/TrackContianers_test.go
+++ b/client/TrackContianers_test.go
@@ -1,120 +1,120 @@
 package client

-// import (
-// 	"fmt"
-// 	"github.com/Akilan1999/p2p-rendering-computation/server/docker"
-// 	"testing"
-// )
+import (
+	"fmt"
+	"github.com/Akilan1999/p2p-rendering-computation/server/docker"
+	"testing"
+)

-// // Tests a scenario where the container are getting tracked
-// func TestAddTrackContainer(t *testing.T) {
-// 	// Create docker container and get SSH port
-// 	container1, err := docker.BuildRunContainer(0, "false", "")
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-// 	// Testing the AddTrackContainer Function
-// 	err = AddTrackContainer(container1, "0.0.0.0")
-// 	if err != nil {
-// 		// Killing docker container created
-// 		err = docker.StopAndRemoveContainer(container1.ID)
-// 		if err != nil {
-// 			fmt.Println(err)
-// 			t.Fail()
-// 		}
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-// 	// Killing docker container created
-// 	err = docker.StopAndRemoveContainer(container1.ID)
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-// }
-//
-// // Testing the remove container function
-// // NOTE: This test can also be considered as a whole flow on the process of
-// // tracked containers
-// func TestRemoveTrackedContainer(t *testing.T) {
-// 	container1, err := docker.BuildRunContainer(0, "false", "")
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-//
-// 	container2, err := docker.BuildRunContainer(0, "false", "")
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-//
-// 	// Testing the AddTrackContainer Function and adding the first container created
-// 	err = AddTrackContainer(container1, "0.0.0.0")
-// 	if err != nil {
-// 		// Killing docker container created
-// 		err = docker.StopAndRemoveContainer(container1.ID)
-// 		if err != nil {
-// 			fmt.Println(err)
-// 			t.Fail()
-// 		}
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-// 	// Killing docker container created
-// 	err = docker.StopAndRemoveContainer(container1.ID)
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-//
-// 	// Testing the AddTrackContainer Function and the adding the second container created
-// 	err = AddTrackContainer(container2, "0.0.0.0")
-// 	if err != nil {
-// 		// Killing docker container created
-// 		err = docker.StopAndRemoveContainer(container2.ID)
-// 		if err != nil {
-// 			fmt.Println(err)
-// 			t.Fail()
-// 		}
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-// 	// Killing docker container created
-// 	err = docker.StopAndRemoveContainer(container2.ID)
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-//
-// 	// Removing container 1 from the tracked list
-// 	err = RemoveTrackedContainer(container1.ID)
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-//
-// 	// Removing container 2 from the tracked list
-// 	err = RemoveTrackedContainer(container2.ID)
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-// }
-//
-// // Test function that checks if the ID belongs to
-// // a group or container running
-// func TestCheckID(t *testing.T) {
-// 	id := "grp123"
-// 	checkID, err := CheckID(id)
-// 	if err != nil {
-// 		fmt.Println(err)
-// 		t.Fail()
-// 	}
-// 	if checkID == "group" {
-// 		fmt.Println("pass")
-// 	} else {
-// 		t.Fail()
-// 	}
-// }
+// Tests a scenario where the container are getting tracked
+func TestAddTrackContainer(t *testing.T) {
+	// Create docker container and get SSH port
+	container1, err := docker.BuildRunContainer(0, "false", "")
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+	// Testing the AddTrackContainer Function
+	err = AddTrackContainer(container1, "0.0.0.0")
+	if err != nil {
+		// Killing docker container created
+		err = docker.StopAndRemoveContainer(container1.ID)
+		if err != nil {
+			fmt.Println(err)
+			t.Fail()
+		}
+		fmt.Println(err)
+		t.Fail()
+	}
+	// Killing docker container created
+	err = docker.StopAndRemoveContainer(container1.ID)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+}
+
+// Testing the remove container function
+// NOTE: This test can also be considered as a whole flow on the process of
+// tracked containers
+func TestRemoveTrackedContainer(t *testing.T) {
+	container1, err := docker.BuildRunContainer(0, "false", "")
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+
+	container2, err := docker.BuildRunContainer(0, "false", "")
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+
+	// Testing the AddTrackContainer Function and adding the first container created
+	err = AddTrackContainer(container1, "0.0.0.0")
+	if err != nil {
+		// Killing docker container created
+		err = docker.StopAndRemoveContainer(container1.ID)
+		if err != nil {
+			fmt.Println(err)
+			t.Fail()
+		}
+		fmt.Println(err)
+		t.Fail()
+	}
+	// Killing docker container created
+	err = docker.StopAndRemoveContainer(container1.ID)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+
+	// Testing the AddTrackContainer Function and the adding the second container created
+	err = AddTrackContainer(container2, "0.0.0.0")
+	if err != nil {
+		// Killing docker container created
+		err = docker.StopAndRemoveContainer(container2.ID)
+		if err != nil {
+			fmt.Println(err)
+			t.Fail()
+		}
+		fmt.Println(err)
+		t.Fail()
+	}
+	// Killing docker container created
+	err = docker.StopAndRemoveContainer(container2.ID)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+
+	// Removing container 1 from the tracked list
+	err = RemoveTrackedContainer(container1.ID)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+
+	// Removing container 2 from the tracked list
+	err = RemoveTrackedContainer(container2.ID)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+}
+
+// Test function that checks if the ID belongs to
+// a group or container running
+func TestCheckID(t *testing.T) {
+	id := "grp123"
+	checkID, err := CheckID(id)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+	}
+	if checkID == "group" {
+		fmt.Println("pass")
+	} else {
+		t.Fail()
+	}
+}
--- a/client/clientIPTable/iptable_test.go
+++ b/client/clientIPTable/iptable_test.go
@@ -1,13 +1,13 @@
 package clientIPTable

-// import (
-// 	"testing"
-// )
-//
-// func TestUpdateIpTableListClient(t *testing.T) {
-// 	err := UpdateIpTableListClient()
-//
-// 	if err != nil {
-// 		t.Error(err)
-// 	}
-// }
+import (
+	"testing"
+)
+
+func TestUpdateIpTableListClient(t *testing.T) {
+	err := UpdateIpTableListClient()
+
+	if err != nil {
+		t.Error(err)
+	}
+}