Merge branch 'next' of https://github.com/eclipse/ice into next

org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobLauncherFormTester.java

@@ -106,7 +106,7 @@ public class JobLauncherFormTester implements IComponentVisitor {
 
 		// Check the number of Components in the JobLauncherForm. It should have
 		// two, a DataComponent and an OutputComponent.
-		assertEquals(3, jobLauncherForm.getNumberOfComponents());
+		assertEquals(2, jobLauncherForm.getNumberOfComponents());
 
 		// Get the Entries in the input files component
 		ArrayList<IEntry> entries = ((DataComponent) jobLauncherForm
@@ -121,39 +121,39 @@ public class JobLauncherFormTester implements IComponentVisitor {
 		assertNotNull(retFiles);
 		assertEquals(files, retFiles);
 
-		// Check our Docker entries. 
-		DataComponent docker = (DataComponent) jobLauncherForm.getComponent(JobLauncherForm.dockerId);
-		assertNotNull(docker);
-		assertEquals(2, docker.retrieveAllEntries().size());
-		
-		IEntry enableDocker = docker.retrieveEntry("Launch with Docker");
-		assertNotNull(enableDocker);
-		assertEquals("false", enableDocker.getValue());
-		assertTrue(enableDocker instanceof DiscreteEntry);
-		
-		IEntry imagesList = docker.retrieveEntry("Available Images");
-		assertNotNull(imagesList);
-		assertFalse(imagesList.isReady());
-		
-		assertTrue(enableDocker.setValue("true"));
-		
-		try {
-			Thread.sleep(500);
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-			fail();
-		}
-		assertTrue(imagesList.isReady());
-		
-		assertTrue(enableDocker.setValue("false"));
-
-		try {
-			Thread.sleep(500);
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-			fail();
-		}
-		assertFalse(imagesList.isReady());
+//		// Check our Docker entries. 
+//		DataComponent docker = (DataComponent) jobLauncherForm.getComponent(JobLauncherForm.dockerId);
+//		assertNotNull(docker);
+//		assertEquals(2, docker.retrieveAllEntries().size());
+//		
+//		IEntry enableDocker = docker.retrieveEntry("Launch with Docker");
+//		assertNotNull(enableDocker);
+//		assertEquals("false", enableDocker.getValue());
+//		assertTrue(enableDocker instanceof DiscreteEntry);
+//		
+//		IEntry imagesList = docker.retrieveEntry("Available Images");
+//		assertNotNull(imagesList);
+//		assertFalse(imagesList.isReady());
+//		
+//		assertTrue(enableDocker.setValue("true"));
+//		
+//		try {
+//			Thread.sleep(500);
+//		} catch (InterruptedException e) {
+//			e.printStackTrace();
+//			fail();
+//		}
+//		assertTrue(imagesList.isReady());
+//		
+//		assertTrue(enableDocker.setValue("false"));
+//
+//		try {
+//			Thread.sleep(500);
+//		} catch (InterruptedException e) {
+//			e.printStackTrace();
+//			fail();
+//		}
+//		assertFalse(imagesList.isReady());
 		
 		return;
 	}
@@ -643,7 +643,7 @@ public class JobLauncherFormTester implements IComponentVisitor {
 
 		// Check the number of Components in the JobLauncherForm. It should have
 		// two, a DataComponent and an OutputComponent.
-		assertEquals(3, jobLauncherForm.getNumberOfComponents());
+		assertEquals(2, jobLauncherForm.getNumberOfComponents());
 
 		// Get the Entries
 		ArrayList<IEntry> entries = ((DataComponent) jobLauncherForm

org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobLauncherTester.java

@@ -227,7 +227,7 @@ public class JobLauncherTester {
 		form = (JobLauncherForm) jobLauncher.getForm();
 
 		// Should not have MPI - total number of components should be 3
-		assertEquals(form.getComponents().size(), 4);
+		assertEquals(form.getComponents().size(), 3);
 
 		// disable again, see if it breaks
 		jobLauncher.disableMPI();
@@ -235,7 +235,7 @@ public class JobLauncherTester {
 		form = (JobLauncherForm) jobLauncher.getForm();
 
 		// Should not have MPI - total number of components should be 3
-		assertEquals(form.getComponents().size(), 4);
+		assertEquals(form.getComponents().size(), 3);
 
 		// check OpenMP
 		// Just see if it crashes or not
@@ -299,7 +299,7 @@ public class JobLauncherTester {
 
 		entry = dataC.retrieveAllEntries().get(0);
 		// Should not have MPI - total number of components should be 3
-		assertEquals(form.getComponents().size(), 4);
+		assertEquals(form.getComponents().size(), 3);
 
 		// disable again, see if it breaks
 		jobLauncher.disableOpenMP();
@@ -307,7 +307,7 @@ public class JobLauncherTester {
 		form = (JobLauncherForm) jobLauncher.getForm();
 
 		// Should not have MPI - total number of components should be 3
-		assertEquals(form.getComponents().size(), 4);
+		assertEquals(form.getComponents().size(), 3);
 
 		jobLauncher = new TestJobLauncher(null);
 		jobLauncher.setupForm();
@@ -349,7 +349,7 @@ public class JobLauncherTester {
 		form = (JobLauncherForm) jobLauncher.getForm();
 
 		// Should not have MPI - total number of components should be 3
-		assertEquals(form.getComponents().size(), 4);
+		assertEquals(form.getComponents().size(), 3);
 
 		// Tests for TBB
 		jobLauncher.enableTBB(1, 5, 3);

org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobProfileTester.java

@@ -174,7 +174,7 @@ public class JobProfileTester {
 		assertEquals("JobProfile", form.getName());
 		assertEquals("This operation will execute JobProfile",
 				form.getDescription());
-		assertEquals(4, form.getComponents().size());
+		assertEquals(3, form.getComponents().size());
 
 		// Enable OpenMP and MPI on the launcher
 		launcher.enableMPI(1, 512000, 1);