Author: kono
Date: 2011-08-02 16:06:14 -0700 (Tue, 02 Aug 2011)
New Revision: 26358
Added:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/proxysettings/ProxySettingTaskTest.java
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/proxysettings/ProxySettingsTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/proxysettings/ProxySettingsTask2.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/proxysettings/ProxySettingsTaskFactory.java
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/proxysettings/ProxySettingsTaskFactoryTest.java
Log:
fixes #21 Tests for proxy setting package had been added.
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/proxysettings/ProxySettingsTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/proxysettings/ProxySettingsTask.java
2011-08-02 22:06:57 UTC (rev 26357)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/proxysettings/ProxySettingsTask.java
2011-08-02 23:06:14 UTC (rev 26358)
@@ -2,40 +2,19 @@
import org.cytoscape.io.util.StreamUtil;
-
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.TaskManager;
import org.cytoscape.work.TaskMonitor;
-import org.cytoscape.work.Tunable;
-import org.cytoscape.work.TunableValidator;
-import org.cytoscape.work.TunableValidator.ValidationState;
-import org.cytoscape.work.util.ListSingleSelection;
-import java.net.URL;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Arrays;
-import java.util.Properties;
-import java.util.concurrent.Callable;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.TimeUnit;
-
-
/**
* Dialog for assigning proxy settings.
- * @author Pasteur
*/
public class ProxySettingsTask extends AbstractTask {
- final TaskManager taskManager;
- final StreamUtil streamUtil;
+ private final StreamUtil streamUtil;
- public ProxySettingsTask(final TaskManager taskManager, final
StreamUtil streamUtil) {
- this.taskManager = taskManager;
+ public ProxySettingsTask(final StreamUtil streamUtil) {
this.streamUtil = streamUtil;
}
@@ -46,7 +25,7 @@
// We run ProxySeting in another task, because TunableValidator
is used. If we run
// it in the same task, Cytoscape will be frozen during
validating process
- ProxySettingsTask2 task = new
ProxySettingsTask2(this.taskManager, this.streamUtil);
+ ProxySettingsTask2 task = new
ProxySettingsTask2(this.streamUtil);
this.insertTasksAfterCurrentTask(task);
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/proxysettings/ProxySettingsTask2.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/proxysettings/ProxySettingsTask2.java
2011-08-02 22:06:57 UTC (rev 26357)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/proxysettings/ProxySettingsTask2.java
2011-08-02 23:06:14 UTC (rev 26358)
@@ -1,36 +1,32 @@
package org.cytoscape.task.internal.proxysettings;
-import org.cytoscape.io.util.StreamUtil;
-
-import org.cytoscape.work.AbstractTask;
-import org.cytoscape.work.TaskManager;
-import org.cytoscape.work.TaskMonitor;
-import org.cytoscape.work.Tunable;
-import org.cytoscape.work.TunableValidator;
-import org.cytoscape.work.TunableValidator.ValidationState;
-import org.cytoscape.work.util.ListSingleSelection;
-
import java.net.URL;
-
-import java.util.Map;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
-import java.util.Arrays;
+import java.util.Map;
import java.util.Properties;
import java.util.concurrent.Callable;
-import java.util.concurrent.FutureTask;
import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeoutException;
+import java.util.concurrent.FutureTask;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import org.cytoscape.io.util.StreamUtil;
+import org.cytoscape.work.AbstractTask;
+import org.cytoscape.work.TaskMonitor;
+import org.cytoscape.work.Tunable;
+import org.cytoscape.work.TunableValidator;
+import org.cytoscape.work.util.ListSingleSelection;
+
/**
* Dialog for assigning proxy settings.
- * @author Pasteur
*/
public class ProxySettingsTask2 extends AbstractTask implements
TunableValidator {
- static final List<String> KEYS = Arrays.asList("http.proxyHost",
"http.proxyPort", "socks.proxyHost", "socks.proxyPort");
+
+ private static final List<String> KEYS =
Arrays.asList("http.proxyHost", "http.proxyPort", "socks.proxyHost",
"socks.proxyPort");
@Tunable(description="Type")
public ListSingleSelection<String> type = new
ListSingleSelection<String>("direct", "http", "socks");
@@ -41,19 +37,19 @@
@Tunable(description="Port",groups={"param"},dependsOn="type!=direct",params="alignments=horizontal;displayState=hidden")
public int port=0;
- final TaskManager taskManager;
- final StreamUtil streamUtil;
+ private final StreamUtil streamUtil;
- final Map<String,String> oldSettings = new HashMap<String,String>();
- final Properties properties = System.getProperties();
+ private final Map<String,String> oldSettings;
+ private final Properties properties;
- public ProxySettingsTask2(final TaskManager taskManager, final
StreamUtil streamUtil) {
- this.taskManager = taskManager;
+ public ProxySettingsTask2(final StreamUtil streamUtil) {
this.streamUtil = streamUtil;
+ oldSettings = new HashMap<String,String>();
+ properties = System.getProperties();
}
public ValidationState getValidationState(final Appendable errMsg) {
-
+
storeProxySettings();
FutureTask<Exception> executor = new FutureTask<Exception>(new
TestProxySettings(streamUtil));
@@ -134,7 +130,7 @@
}
-class TestProxySettings implements Callable<Exception> {
+final class TestProxySettings implements Callable<Exception> {
static final String TEST_URL = "http://www.google.com";;
final StreamUtil streamUtil;
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/proxysettings/ProxySettingsTaskFactory.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/proxysettings/ProxySettingsTaskFactory.java
2011-08-02 22:06:57 UTC (rev 26357)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/proxysettings/ProxySettingsTaskFactory.java
2011-08-02 23:06:14 UTC (rev 26358)
@@ -8,15 +8,14 @@
public class ProxySettingsTaskFactory implements TaskFactory {
- private TaskManager taskManager;
- private StreamUtil streamUtil;
- public ProxySettingsTaskFactory(TaskManager taskManager, StreamUtil
streamUtil) {
- this.taskManager = taskManager;
+ private final StreamUtil streamUtil;
+
+ public ProxySettingsTaskFactory(StreamUtil streamUtil) {
this.streamUtil = streamUtil;
}
public TaskIterator getTaskIterator() {
- return new TaskIterator(new ProxySettingsTask(taskManager,
streamUtil));
+ return new TaskIterator(new ProxySettingsTask(streamUtil));
}
}
Modified:
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-08-02 22:06:57 UTC (rev 26357)
+++
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-08-02 23:06:14 UTC (rev 26358)
@@ -318,7 +318,6 @@
<!-- Misc -->
<bean id="proxySettingsTaskFactory"
class="org.cytoscape.task.internal.proxysettings.ProxySettingsTaskFactory">
- <constructor-arg ref="taskManagerServiceRef" />
<constructor-arg ref="streamUtilRef" />
</bean>
Added:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/proxysettings/ProxySettingTaskTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/proxysettings/ProxySettingTaskTest.java
(rev 0)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/proxysettings/ProxySettingTaskTest.java
2011-08-02 23:06:14 UTC (rev 26358)
@@ -0,0 +1,44 @@
+package org.cytoscape.task.internal.proxysettings;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Properties;
+
+import org.cytoscape.io.util.StreamUtil;
+import org.cytoscape.work.TaskMonitor;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+public class ProxySettingTaskTest {
+
+ @Mock private StreamUtil streamUtil;
+ @Mock private TaskMonitor tm;
+
+ @Before
+ public void initMocks() {
+ MockitoAnnotations.initMocks(this);
+ }
+
+ @Test
+ public void testRun() throws Exception {
+ final ProxySettingsTask2 t = new ProxySettingsTask2(streamUtil);
+
+ final String type = "http";
+ final String hostName = "dummy";
+ final int portNumber = 12345;
+
+ t.type.setSelectedValue(type);
+ t.hostname = hostName;
+ t.port = portNumber;
+
+ t.run(tm);
+
+ final Properties newProps = System.getProperties();
+
+ assertEquals(hostName, newProps.getProperty("http.proxyHost"));
+ assertEquals(Integer.toString(portNumber),
newProps.getProperty("http.proxyPort"));
+ }
+
+}
Modified:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/proxysettings/ProxySettingsTaskFactoryTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/proxysettings/ProxySettingsTaskFactoryTest.java
2011-08-02 22:06:57 UTC (rev 26357)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/proxysettings/ProxySettingsTaskFactoryTest.java
2011-08-02 23:06:14 UTC (rev 26358)
@@ -3,20 +3,19 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
+
+import org.cytoscape.io.util.StreamUtil;
import org.cytoscape.work.Task;
import org.cytoscape.work.TaskIterator;
import org.junit.Test;
-import org.cytoscape.work.TaskManager;
-import org.cytoscape.io.util.StreamUtil;
public class ProxySettingsTaskFactoryTest {
@Test
public void testRun() throws Exception {
- TaskManager taskManager = mock(TaskManager.class);;
StreamUtil streamUtil = mock(StreamUtil.class);
- ProxySettingsTaskFactory factory = new
ProxySettingsTaskFactory(taskManager, streamUtil);
+ ProxySettingsTaskFactory factory = new
ProxySettingsTaskFactory(streamUtil);
TaskIterator ti = factory.getTaskIterator();
assertNotNull(ti);
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
