Author: vyemialyanchyk Date: 2009-04-07 08:50:12 -0400 (Tue, 07 Apr 2009) New Revision: 14556 Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/HibernateConsoleTestPlugin.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/JavaFormattingTest.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/RefactoringTest.java Log: JBIDE-4137 Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java 2009-04-07 12:49:21 UTC (rev 14555) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java 2009-04-07 12:50:12 UTC (rev 14556) @@ -165,6 +165,7 @@ } QueryPage qp = consoleCfg.executeHQLQuery("from java.lang.Object"); //$NON-NLS-1$ + assertNotNull(qp); assertEquals(1, listener.queryCreated); consoleCfg.closeSessionFactory(); Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/HibernateConsoleTestPlugin.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/HibernateConsoleTestPlugin.java 2009-04-07 12:49:21 UTC (rev 14555) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/HibernateConsoleTestPlugin.java 2009-04-07 12:50:12 UTC (rev 14556) @@ -28,7 +28,7 @@ * The constructor. */ public HibernateConsoleTestPlugin() { - plugin = this; + setPlugin(this); } /** @@ -43,7 +43,7 @@ */ public void stop(BundleContext context) throws Exception { super.stop(context); - plugin = null; + setPlugin(null); resourceBundle = null; } @@ -54,6 +54,9 @@ return plugin; } + private static void setPlugin(HibernateConsoleTestPlugin plugin) { + HibernateConsoleTestPlugin.plugin = plugin; + } /** * Returns the string from the plugin's resource bundle, * or 'key' if not found. Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/JavaFormattingTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/JavaFormattingTest.java 2009-04-07 12:49:21 UTC (rev 14555) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/JavaFormattingTest.java 2009-04-07 12:50:12 UTC (rev 14556) @@ -51,6 +51,7 @@ edit.apply(doc); String newcontents = doc.get(); + assertNotNull(newcontents); //assertEquals(newcontents,"java.lang.String str; \nSystem.out.println();"); } Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/RefactoringTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/RefactoringTest.java 2009-04-07 12:49:21 UTC (rev 14555) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/RefactoringTest.java 2009-04-07 12:50:12 UTC (rev 14556) @@ -268,7 +268,7 @@ } //==================================================================================== - class TestWorkingCopy implements ILaunchConfigurationWorkingCopy{ + static class TestWorkingCopy implements ILaunchConfigurationWorkingCopy{ private TestLaunchConfig parent; @@ -473,7 +473,7 @@ } - class TestLaunchConfig implements ILaunchConfiguration{ + static class TestLaunchConfig implements ILaunchConfiguration{ private Map<String, Object> attributes = new HashMap<String, Object>();