[more tests] testProcessForeignSchemaParallel & some clean up

Author: qwazer

src/main/java/com/googlecode/scheme2ddl/UserObjectJobRunner.java

@@ -65,13 +65,6 @@ int start(ConfigurableApplicationContext context, boolean launchedByDBA, String
         }
     }
 
-    private JobParameters getJobParameters(String schemaName, boolean launchedByDBA) {
-        JobParametersBuilder parametersBuilder = new JobParametersBuilder();
-        parametersBuilder.addString("schemaName", schemaName.toUpperCase());
-        parametersBuilder.addString("launchedByDBA", Boolean.toString(launchedByDBA));
-        return parametersBuilder.toJobParameters();
-    }
-
     private void writeJobExecutionStatus(JobExecution jobExecution, JobParameters jobParameters) {
         StepExecution step = jobExecution.getStepExecutions().toArray(new StepExecution[]{})[0];
         String schemaName = jobParameters.getString("schemaName");

src/test/java/com/googlecode/scheme2ddl/MainIT.java

@@ -180,6 +180,31 @@ public void testProcessForeignSchema() throws Exception {
 
     }
 
+    @Test
+    public void testProcessForeignSchemaParallel() throws Exception {
+        String outputPath = tempOutput.getAbsolutePath();
+
+        String[] args = {"-url", dbaUrl, "--schemas", "OUTLN", "--output", outputPath, "--parallel", "2"};
+
+        Main.main(args);
+        String out = outContent.toString();
+
+        assertThat(out, containsString("Will try to process schema  [OUTLN]"));
+        assertThat(out, containsString("Found 8 items for processing in schema OUTLN"));
+
+        assertEqualsFileContent(outputPath + "/OUTLN/procedures/ora$grant_sys_select.sql",
+                "CREATE OR REPLACE PROCEDURE \"OUTLN\".\"ORA$GRANT_SYS_SELECT\" as\n" +
+                "begin\n" +
+                "  EXECUTE IMMEDIATE 'GRANT SELECT ON OUTLN.OL$ TO SELECT_CATALOG_ROLE';\n" +
+                "  EXECUTE IMMEDIATE 'GRANT SELECT ON OUTLN.OL$HINTS TO SELECT_CATALOG_ROLE';\n" +
+                "  EXECUTE IMMEDIATE 'GRANT SELECT ON OUTLN.OL$NODES TO SELECT_CATALOG_ROLE';\n" +
+                "  EXECUTE IMMEDIATE 'GRANT SELECT ON OUTLN.OL$ TO SYS WITH GRANT OPTION';\n" +
+                "  EXECUTE IMMEDIATE 'GRANT SELECT ON OUTLN.OL$HINTS TO SYS WITH GRANT OPTION';\n" +
+                "  EXECUTE IMMEDIATE 'GRANT SELECT ON OUTLN.OL$NODES TO SYS WITH GRANT OPTION';\n" +
+                "end;\n" +
+                "/");
+    }
+
     @Test
     public void testFilterAndReplaceSeqValue() throws Exception {
         String outputPath = tempOutput.getAbsolutePath();

src/test/java/com/googlecode/scheme2ddl/dao/UserObjectDaoImplIT.java

@@ -3,9 +3,11 @@
 import com.googlecode.scheme2ddl.ConfigurationIT;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.jdbc.CannotGetJdbcConnectionException;
 import org.springframework.jdbc.UncategorizedSQLException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
+import org.testng.SkipException;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -27,9 +29,21 @@ public class UserObjectDaoImplIT extends AbstractTestNGSpringContextTests {
     @Autowired
     protected JdbcTemplate dbaJdbcTemplate;
 
+    @BeforeClass
+    public void setUp()  {
+        try {
+            dbaJdbcTemplate.execute("select 1 from dual");
+        }
+        catch (CannotGetJdbcConnectionException e){
+            logger.warn("Ignore all test due", e);
+            throw new SkipException("Ignore all test due " +  e.getMessage());
+        }
+
+    }
+
 
     @BeforeClass
-    public void setUp() throws Exception {
+    public void initDao() throws Exception {
         userObjectDao = new UserObjectDaoImpl();
 
         userObjectDao.setLaunchedByDBA(false);