[Esbox-commits] r1874 - in branches/work_new_pydev/org.maemo.esbox.tests/src/org/maemo/esbox: internal/tests tests/python
andregomes at garage.maemo.org
andregomes at garage.maemo.org
Thu Jul 16 00:15:07 EEST 2009
Author: andregomes
Date: 2009-07-16 00:15:03 +0300 (Thu, 16 Jul 2009)
New Revision: 1874
Added:
branches/work_new_pydev/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/ManualTestPythonProjectConverter.java
branches/work_new_pydev/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/ManualTestPythonProjectCreator.java
Removed:
branches/work_new_pydev/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/TestPythonProjectConverter.java
branches/work_new_pydev/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/TestPythonProjectCreator.java
Modified:
branches/work_new_pydev/org.maemo.esbox.tests/src/org/maemo/esbox/internal/tests/ESboxMicaTestSuite.java
Log:
Transforming tests TestPythonProjectConverter and TestPythonProjectCreator in Manual tests.
Modified: branches/work_new_pydev/org.maemo.esbox.tests/src/org/maemo/esbox/internal/tests/ESboxMicaTestSuite.java
===================================================================
--- branches/work_new_pydev/org.maemo.esbox.tests/src/org/maemo/esbox/internal/tests/ESboxMicaTestSuite.java 2009-07-14 21:28:42 UTC (rev 1873)
+++ branches/work_new_pydev/org.maemo.esbox.tests/src/org/maemo/esbox/internal/tests/ESboxMicaTestSuite.java 2009-07-15 21:15:03 UTC (rev 1874)
@@ -51,9 +51,7 @@
suite.addTest(new JUnit4TestAdapter(TestCppBuildConfigProjectConverter.class));
suite.addTest(new JUnit4TestAdapter(TestCppBuildConfigProjectCreator.class));
suite.addTest(new JUnit4TestAdapter(TestDebianStructureGenerator4CppProject.class));
- suite.addTest(new JUnit4TestAdapter(TestFremantleAptBuildPackageMapping.class));
- suite.addTest(new JUnit4TestAdapter(TestPythonProjectConverter.class));
- suite.addTest(new JUnit4TestAdapter(TestPythonProjectCreator.class));
+ suite.addTest(new JUnit4TestAdapter(TestFremantleAptBuildPackageMapping.class));
suite.addTest(new JUnit4TestAdapter(TestPythonProjectProperties.class));
return suite;
Copied: branches/work_new_pydev/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/ManualTestPythonProjectConverter.java (from rev 1870, branches/work_new_pydev/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/TestPythonProjectConverter.java)
===================================================================
--- branches/work_new_pydev/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/ManualTestPythonProjectConverter.java (rev 0)
+++ branches/work_new_pydev/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/ManualTestPythonProjectConverter.java 2009-07-15 21:15:03 UTC (rev 1874)
@@ -0,0 +1,123 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+package org.maemo.esbox.tests.python;
+
+
+import org.eclipse.core.runtime.IPath;
+import org.junit.*;
+import org.maemo.esbox.internal.tests.Activator;
+import org.maemo.esbox.tests.common.SboxTestUtils;
+import org.maemo.mica.common.core.HostUtils;
+import org.maemo.mica.common.core.sdk.ISDKTarget;
+import org.maemo.mica.common.core.tests.TestUtils;
+import org.maemo.mica.common.project.core.ProjectManager;
+import org.maemo.mica.common.project.core.model.IProjectType;
+import org.maemo.mica.internal.api.common.project.core.creator.ProjectConfigHandler;
+import org.maemo.mica.internal.api.maemosdk.core.MaemoExecutionEnvironmentIds;
+import org.maemo.mica.python.project.core.IMicaPythonProjectType;
+import org.maemo.mica.python.tests.AbstractTestPythonProjectConverter;
+
+/**
+ * Test that we can convert existing projects to the new format
+ * @author eswartz
+ *
+ */
+public class ManualTestPythonProjectConverter extends AbstractTestPythonProjectConverter {
+
+ private static ISDKTarget theSB1SDKTarget;
+
+ /**
+ * @throws java.lang.Exception
+ */
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+
+ SboxTestUtils.reset();
+ theSB1SDKTarget = SboxTestUtils.theSB1SDKTarget;
+ }
+
+ /**
+ * @throws java.lang.Exception
+ */
+ @After
+ public void tearDown() throws Exception {
+ }
+
+ @Test
+ public void testConvertBareProject() throws Exception {
+ if (theSB1SDKTarget == null)
+ return;
+
+ IPath projectPath = TestUtils.getKnownSBVisibleWorkspacePath(theSB1SDKTarget).append("testconvert1");
+
+ _testConvertProject(projectPath, "data/convert/nonesboxbareproj", false);
+ }
+ @Test
+ public void testConvertCdtProject() throws Exception {
+ if (theSB1SDKTarget == null)
+ return;
+
+ IPath projectPath = TestUtils.getKnownSBVisibleWorkspacePath(theSB1SDKTarget).append("testconvert2");
+
+ _testConvertProject(projectPath, "data/convert/nonesboxcdtproj", false);
+ }
+
+ @Test
+ public void testConvertESboxProject() throws Exception {
+ if (theSB1SDKTarget == null)
+ return;
+
+ IPath projectPath = TestUtils.getKnownSBVisibleWorkspacePath(theSB1SDKTarget).append("testconvert3");
+
+ _testConvertProject(projectPath, "data/convert/pyproj-1.4", true);
+ }
+
+ @Test
+ public void testConvertESboxNoMetadataProject() throws Exception {
+ if (theSB1SDKTarget == null)
+ return;
+
+ IPath projectPath = TestUtils.getKnownSBVisibleWorkspacePath(theSB1SDKTarget).append("testconvert3b");
+
+ _testConvertProject(projectPath, "data/convert/esboxproj-nometadata", false);
+ }
+
+
+ @Test
+ public void testConvertProjectFail() throws Exception {
+ if (theSB1SDKTarget == null)
+ return;
+
+ // this is not visible to sbox, we assume
+ IPath projectPath = HostUtils.getTemporaryPath().append("testconvert4");
+
+ try {
+ _testConvertProject(projectPath, "data/convert/nonesboxproj", false);
+ fail("Should not have succeeded");
+ } catch (Exception e) {
+ System.out.println(e);
+ }
+ }
+
+ protected void _testConvertProject(IPath destPath, String srcPath, boolean checkIndexerData) throws Exception {
+ IProjectType projectType = ProjectManager.getInstance().getProjectType(
+ IMicaPythonProjectType.ID);
+ ProjectConfigHandler configHandler = new ProjectConfigHandler();
+ configHandler.setProjectType(projectType);
+ configHandler.initializeSingleBuildConfiguration(projectType, theSB1SDKTarget);
+ configHandler.setExecutionEnvironmentId(MaemoExecutionEnvironmentIds.GTK);
+
+ _testConvertProject(destPath, Activator.PLUGIN_ID, srcPath, configHandler, checkIndexerData);
+ }
+
+
+}
Property changes on: branches/work_new_pydev/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/ManualTestPythonProjectConverter.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:eol-style
+ native
Copied: branches/work_new_pydev/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/ManualTestPythonProjectCreator.java (from rev 1870, branches/work_new_pydev/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/TestPythonProjectCreator.java)
===================================================================
--- branches/work_new_pydev/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/ManualTestPythonProjectCreator.java (rev 0)
+++ branches/work_new_pydev/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/ManualTestPythonProjectCreator.java 2009-07-15 21:15:03 UTC (rev 1874)
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.tests.python;
+
+import org.maemo.esbox.tests.common.SboxTestUtils;
+import org.maemo.mica.common.core.sdk.ISDKTarget;
+import org.maemo.mica.python.tests.AbstractTestPythonProjectCreator;
+
+/**
+ * @author eswartz
+ *
+ */
+public class ManualTestPythonProjectCreator extends AbstractTestPythonProjectCreator {
+
+ /* (non-Javadoc)
+ * @see org.maemo.mica.python.tests.AbstractTestPythonProjectCreator#getTestSDKTarget()
+ */
+ @Override
+ protected ISDKTarget getTestSDKTarget() {
+ SboxTestUtils.reset();
+ return SboxTestUtils.theSB1SDKTarget;
+ }
+
+}
Property changes on: branches/work_new_pydev/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/ManualTestPythonProjectCreator.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:eol-style
+ native
Deleted: branches/work_new_pydev/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/TestPythonProjectConverter.java
===================================================================
--- branches/work_new_pydev/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/TestPythonProjectConverter.java 2009-07-14 21:28:42 UTC (rev 1873)
+++ branches/work_new_pydev/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/TestPythonProjectConverter.java 2009-07-15 21:15:03 UTC (rev 1874)
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-package org.maemo.esbox.tests.python;
-
-
-import org.eclipse.core.runtime.IPath;
-import org.junit.*;
-import org.maemo.esbox.internal.tests.Activator;
-import org.maemo.esbox.tests.common.SboxTestUtils;
-import org.maemo.mica.common.core.HostUtils;
-import org.maemo.mica.common.core.sdk.ISDKTarget;
-import org.maemo.mica.common.core.tests.TestUtils;
-import org.maemo.mica.common.project.core.ProjectManager;
-import org.maemo.mica.common.project.core.model.IProjectType;
-import org.maemo.mica.internal.api.common.project.core.creator.ProjectConfigHandler;
-import org.maemo.mica.internal.api.maemosdk.core.MaemoExecutionEnvironmentIds;
-import org.maemo.mica.python.project.core.IMicaPythonProjectType;
-import org.maemo.mica.python.tests.AbstractTestPythonProjectConverter;
-
-/**
- * Test that we can convert existing projects to the new format
- * @author eswartz
- *
- */
-public class TestPythonProjectConverter extends AbstractTestPythonProjectConverter {
-
- private static ISDKTarget theSB1SDKTarget;
-
- /**
- * @throws java.lang.Exception
- */
- @Before
- public void setUp() throws Exception {
- super.setUp();
-
- SboxTestUtils.reset();
- theSB1SDKTarget = SboxTestUtils.theSB1SDKTarget;
- }
-
- /**
- * @throws java.lang.Exception
- */
- @After
- public void tearDown() throws Exception {
- }
-
- @Test
- public void testConvertBareProject() throws Exception {
- if (theSB1SDKTarget == null)
- return;
-
- IPath projectPath = TestUtils.getKnownSBVisibleWorkspacePath(theSB1SDKTarget).append("testconvert1");
-
- _testConvertProject(projectPath, "data/convert/nonesboxbareproj", false);
- }
- @Test
- public void testConvertCdtProject() throws Exception {
- if (theSB1SDKTarget == null)
- return;
-
- IPath projectPath = TestUtils.getKnownSBVisibleWorkspacePath(theSB1SDKTarget).append("testconvert2");
-
- _testConvertProject(projectPath, "data/convert/nonesboxcdtproj", false);
- }
-
- @Test
- public void testConvertESboxProject() throws Exception {
- if (theSB1SDKTarget == null)
- return;
-
- IPath projectPath = TestUtils.getKnownSBVisibleWorkspacePath(theSB1SDKTarget).append("testconvert3");
-
- _testConvertProject(projectPath, "data/convert/pyproj-1.4", true);
- }
-
- @Test
- public void testConvertESboxNoMetadataProject() throws Exception {
- if (theSB1SDKTarget == null)
- return;
-
- IPath projectPath = TestUtils.getKnownSBVisibleWorkspacePath(theSB1SDKTarget).append("testconvert3b");
-
- _testConvertProject(projectPath, "data/convert/esboxproj-nometadata", false);
- }
-
-
- @Test
- public void testConvertProjectFail() throws Exception {
- if (theSB1SDKTarget == null)
- return;
-
- // this is not visible to sbox, we assume
- IPath projectPath = HostUtils.getTemporaryPath().append("testconvert4");
-
- try {
- _testConvertProject(projectPath, "data/convert/nonesboxproj", false);
- fail("Should not have succeeded");
- } catch (Exception e) {
- System.out.println(e);
- }
- }
-
- protected void _testConvertProject(IPath destPath, String srcPath, boolean checkIndexerData) throws Exception {
- IProjectType projectType = ProjectManager.getInstance().getProjectType(
- IMicaPythonProjectType.ID);
- ProjectConfigHandler configHandler = new ProjectConfigHandler();
- configHandler.setProjectType(projectType);
- configHandler.initializeSingleBuildConfiguration(projectType, theSB1SDKTarget);
- configHandler.setExecutionEnvironmentId(MaemoExecutionEnvironmentIds.GTK);
-
- _testConvertProject(destPath, Activator.PLUGIN_ID, srcPath, configHandler, checkIndexerData);
- }
-
-
-}
Deleted: branches/work_new_pydev/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/TestPythonProjectCreator.java
===================================================================
--- branches/work_new_pydev/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/TestPythonProjectCreator.java 2009-07-14 21:28:42 UTC (rev 1873)
+++ branches/work_new_pydev/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/TestPythonProjectCreator.java 2009-07-15 21:15:03 UTC (rev 1874)
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.tests.python;
-
-import org.maemo.esbox.tests.common.SboxTestUtils;
-import org.maemo.mica.common.core.sdk.ISDKTarget;
-import org.maemo.mica.python.tests.AbstractTestPythonProjectCreator;
-
-/**
- * @author eswartz
- *
- */
-public class TestPythonProjectCreator extends AbstractTestPythonProjectCreator {
-
- /* (non-Javadoc)
- * @see org.maemo.mica.python.tests.AbstractTestPythonProjectCreator#getTestSDKTarget()
- */
- @Override
- protected ISDKTarget getTestSDKTarget() {
- SboxTestUtils.reset();
- return SboxTestUtils.theSB1SDKTarget;
- }
-
-}
More information about the Esbox-commits
mailing list