You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2016/01/08 12:29:44 UTC
svn commit: r1723700 - in /turbine/core/trunk/src/test/org/apache/turbine:
pipeline/ services/intake/ services/localization/ services/pull/tools/
services/schedule/
Author: tv
Date: Fri Jan 8 11:29:44 2016
New Revision: 1723700
URL: http://svn.apache.org/viewvc?rev=1723700&view=rev
Log:
Eventually remove all static service accessors and replace them by lookups or annotations
Modified:
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultLoginValveTest.java
turbine/core/trunk/src/test/org/apache/turbine/services/intake/IntakeToolTest.java
turbine/core/trunk/src/test/org/apache/turbine/services/localization/LocalizationToolTest.java
turbine/core/trunk/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java
turbine/core/trunk/src/test/org/apache/turbine/services/schedule/QuartzSchedulerServiceTest.java
turbine/core/trunk/src/test/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerServiceTest.java
Modified: turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultLoginValveTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultLoginValveTest.java?rev=1723700&r1=1723699&r2=1723700&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultLoginValveTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultLoginValveTest.java Fri Jan 8 11:29:44 2016
@@ -21,6 +21,10 @@ package org.apache.turbine.pipeline;
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.Vector;
import javax.servlet.http.HttpServletResponse;
@@ -28,7 +32,8 @@ import javax.servlet.http.HttpServletRes
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.modules.actions.LoginUser;
import org.apache.turbine.om.security.User;
-import org.apache.turbine.services.security.TurbineSecurity;
+import org.apache.turbine.services.TurbineServices;
+import org.apache.turbine.services.security.SecurityService;
import org.apache.turbine.test.BaseTestCase;
import org.apache.turbine.test.EnhancedMockHttpServletRequest;
import org.apache.turbine.test.EnhancedMockHttpSession;
@@ -42,8 +47,6 @@ import org.junit.Test;
import com.mockobjects.servlet.MockHttpServletResponse;
import com.mockobjects.servlet.MockServletConfig;
-import static org.junit.Assert.*;
-
/**
* Tests TurbinePipeline.
*
@@ -67,7 +70,7 @@ public class DefaultLoginValveTest exten
"/conf/test/CompleteTurbineResources.properties");
tc.initialize();
}
-
+
@Before
public void setUpBefore() throws Exception {
config = new MockServletConfig();
@@ -91,9 +94,10 @@ public class DefaultLoginValveTest exten
request.setSession(session);
// User must exist
- User user = TurbineSecurity.getUserInstance();
+ SecurityService securityService = (SecurityService)TurbineServices.getInstance().getService(SecurityService.SERVICE_NAME);
+ User user = securityService.getUserInstance();
user.setName("username");
- TurbineSecurity.addUser(user, "password");
+ securityService.addUser(user, "password");
}
/**
@@ -125,7 +129,7 @@ public class DefaultLoginValveTest exten
assertEquals("username",user.getName());
assertTrue(user.hasLoggedIn());
}
-
+
@AfterClass
public static void destroy() {
tc.dispose();
Modified: turbine/core/trunk/src/test/org/apache/turbine/services/intake/IntakeToolTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/intake/IntakeToolTest.java?rev=1723700&r1=1723699&r2=1723700&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/services/intake/IntakeToolTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/services/intake/IntakeToolTest.java Fri Jan 8 11:29:44 2016
@@ -32,6 +32,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.fulcrum.intake.IntakeService;
import org.apache.fulcrum.intake.model.Group;
import org.apache.fulcrum.parser.DefaultParameterParser;
+import org.apache.turbine.annotation.AnnotationProcessor;
import org.apache.turbine.om.security.User;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.rundata.RunDataService;
@@ -40,6 +41,7 @@ import org.apache.turbine.test.EnhancedM
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineConfig;
import org.junit.AfterClass;
+import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -56,41 +58,44 @@ import com.mockobjects.servlet.MockServl
public class IntakeToolTest extends BaseTestCase
{
private static TurbineConfig tc = null;
+ private IntakeTool intakeTool;
- @Test public void testGet() throws Exception
+ @Before
+ public void initTool() throws Exception
{
- IntakeTool intakeTool = new IntakeTool();
+ intakeTool = new IntakeTool();
+ AnnotationProcessor.process(intakeTool);
intakeTool.init(getRunData());
+ }
+
+ @Test
+ public void testGet() throws Exception
+ {
File file = new File("./target/appData.ser");
- assertTrue(
- "Make sure serialized data file exists:" + file,
- file.exists());
- Group group = intakeTool.get("LoginGroup","loginGroupKey");
+ assertTrue("Make sure serialized data file exists:" + file, file.exists());
+ Group group = intakeTool.get("LoginGroup", "loginGroupKey");
assertNotNull(group);
assertEquals("loginGroupKey", group.getGID());
assertEquals("LoginGroup", group.getIntakeGroupName());
}
-
/**
* Make sure refresh DOESN'T do anything
+ *
* @throws Exception
*/
- @Test public void testRefresh() throws Exception
+ @Test
+ public void testRefresh() throws Exception
{
- IntakeTool intakeTool = new IntakeTool();
- intakeTool.init(getRunData());
int numberOfGroups = intakeTool.getGroups().size();
intakeTool.refresh();
- assertEquals(numberOfGroups,intakeTool.getGroups().size());
+ assertEquals(numberOfGroups, intakeTool.getGroups().size());
}
+
private RunData getRunData() throws Exception
{
- RunDataService rds =
- (RunDataService) TurbineServices.getInstance().getService(
- RunDataService.SERVICE_NAME);
- EnhancedMockHttpServletRequest request =
- new EnhancedMockHttpServletRequest();
+ RunDataService rds = (RunDataService) TurbineServices.getInstance().getService(RunDataService.SERVICE_NAME);
+ EnhancedMockHttpServletRequest request = new EnhancedMockHttpServletRequest();
request.setupServerName("bob");
request.setupGetProtocol("http");
request.setupScheme("scheme");
@@ -108,7 +113,8 @@ public class IntakeToolTest extends Base
HttpServletResponse response = new MockHttpServletResponse();
ServletConfig config = new MockServletConfig();
RunData runData = rds.getRunData(request, response, config);
- assertEquals("Verify we are using Fulcrum parameter parser",DefaultParameterParser.class,runData.getParameters().getClass());
+ assertEquals("Verify we are using Fulcrum parameter parser", DefaultParameterParser.class, runData.getParameters()
+ .getClass());
return runData;
}
Modified: turbine/core/trunk/src/test/org/apache/turbine/services/localization/LocalizationToolTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/localization/LocalizationToolTest.java?rev=1723700&r1=1723699&r2=1723700&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/services/localization/LocalizationToolTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/services/localization/LocalizationToolTest.java Fri Jan 8 11:29:44 2016
@@ -19,11 +19,16 @@ package org.apache.turbine.services.loca
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
import java.util.Vector;
import javax.servlet.ServletConfig;
import javax.servlet.http.HttpServletResponse;
+import org.apache.turbine.annotation.AnnotationProcessor;
import org.apache.turbine.om.security.User;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.rundata.RunDataService;
@@ -32,6 +37,7 @@ import org.apache.turbine.test.EnhancedM
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineConfig;
import org.junit.AfterClass;
+import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -39,9 +45,8 @@ import com.mockobjects.servlet.MockHttpS
import com.mockobjects.servlet.MockHttpSession;
import com.mockobjects.servlet.MockServletConfig;
-import static org.junit.Assert.*;
/**
- * Unit test for Localization Tool. Verifies that localization works the same using the
+ * Unit test for Localization Tool. Verifies that localization works the same using the
* deprecated Turbine localization service as well as the new Fulcrum Localization
* component.
*
@@ -51,36 +56,45 @@ import static org.junit.Assert.*;
public class LocalizationToolTest extends BaseTestCase
{
private static TurbineConfig tc = null;
+ private LocalizationTool lt;
- @Test public void testGet() throws Exception
+ @Before
+ public void initTool() throws Exception
{
- LocalizationTool lt = new LocalizationTool();
+ lt = new LocalizationTool();
+ AnnotationProcessor.process(lt);
lt.init(getRunData());
+ }
+
+ @Test
+ public void testGet() throws Exception
+ {
assertEquals("value1", lt.get("key1"));
assertEquals("value3", lt.get("key3"));
}
- @Test public void testGetLocale() throws Exception
+
+ @Test
+ public void testGetLocale() throws Exception
{
- LocalizationTool lt = new LocalizationTool();
- lt.init(getRunData());
assertNotNull(lt.getLocale());
assertEquals("US", lt.getLocale().getCountry());
assertEquals("en", lt.getLocale().getLanguage());
}
- @Test public void testInit() throws Exception
+
+ @Test
+ public void testInit() throws Exception
{
- LocalizationTool lt = new LocalizationTool();
- lt.init(getRunData());
assertNotNull(lt.getLocale());
}
- @Test public void testRefresh() throws Exception
+
+ @Test
+ public void testRefresh() throws Exception
{
- LocalizationTool lt = new LocalizationTool();
- lt.init(getRunData());
assertNotNull(lt.getLocale());
lt.refresh();
assertNull(lt.getLocale());
}
+
private RunData getRunData() throws Exception
{
RunDataService rds = (RunDataService) TurbineServices.getInstance().getService(RunDataService.SERVICE_NAME);
@@ -104,18 +118,20 @@ public class LocalizationToolTest extend
RunData runData = rds.getRunData(request, response, config);
return runData;
}
+
@BeforeClass
public static void setUp() throws Exception
{
tc = new TurbineConfig(".", "/conf/test/TestFulcrumComponents.properties");
tc.initialize();
}
+
@AfterClass
public static void tearDown() throws Exception
{
if (tc != null)
{
tc.dispose();
- }
+ }
}
}
Modified: turbine/core/trunk/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java?rev=1723700&r1=1723699&r2=1723700&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java Fri Jan 8 11:29:44 2016
@@ -19,7 +19,6 @@ package org.apache.turbine.services.pull
* under the License.
*/
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -29,9 +28,9 @@ import java.util.Map;
import org.apache.commons.lang.ArrayUtils;
import org.apache.turbine.TurbineConstants;
+import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.jsonrpc.JsonrpcServicelTest;
import org.apache.turbine.services.pull.PullService;
-import org.apache.turbine.services.pull.TurbinePull;
import org.apache.turbine.test.BaseTestCase;
import org.apache.turbine.util.TurbineConfig;
import org.apache.velocity.context.Context;
@@ -42,42 +41,37 @@ import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(Suite.class)
-@Suite.SuiteClasses({
- JsonrpcServicelTest.class
- })
-public class UIToolTest
- extends BaseTestCase
+@Suite.SuiteClasses({ JsonrpcServicelTest.class })
+public class UIToolTest extends BaseTestCase
{
-
+
private static TurbineConfig turbineConfig = null;
private static PullService pullService = null;
private static UITool ui = null;
-
@BeforeClass
- public static void setUp() throws Exception {
-
-
+ public static void setUp() throws Exception
+ {
Map<String, String> initParams = new HashMap<String, String>();
initParams.put(TurbineConfig.PROPERTIES_PATH_KEY, "/conf/test/CompleteTurbineResources.properties"); // "conf/test/TurbineResources.properties"
initParams.put(TurbineConstants.LOGGING_ROOT_KEY, "target/test-logs");
turbineConfig = new TurbineConfig(".", initParams);
turbineConfig.initialize();
-
- //pullService = (PullService)TurbineServices.getInstance().getService(PullService.SERVICE_NAME);
- pullService = TurbinePull.getService();
+
+ pullService = (PullService)TurbineServices.getInstance().getService(PullService.SERVICE_NAME);
assertNotNull(pullService);
Context globalContext = pullService.getGlobalContext();
assertNotNull(globalContext);
ui = (UITool) globalContext.get("ui");
}
-
+
@AfterClass
- public static void destroy() throws Exception {
+ public static void destroy() throws Exception
+ {
turbineConfig.dispose();
- ui=null;
+ ui = null;
}
@Test
@@ -85,7 +79,7 @@ public class UIToolTest
{
assertNotNull(ui);
}
-
+
@Test
public void testCssSlashes()
{
@@ -95,7 +89,7 @@ public class UIToolTest
String cssUrl = ui.getStylecss();
assertEquals("CSS URL does not match", "http:///conf/test/turbine-resources/turbine-skins/myskin/skins.css", cssUrl);
}
-
+
@Test
public void testImageSlashes()
{
@@ -104,18 +98,22 @@ public class UIToolTest
String img = "myimage.gif";
String imgUrl = ui.image(img);
- assertEquals("CSS URL does not match", "http:///conf/test/turbine-resources/turbine-skins/myskin/turbine-images/" + img, imgUrl);
+ assertEquals("CSS URL does not match", "http:///conf/test/turbine-resources/turbine-skins/myskin/turbine-images/" + img,
+ imgUrl);
String img2 = "foo/myimage.gif";
String imgUrl2 = ui.image(img2);
- assertEquals("CSS URL does not match", "http:///conf/test/turbine-resources/turbine-skins/myskin/turbine-images/" + img2, imgUrl2);
+ assertEquals("CSS URL does not match", "http:///conf/test/turbine-resources/turbine-skins/myskin/turbine-images/" + img2,
+ imgUrl2);
String img3 = "/foo/myimage.gif";
String imgUrl3 = ui.image(img3);
- assertEquals("CSS URL does not match", "http:///conf/test/turbine-resources/turbine-skins/myskin/turbine-images" + img3, imgUrl3);
+ assertEquals("CSS URL does not match", "http:///conf/test/turbine-resources/turbine-skins/myskin/turbine-images" + img3,
+ imgUrl3);
}
+
@Test
public void testPathologicalCases()
{
@@ -123,16 +121,20 @@ public class UIToolTest
String img = "";
String imgUrl = ui.image(img);
- assertEquals("Could not strip empty String", "http:///conf/test/turbine-resources/turbine-skins/myskin/turbine-images/", imgUrl);
+ assertEquals("Could not strip empty String", "http:///conf/test/turbine-resources/turbine-skins/myskin/turbine-images/",
+ imgUrl);
img = "/";
imgUrl = ui.image(img);
- assertEquals("Could not strip single Slash", "http:///conf/test/turbine-resources/turbine-skins/myskin/turbine-images/", imgUrl);
+ assertEquals("Could not strip single Slash", "http:///conf/test/turbine-resources/turbine-skins/myskin/turbine-images/",
+ imgUrl);
img = "//";
imgUrl = ui.image(img);
- assertEquals("Could not strip double Slash", "http:///conf/test/turbine-resources/turbine-skins/myskin/turbine-images/", imgUrl);
+ assertEquals("Could not strip double Slash", "http:///conf/test/turbine-resources/turbine-skins/myskin/turbine-images/",
+ imgUrl);
}
+
@Test
public void testGetSkinNames()
{
@@ -145,16 +147,17 @@ public class UIToolTest
assertTrue(ArrayUtils.contains(skinNames, "myotherskin"));
assertTrue(ArrayUtils.contains(skinNames, "myskin"));
}
+
@Test
public void testSkinValues()
{
// Default skin
- //skin_property_1 = skin_property_1_my_skin
+ // skin_property_1 = skin_property_1_my_skin
assertEquals("skin_property_1_my_skin", ui.get("skin_property_1"));
-
+
ui.setSkin("myotherskin");
- //skin_property_1 = skin_property_1_my_other_skin
+ // skin_property_1 = skin_property_1_my_other_skin
assertEquals("skin_property_1_my_other_skin", ui.get("skin_property_1"));
}
}
Modified: turbine/core/trunk/src/test/org/apache/turbine/services/schedule/QuartzSchedulerServiceTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/schedule/QuartzSchedulerServiceTest.java?rev=1723700&r1=1723699&r2=1723700&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/services/schedule/QuartzSchedulerServiceTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/services/schedule/QuartzSchedulerServiceTest.java Fri Jan 8 11:29:44 2016
@@ -28,6 +28,7 @@ import static org.junit.Assert.assertTru
import static org.junit.Assert.fail;
import org.apache.turbine.modules.scheduledjobs.SimpleJob;
+import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.test.BaseTestCase;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.TurbineException;
@@ -46,6 +47,8 @@ public class QuartzSchedulerServiceTest
{
private TurbineConfig tc = null;
+ private ScheduleService scheduler = null;
+
@Before
public void setUp() throws Exception
{
@@ -54,6 +57,8 @@ public class QuartzSchedulerServiceTest
".",
"/conf/test/TestFulcrumComponents.properties");
tc.initialize();
+
+ scheduler = (ScheduleService)TurbineServices.getInstance().getService(ScheduleService.SERVICE_NAME);
}
@After
@@ -72,11 +77,11 @@ public class QuartzSchedulerServiceTest
{
try
{
- TurbineScheduler.startScheduler();
- assertTrue(TurbineScheduler.isEnabled());
+ scheduler.startScheduler();
+ assertTrue(scheduler.isEnabled());
- TurbineScheduler.stopScheduler();
- assertFalse(TurbineScheduler.isEnabled());
+ scheduler.stopScheduler();
+ assertFalse(scheduler.isEnabled());
}
catch (Exception e)
{
@@ -94,17 +99,17 @@ public class QuartzSchedulerServiceTest
try
{
// get the current job count for later comparison
- int jobCount = TurbineScheduler.listJobs().size();
+ int jobCount = scheduler.listJobs().size();
// Add a new job entry
- JobEntry je = TurbineScheduler.newJob(10, -1, -1, -1, -1, "SimpleJob1");
+ JobEntry je = scheduler.newJob(10, -1, -1, -1, -1, "SimpleJob1");
je.setJobId(jobCount + 1);
- TurbineScheduler.addJob(je);
- assertEquals(jobCount + 1, TurbineScheduler.listJobs().size());
+ scheduler.addJob(je);
+ assertEquals(jobCount + 1, scheduler.listJobs().size());
- TurbineScheduler.removeJob(je);
- assertEquals(jobCount, TurbineScheduler.listJobs().size());
+ scheduler.removeJob(je);
+ assertEquals(jobCount, scheduler.listJobs().size());
}
catch (Exception e)
@@ -122,7 +127,7 @@ public class QuartzSchedulerServiceTest
try
{
JobKey jk = new JobKey("SimpleJob", JobEntryQuartz.DEFAULT_JOB_GROUP_NAME);
- JobEntry je = TurbineScheduler.getJob(jk.hashCode());
+ JobEntry je = scheduler.getJob(jk.hashCode());
assertThat(je, CoreMatchers.instanceOf(JobEntryQuartz.class));
JobEntryQuartz jeq = (JobEntryQuartz)je;
assertEquals(jeq.getJobTrigger().getJobKey(), jk);
Modified: turbine/core/trunk/src/test/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerServiceTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerServiceTest.java?rev=1723700&r1=1723699&r2=1723700&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerServiceTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerServiceTest.java Fri Jan 8 11:29:44 2016
@@ -28,6 +28,7 @@ import static org.junit.Assert.assertTru
import static org.junit.Assert.fail;
import org.apache.turbine.modules.scheduledjobs.SimpleJob;
+import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.TurbineException;
import org.hamcrest.CoreMatchers;
@@ -45,6 +46,8 @@ public class TurbineNonPersistentSchedul
{
private TurbineConfig tc = null;
+ private ScheduleService scheduler = null;
+
@Before
public void setUp() throws Exception
{
@@ -53,6 +56,8 @@ public class TurbineNonPersistentSchedul
".",
"/conf/test/TurbineNonPersistentSchedulerServiceTest.properties");
tc.initialize();
+
+ scheduler = (ScheduleService)TurbineServices.getInstance().getService(ScheduleService.SERVICE_NAME);
}
@After
@@ -71,11 +76,11 @@ public class TurbineNonPersistentSchedul
{
try
{
- TurbineScheduler.startScheduler();
- assertTrue(TurbineScheduler.isEnabled());
+ scheduler.startScheduler();
+ assertTrue(scheduler.isEnabled());
- TurbineScheduler.stopScheduler();
- assertFalse(TurbineScheduler.isEnabled());
+ scheduler.stopScheduler();
+ assertFalse(scheduler.isEnabled());
}
catch (Exception e)
{
@@ -93,18 +98,18 @@ public class TurbineNonPersistentSchedul
try
{
// get the current job count for later comparison
- int jobCount = TurbineScheduler.listJobs().size();
+ int jobCount = scheduler.listJobs().size();
// Add a new job entry
- JobEntry je = TurbineScheduler.newJob(0, 1, -1, -1, -1, "SimpleJob");
+ JobEntry je = scheduler.newJob(0, 1, -1, -1, -1, "SimpleJob");
+
+ scheduler.addJob(je);
+ assertEquals(jobCount + 1, scheduler.listJobs().size());
- TurbineScheduler.addJob(je);
- assertEquals(jobCount + 1, TurbineScheduler.listJobs().size());
-
- assertTrue(TurbineScheduler.listJobs().contains( je ));
- TurbineScheduler.removeJob(je);
- assertTrue(!TurbineScheduler.listJobs().contains( je ));
- assertEquals(jobCount, TurbineScheduler.listJobs().size());
+ assertTrue(scheduler.listJobs().contains( je ));
+ scheduler.removeJob(je);
+ assertTrue(!scheduler.listJobs().contains( je ));
+ assertEquals(jobCount, scheduler.listJobs().size());
}
catch (Exception e)
@@ -121,7 +126,7 @@ public class TurbineNonPersistentSchedul
{
try
{
- JobEntry je = TurbineScheduler.getJob(1);
+ JobEntry je = scheduler.getJob(1);
assertThat(je, CoreMatchers.instanceOf(JobEntryNonPersistent.class));
JobEntryNonPersistent jenp = (JobEntryNonPersistent)je;
assertEquals(1, jenp.getJobId());