git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/server/hu.user.mediacube.executors.tests/.classpath b/server/hu.user.mediacube.executors.tests/.classpath
new file mode 100644 (file)
index 0000000..b862a29
--- /dev/null
+++ b/server/hu.user.mediacube.executors.tests/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<classpath>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
+       <classpathentry kind="src" path="src"/>\r
+       <classpathentry kind="output" path="bin"/>\r
+</classpath>\r

diff --git a/server/hu.user.mediacube.executors.tests/.project b/server/hu.user.mediacube.executors.tests/.project
new file mode 100644 (file)
index 0000000..1e4029c
--- /dev/null
+++ b/server/hu.user.mediacube.executors.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<projectDescription>\r
+       <name>hu.user.mediacube.executors.tests</name>\r
+       <comment></comment>\r
+       <projects>\r
+       </projects>\r
+       <buildSpec>\r
+               <buildCommand>\r
+                       <name>org.eclipse.jdt.core.javabuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+               <buildCommand>\r
+                       <name>org.eclipse.pde.ManifestBuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+               <buildCommand>\r
+                       <name>org.eclipse.pde.SchemaBuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+       </buildSpec>\r
+       <natures>\r
+               <nature>org.eclipse.pde.PluginNature</nature>\r
+               <nature>org.eclipse.jdt.core.javanature</nature>\r
+       </natures>\r
+</projectDescription>\r

diff --git a/server/hu.user.mediacube.executors.tests/.settings/org.eclipse.jdt.core.prefs b/server/hu.user.mediacube.executors.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..295926d
--- /dev/null
+++ b/server/hu.user.mediacube.executors.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1\r
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8\r
+org.eclipse.jdt.core.compiler.compliance=1.8\r
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
+org.eclipse.jdt.core.compiler.source=1.8\r

diff --git a/server/hu.user.mediacube.executors.tests/META-INF/MANIFEST.MF b/server/hu.user.mediacube.executors.tests/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..cbb7f2c
--- /dev/null
+++ b/server/hu.user.mediacube.executors.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Tests
+Bundle-SymbolicName: hu.user.mediacube.executors.tests
+Bundle-Version: 1.0.0.qualifier
+Fragment-Host: user.jobengine.executors;bundle-version="1.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: org.junit

diff --git a/server/hu.user.mediacube.executors.tests/build.properties b/server/hu.user.mediacube.executors.tests/build.properties
new file mode 100644 (file)
index 0000000..41eb6ad
--- /dev/null
+++ b/server/hu.user.mediacube.executors.tests/build.properties
@@ -0,0 +1,4 @@
+source.. = src/\r
+output.. = bin/\r
+bin.includes = META-INF/,\\r
+               .\r

