[Batchserver-cvs] batchserver/test/org/jmonks/batch/framework/config BasicJobControllerConfigTest.java, 1.1, 1.2 FrameworkConfigTest.java, 1.1, 1.2 JobControllerConfigTest.java, 1.1, 1.2 PoolJobControllerConfigTest.java, 1.1, 1.2

[Suresh <sur...@us...>]

Update of /cvsroot/batchserver/batchserver/test/org/jmonks/batch/framework/config
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5850/framework/config

Modified Files:
	BasicJobControllerConfigTest.java FrameworkConfigTest.java 
	JobControllerConfigTest.java PoolJobControllerConfigTest.java 
Log Message:
no message

Index: FrameworkConfigTest.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/test/org/jmonks/batch/framework/config/FrameworkConfigTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FrameworkConfigTest.java	15 Sep 2006 20:24:20 -0000	1.1
--- FrameworkConfigTest.java	15 Sep 2006 22:04:43 -0000	1.2
***************
*** 145,149 ****
          FrameworkConfig.JobControllerConfig controllerConfig=frameworkConfig.getJobControllerConfig();
          assertNotNull(controllerConfig);
!         String configClassName=controllerConfig.getConfigClassName("org.jmonks.batchserver.framework.controller.pool.PoolJobController", "xml-factory-config-class-name");
          System.out.println(configClassName);
          assertNotNull(configClassName);
--- 145,149 ----
          FrameworkConfig.JobControllerConfig controllerConfig=frameworkConfig.getJobControllerConfig();
          assertNotNull(controllerConfig);
!         String configClassName=controllerConfig.getConfigClassName("org.jmonks.batch.framework.controller.pool.PoolJobController", "xml-factory-config-class-name");
          System.out.println(configClassName);
          assertNotNull(configClassName);

Index: BasicJobControllerConfigTest.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/test/org/jmonks/batch/framework/config/BasicJobControllerConfigTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BasicJobControllerConfigTest.java	15 Sep 2006 20:24:20 -0000	1.1
--- BasicJobControllerConfigTest.java	15 Sep 2006 22:04:43 -0000	1.2
***************
*** 78,108 ****
      }
  
-     /**
-      * Test case to make get prefix is not returning any null prefix.
-      */
-     public void testGetJobControllerConfigPropertyPrefix()
-     {
-         FrameworkConfig frameworkConfig=FrameworkConfig.getInstance();
-         assertNotNull(frameworkConfig);
-         FrameworkConfig.JobConfigFactoryConfig factoryConfig=frameworkConfig.getJobConfigFactoryConfig();
-         assertNotNull(factoryConfig);
-         JobConfigFactory factory=JobConfigFactory.getJobConfigFactory(factoryConfig);
-         assertNotNull(factory);
-         JobConfig jobConfig=factory.getJobConfig("process_file_xyz");
-         assertNotNull(jobConfig);
-         BasicJobControllerConfig controllerConfig=(BasicJobControllerConfig)jobConfig.getJobControllerConfig();
-         assertNotNull(controllerConfig);
-         String prefix=controllerConfig.getJobControllerConfigPropertyPrefix();
-         assertNotNull(prefix);
-         assertTrue(!"".equals(prefix));
-     }
- 
-     /**
-      * Test to make sure that properties being overriden.
-      */
-     public void testOverrideConfigProperties()
-     {
- 
-     }
      
  }
--- 78,81 ----

Index: PoolJobControllerConfigTest.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/test/org/jmonks/batch/framework/config/PoolJobControllerConfigTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PoolJobControllerConfigTest.java	15 Sep 2006 20:24:20 -0000	1.1
--- PoolJobControllerConfigTest.java	15 Sep 2006 22:04:43 -0000	1.2
***************
*** 154,183 ****
      }
  
