From 3a535976374cfa4d7dc528bb865a20e67da5852b Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Tue, 24 Jul 2018 12:30:49 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31217 --- .../.classpath | 7 +++ .../.project | 28 ++++++++++ .../.settings/org.eclipse.jdt.core.prefs | 7 +++ .../META-INF/MANIFEST.MF | 8 +++ .../build.properties | 4 ++ .../mediacube/executors/tests/Support.java | 52 +++++++++++++++++++ .../server/steps/PlanAirExtensions.java | 10 +++- 7 files changed, 114 insertions(+), 2 deletions(-) create mode 100644 server/hu.user.mediacube.executors.tests/.classpath create mode 100644 server/hu.user.mediacube.executors.tests/.project create mode 100644 server/hu.user.mediacube.executors.tests/.settings/org.eclipse.jdt.core.prefs create mode 100644 server/hu.user.mediacube.executors.tests/META-INF/MANIFEST.MF create mode 100644 server/hu.user.mediacube.executors.tests/build.properties create mode 100644 server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/Support.java diff --git a/server/hu.user.mediacube.executors.tests/.classpath b/server/hu.user.mediacube.executors.tests/.classpath new file mode 100644 index 00000000..b862a296 --- /dev/null +++ b/server/hu.user.mediacube.executors.tests/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/server/hu.user.mediacube.executors.tests/.project b/server/hu.user.mediacube.executors.tests/.project new file mode 100644 index 00000000..1e4029c9 --- /dev/null +++ b/server/hu.user.mediacube.executors.tests/.project @@ -0,0 +1,28 @@ + + + hu.user.mediacube.executors.tests + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + 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 index 00000000..295926d9 --- /dev/null +++ b/server/hu.user.mediacube.executors.tests/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 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 index 00000000..cbb7f2c4 --- /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 index 00000000..41eb6ade --- /dev/null +++ b/server/hu.user.mediacube.executors.tests/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . 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 index 00000000..936ba862 --- /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; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +import user.commons.logging.LogUtils; +import user.jobengine.db.IItemManager; +import user.jobengine.db.ItemManager; +import user.jobengine.server.steps.PlanAirExtensions; + +public class Support { + + protected static IItemManager manager = null; + + @BeforeClass + static public void setUpConnection() { + // System.setProperty("jobengine.octopus.rundowns.name", "test_rundowns"); + // System.setProperty("jobengine.octopus.stories.name", "test_stories"); + // System.setProperty("jobengine.octopus.storyfolders.name", "test_storyfolders"); + System.setProperty("jobengine.octopus.rundowns.name", "rundowns180620"); + System.setProperty("jobengine.octopus.stories.name", "stories180620"); + System.setProperty("jobengine.octopus.storyfolders.name", "storyfolders180620"); + + System.setProperty("jobengine.nosql.db.url", "jdbc:db2://10.10.1.27:50000/mc:retrieveMessagesFromServerOnGetMessage=true;"); + System.setProperty("jobengine.nosql.db.user", "db2admin"); + System.setProperty("jobengine.nosql.db.password", "password"); + System.setProperty(ItemManager.DBURL, "jdbc:db2://10.10.1.27:50000/mc:retrieveMessagesFromServerOnGetMessage=true;"); + System.setProperty(ItemManager.DBUSERNAME, "db2admin"); + System.setProperty(ItemManager.DBPASSWORD, "password"); + System.setProperty(LogUtils.LOGLEVEL, "INFO"); + // System.setProperty(ItemManager.DBURL, + + manager = new ItemManager(); + manager.connect(); + } + + @AfterClass + static public void tearDownConnection() { + manager.disconnect(); + } + + @Test + public void test_PlanAirExtensions() throws Exception { + String actual = PlanAirExtensions.getMorpeusXML(manager, "jdbc:sqlserver://10.10.1.45;databaseName=PA_Echo;", "MAM", "Echotv.hu", "M009729A", "ISILON"); + assertNotNull(actual); + assertTrue(actual.length() > 0); + } +} 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 26a4e075..e30f1903 100644 --- 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; import java.sql.Connection; import java.sql.DriverManager; +import java.sql.ResultSetMetaData; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -196,7 +197,11 @@ public class PlanAirExtensions { int variantID = rs.getInt("v_VariantID"); List segments = new ArrayList<>(); manager.executeQuery(connection, MATERIAL_SEGMENTS_SQL, rs1 -> { - int[] segment = { rs.getInt("v_TcIn"), rs.getInt("v_TcOut") }; + ResultSetMetaData rsmd = rs1.getMetaData(); + for (int i = 1; i <= rsmd.getColumnCount(); i++) + System.out.println(rsmd.getColumnName(i) + " " + rsmd.getColumnTypeName(i)); + + int[] segment = { rs1.getInt("v_TcIn"), rs1.getInt("v_TcOut") }; segments.add(segment); return true; }, st -> { @@ -254,9 +259,10 @@ public class PlanAirExtensions { TransformerFactory tf = TransformerFactory.newInstance(); Transformer transformer = tf.newTransformer(); //transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes"); + transformer.setOutputProperty(OutputKeys.STANDALONE, "yes"); transformer.setOutputProperty(OutputKeys.METHOD, "xml"); transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8"); - //transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4"); + transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4"); transformer.setOutputProperty(OutputKeys.INDENT, "yes"); StringWriter sw = new StringWriter(); StreamResult sr = new StreamResult(sw); -- 2.54.0