diff --git a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/Support.java b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/Support.java
new file mode 100644 (file)
index 0000000..936ba86
--- /dev/null
+++ b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/Support.java
@@ -0,0 +1,52 @@
+package hu.user.mediacube.executors.tests;\r
+\r
+import static org.junit.Assert.assertNotNull;\r
+import static org.junit.Assert.assertTrue;\r
+\r
+import org.junit.AfterClass;\r
+import org.junit.BeforeClass;\r
+import org.junit.Test;\r
+\r
+import user.commons.logging.LogUtils;\r
+import user.jobengine.db.IItemManager;\r
+import user.jobengine.db.ItemManager;\r
+import user.jobengine.server.steps.PlanAirExtensions;\r
+\r
+public class Support {\r
+\r
+       protected static IItemManager manager = null;\r
+\r
+       @BeforeClass\r
+       static public void setUpConnection() {\r
+               //              System.setProperty("jobengine.octopus.rundowns.name", "test_rundowns");\r
+               //              System.setProperty("jobengine.octopus.stories.name", "test_stories");\r
+               //              System.setProperty("jobengine.octopus.storyfolders.name", "test_storyfolders");\r
+               System.setProperty("jobengine.octopus.rundowns.name", "rundowns180620");\r
+               System.setProperty("jobengine.octopus.stories.name", "stories180620");\r
+               System.setProperty("jobengine.octopus.storyfolders.name", "storyfolders180620");\r
+\r
+               System.setProperty("jobengine.nosql.db.url", "jdbc:db2://10.10.1.27:50000/mc:retrieveMessagesFromServerOnGetMessage=true;");\r
+               System.setProperty("jobengine.nosql.db.user", "db2admin");\r
+               System.setProperty("jobengine.nosql.db.password", "password");\r
+               System.setProperty(ItemManager.DBURL, "jdbc:db2://10.10.1.27:50000/mc:retrieveMessagesFromServerOnGetMessage=true;");\r
+               System.setProperty(ItemManager.DBUSERNAME, "db2admin");\r
+               System.setProperty(ItemManager.DBPASSWORD, "password");\r
+               System.setProperty(LogUtils.LOGLEVEL, "INFO");\r
+               // System.setProperty(ItemManager.DBURL,\r
+\r
+               manager = new ItemManager();\r
+               manager.connect();\r
+       }\r
+\r
+       @AfterClass\r
+       static public void tearDownConnection() {\r
+               manager.disconnect();\r
+       }\r
+\r
+       @Test\r
+       public void test_PlanAirExtensions() throws Exception {\r
+               String actual = PlanAirExtensions.getMorpeusXML(manager, "jdbc:sqlserver://10.10.1.45;databaseName=PA_Echo;", "MAM", "Echotv.hu", "M009729A", "ISILON");\r
+               assertNotNull(actual);\r
+               assertTrue(actual.length() > 0);\r
+       }\r
+}\r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/PlanAirExtensions.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/PlanAirExtensions.java
index 26a4e075d82bd39a7e5ce7311d4aa84e8dc9fd4c..e30f1903613b3a3c7b14af050bd65b807e845a66 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/PlanAirExtensions.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/PlanAirExtensions.java
@@ -3,6 +3,7 @@ package user.jobengine.server.steps;
 import java.io.StringWriter;\r
 import java.sql.Connection;\r
 import java.sql.DriverManager;\r
+import java.sql.ResultSetMetaData;\r
 import java.text.SimpleDateFormat;\r
 import java.util.ArrayList;\r
 import java.util.Date;\r
@@ -196,7 +197,11 @@ public class PlanAirExtensions {
                                        int variantID = rs.getInt("v_VariantID");\r
                                        List<int[]> segments = new ArrayList<>();\r
                                        manager.executeQuery(connection, MATERIAL_SEGMENTS_SQL, rs1 -> {\r
-                                               int[] segment = { rs.getInt("v_TcIn"), rs.getInt("v_TcOut") };\r
+                                               ResultSetMetaData rsmd = rs1.getMetaData();\r
+                                               for (int i = 1; i <= rsmd.getColumnCount(); i++)\r
+                                                       System.out.println(rsmd.getColumnName(i) + " " + rsmd.getColumnTypeName(i));\r
+\r
+                                               int[] segment = { rs1.getInt("v_TcIn"), rs1.getInt("v_TcOut") };\r
                                                segments.add(segment);\r
                                                return true;\r
                                        }, st -> {\r
@@ -254,9 +259,10 @@ public class PlanAirExtensions {
                TransformerFactory tf = TransformerFactory.newInstance();\r
                Transformer transformer = tf.newTransformer();\r
                //transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");\r
+               transformer.setOutputProperty(OutputKeys.STANDALONE, "yes");\r
                transformer.setOutputProperty(OutputKeys.METHOD, "xml");\r
                transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");\r
-               //transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");\r
+               transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");\r
                transformer.setOutputProperty(OutputKeys.INDENT, "yes");\r
                StringWriter sw = new StringWriter();\r
                StreamResult sr = new StreamResult(sw);\r