-     /**
-      * Test to make sure prefix will not be null.
-      */
-     public void testGetJobControllerConfigPropertyPrefix()
-     {
-         FrameworkConfig frameworkConfig=FrameworkConfig.getInstance();
-         assertNotNull(frameworkConfig);
-         FrameworkConfig.JobConfigFactoryConfig factoryConfig=frameworkConfig.getJobConfigFactoryConfig();
-         assertNotNull(factoryConfig);
-         JobConfigFactory factory=JobConfigFactory.getJobConfigFactory(factoryConfig);
-         assertNotNull(factory);
-         JobConfig jobConfig=factory.getJobConfig("process_file_abc");
-         assertNotNull(jobConfig);
-         PoolJobControllerConfig controllerConfig=(PoolJobControllerConfig)jobConfig.getJobControllerConfig();
-         assertNotNull(controllerConfig);
-         String prefix=controllerConfig.getJobControllerConfigPropertyPrefix();
-         assertNotNull(prefix);
-         assertTrue(!"".equals(prefix));
-     }
- 
-     /**
-      * Test to make sure the new properties will be overriden.
-      */
-     public void testOverrideConfigProperties()
-     {
-     }
      
  }
--- 154,157 ----

Index: JobControllerConfigTest.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/test/org/jmonks/batch/framework/config/JobControllerConfigTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JobControllerConfigTest.java	15 Sep 2006 20:24:20 -0000	1.1
--- JobControllerConfigTest.java	15 Sep 2006 22:04:43 -0000	1.2
***************
*** 77,135 ****
      }
  
-     /**
-      * Test to make sure that it overrides the given values and add the missing values.
-      */
-     public void testOverrideConfigProperties()
-     {
-         FrameworkConfig frameworkConfig=FrameworkConfig.getInstance();
-         assertNotNull(frameworkConfig);
-         FrameworkConfig.JobConfigFactoryConfig factoryConfig=frameworkConfig.getJobConfigFactoryConfig();
-         assertNotNull(factoryConfig);
-         JobConfigFactory factory=JobConfigFactory.getJobConfigFactory(factoryConfig);
-         assertNotNull(factory);
-         JobConfig jobConfig=factory.getJobConfig("process_file_abc");
-         assertNotNull(jobConfig);
-         JobControllerConfig controllerConfig=jobConfig.getJobControllerConfig();
-         assertNotNull(controllerConfig);
-         Map controllerConfigProps=controllerConfig.getJobControllerConfigProperties();
-         assertNotNull(controllerConfigProps);
-         
-         String introducingKey=controllerConfig.getJobControllerConfigPropertyPrefix()+"somekey";
-         String introducingValue="Value being introduced";
-         Map newProps=new HashMap();
-         newProps.put(introducingKey,introducingValue);
-         controllerConfig.overrideConfigProperties(newProps);
-         String introducedValue=(String)controllerConfig.getJobControllerConfigProperties().get(introducingKey);
-         assertNotNull(introducedValue);
-         assertEquals(introducingValue,introducedValue);
- 
-         String overridingValue="Value being overriden";
-         Map overridenProps=new HashMap();
-         overridenProps.put(introducingKey,overridingValue);
-         controllerConfig.overrideConfigProperties(overridenProps);
-         String overridenValue=(String)controllerConfig.getJobControllerConfigProperties().get(introducingKey);
-         assertNotNull(overridenValue);
-         assertEquals(overridingValue,overridenValue);
-     }
- 
-     /**
-      * Test to make sure controller config doesnt return null or empty as common property prefix.
-      */
-     public void testGetJobControllerConfigPropertyPrefix()
-     {
-         FrameworkConfig frameworkConfig=FrameworkConfig.getInstance();
-         assertNotNull(frameworkConfig);
-         FrameworkConfig.JobConfigFactoryConfig factoryConfig=frameworkConfig.getJobConfigFactoryConfig();
-         assertNotNull(factoryConfig);
-         JobConfigFactory factory=JobConfigFactory.getJobConfigFactory(factoryConfig);
-         assertNotNull(factory);
-         JobConfig jobConfig=factory.getJobConfig("process_file_abc");
-         assertNotNull(jobConfig);
-         JobControllerConfig controllerConfig=jobConfig.getJobControllerConfig();
-         assertNotNull(controllerConfig);
-         String prefixName=controllerConfig.getJobControllerConfigPropertyPrefix();
-         assertNotNull(prefixName);        
-         assertTrue(!"".equals(prefixName));
-     }
-     
  }
--- 77,79 ----