|
From: <mir...@us...> - 2007-04-13 13:04:57
|
Revision: 2306
http://svn.sourceforge.net/rubyeclipse/?rev=2306&view=rev
Author: mirkostocker
Date: 2007-04-13 06:04:55 -0700 (Fri, 13 Apr 2007)
Log Message:
-----------
rename and move the tests
Modified Paths:
--------------
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/TS_Core.java
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/nodewrapper/TS_NodeWrapper.java
Added Paths:
-----------
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/TC_ModuleNodeProvider_ModuleWithMultipleParents.rb
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/TC_ModuleNodeProvider_ModuleWithParent.rb
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/TC_ModuleNodeProvider_SimpleModule.rb
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/TC_ModuleNodeProvider.java
Removed Paths:
-------------
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/nodewrapper/TC_ModuleNodeWrapper_ModuleWithMultipleParents.rb
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/nodewrapper/TC_ModuleNodeWrapper_ModuleWithParent.rb
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/nodewrapper/TC_ModuleNodeWrapper_SimpleModule.rb
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/nodewrapper/TC_ModuleNodeWrapper.java
Copied: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/TC_ModuleNodeProvider_ModuleWithMultipleParents.rb (from rev 2305, trunk/org.rubypeople.rdt.refactoring.tests/resources/core/nodewrapper/TC_ModuleNodeWrapper_ModuleWithMultipleParents.rb)
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/TC_ModuleNodeProvider_ModuleWithMultipleParents.rb (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/TC_ModuleNodeProvider_ModuleWithMultipleParents.rb 2007-04-13 13:04:55 UTC (rev 2306)
@@ -0,0 +1,10 @@
+module M1
+ module M2
+ module M3
+ module M4
+ module M5
+ end
+ end
+ end
+ end
+end
\ No newline at end of file
Copied: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/TC_ModuleNodeProvider_ModuleWithParent.rb (from rev 2305, trunk/org.rubypeople.rdt.refactoring.tests/resources/core/nodewrapper/TC_ModuleNodeWrapper_ModuleWithParent.rb)
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/TC_ModuleNodeProvider_ModuleWithParent.rb (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/TC_ModuleNodeProvider_ModuleWithParent.rb 2007-04-13 13:04:55 UTC (rev 2306)
@@ -0,0 +1,4 @@
+module OuterModule
+ module Modul
+ end
+end
\ No newline at end of file
Copied: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/TC_ModuleNodeProvider_SimpleModule.rb (from rev 2305, trunk/org.rubypeople.rdt.refactoring.tests/resources/core/nodewrapper/TC_ModuleNodeWrapper_SimpleModule.rb)
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/TC_ModuleNodeProvider_SimpleModule.rb (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/TC_ModuleNodeProvider_SimpleModule.rb 2007-04-13 13:04:55 UTC (rev 2306)
@@ -0,0 +1,2 @@
+module Modul
+end
\ No newline at end of file
Deleted: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/nodewrapper/TC_ModuleNodeWrapper_ModuleWithMultipleParents.rb
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/nodewrapper/TC_ModuleNodeWrapper_ModuleWithMultipleParents.rb 2007-04-13 12:56:14 UTC (rev 2305)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/nodewrapper/TC_ModuleNodeWrapper_ModuleWithMultipleParents.rb 2007-04-13 13:04:55 UTC (rev 2306)
@@ -1,10 +0,0 @@
-module M1
- module M2
- module M3
- module M4
- module M5
- end
- end
- end
- end
-end
\ No newline at end of file
Deleted: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/nodewrapper/TC_ModuleNodeWrapper_ModuleWithParent.rb
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/nodewrapper/TC_ModuleNodeWrapper_ModuleWithParent.rb 2007-04-13 12:56:14 UTC (rev 2305)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/nodewrapper/TC_ModuleNodeWrapper_ModuleWithParent.rb 2007-04-13 13:04:55 UTC (rev 2306)
@@ -1,4 +0,0 @@
-module OuterModule
- module Modul
- end
-end
\ No newline at end of file
Deleted: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/nodewrapper/TC_ModuleNodeWrapper_SimpleModule.rb
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/nodewrapper/TC_ModuleNodeWrapper_SimpleModule.rb 2007-04-13 12:56:14 UTC (rev 2305)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/nodewrapper/TC_ModuleNodeWrapper_SimpleModule.rb 2007-04-13 13:04:55 UTC (rev 2306)
@@ -1,2 +0,0 @@
-module Modul
-end
\ No newline at end of file
Copied: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/TC_ModuleNodeProvider.java (from rev 2305, trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/nodewrapper/TC_ModuleNodeWrapper.java)
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/TC_ModuleNodeProvider.java (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/TC_ModuleNodeProvider.java 2007-04-13 13:04:55 UTC (rev 2306)
@@ -0,0 +1,71 @@
+/***** BEGIN LICENSE BLOCK *****
+ * Version: CPL 1.0/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Common Public
+ * License Version 1.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.eclipse.org/legal/cpl-v10.html
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * Copyright (C) 2006 Mirko Stocker <me...@mi...>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the CPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the CPL, the GPL or the LGPL.
+ ***** END LICENSE BLOCK *****/
+
+package org.rubypeople.rdt.refactoring.tests.core;
+
+import org.rubypeople.rdt.refactoring.core.ModuleNodeProvider;
+import org.rubypeople.rdt.refactoring.nodewrapper.ModuleNodeWrapper;
+import org.rubypeople.rdt.refactoring.tests.FileTestCase;
+
+public class TC_ModuleNodeProvider extends FileTestCase {
+
+ public TC_ModuleNodeProvider() {
+ super("Module Node Provider");
+ }
+
+ private ModuleNodeWrapper findModule(String file, int position) {
+ return ModuleNodeProvider.getSelectedModuleNode(getRootNode(file),position);
+ }
+
+ public void testSimpleModule() {
+ ModuleNodeWrapper moduleNode = findModule("TC_ModuleNodeProvider_SimpleModule.rb", 8);
+
+ assertNull(moduleNode.getParentModule());
+ assertNotNull(moduleNode.getWrappedNode());
+ assertEquals("Modul", moduleNode.getName());
+ assertEquals("Modul", moduleNode.getFullName());
+ }
+
+ public void testModuleWithParent() {
+ ModuleNodeWrapper moduleNode = findModule("TC_ModuleNodeProvider_ModuleWithParent.rb", 31);
+
+ assertNotNull(moduleNode.getParentModule());
+ assertNotNull(moduleNode.getParentModule().getWrappedNode());
+ assertNull(moduleNode.getParentModule().getParentModule());
+ assertNotNull(moduleNode.getWrappedNode());
+ assertEquals("Modul", moduleNode.getName());
+ assertEquals("OuterModule::Modul", moduleNode.getFullName());
+ }
+
+ public void testModuleWithMultipleParents() {
+ ModuleNodeWrapper moduleNode = findModule("TC_ModuleNodeProvider_ModuleWithMultipleParents.rb", 68);
+
+ assertEquals("M5", moduleNode.getName());
+ assertEquals("M1::M2::M3::M4::M5", moduleNode.getFullName());
+ }
+}
Modified: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/TS_Core.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/TS_Core.java 2007-04-13 12:56:14 UTC (rev 2305)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/TS_Core.java 2007-04-13 13:04:55 UTC (rev 2306)
@@ -39,6 +39,7 @@
public static Test suite() {
TestSuite suite = createSuite("Core", "enclosing_nodes_test*rb", TC_SelectionNodeProvider.class);
suite.addTestSuite(TC_NodeProvider.class);
+ suite.addTestSuite(TC_ModuleNodeProvider.class);
suite.addTest(TS_NodeWrapper.suite());
suite.addTestSuite(TC_RefactoringConditionChecker.class);
return suite;
Deleted: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/nodewrapper/TC_ModuleNodeWrapper.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/nodewrapper/TC_ModuleNodeWrapper.java 2007-04-13 12:56:14 UTC (rev 2305)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/nodewrapper/TC_ModuleNodeWrapper.java 2007-04-13 13:04:55 UTC (rev 2306)
@@ -1,43 +0,0 @@
-package org.rubypeople.rdt.refactoring.tests.core.nodewrapper;
-
-import org.rubypeople.rdt.refactoring.core.ModuleNodeProvider;
-import org.rubypeople.rdt.refactoring.nodewrapper.ModuleNodeWrapper;
-import org.rubypeople.rdt.refactoring.tests.FileTestCase;
-
-public class TC_ModuleNodeWrapper extends FileTestCase {
-
- public TC_ModuleNodeWrapper() {
- super("Module Node Wrapper");
- }
-
- private ModuleNodeWrapper findModule(String file, int position) {
- return ModuleNodeProvider.getSelectedModuleNode(getRootNode(file),position);
- }
-
- public void testSimpleModule() {
- ModuleNodeWrapper moduleNode = findModule("TC_ModuleNodeWrapper_SimpleModule.rb", 8);
-
- assertNull(moduleNode.getParentModule());
- assertNotNull(moduleNode.getWrappedNode());
- assertEquals("Modul", moduleNode.getName());
- assertEquals("Modul", moduleNode.getFullName());
- }
-
- public void testModuleWithParent() {
- ModuleNodeWrapper moduleNode = findModule("TC_ModuleNodeWrapper_ModuleWithParent.rb", 31);
-
- assertNotNull(moduleNode.getParentModule());
- assertNotNull(moduleNode.getParentModule().getWrappedNode());
- assertNull(moduleNode.getParentModule().getParentModule());
- assertNotNull(moduleNode.getWrappedNode());
- assertEquals("Modul", moduleNode.getName());
- assertEquals("OuterModule::Modul", moduleNode.getFullName());
- }
-
- public void testModuleWithMultipleParents() {
- ModuleNodeWrapper moduleNode = findModule("TC_ModuleNodeWrapper_ModuleWithMultipleParents.rb", 68);
-
- assertEquals("M5", moduleNode.getName());
- assertEquals("M1::M2::M3::M4::M5", moduleNode.getFullName());
- }
-}
Modified: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/nodewrapper/TS_NodeWrapper.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/nodewrapper/TS_NodeWrapper.java 2007-04-13 12:56:14 UTC (rev 2305)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/nodewrapper/TS_NodeWrapper.java 2007-04-13 13:04:55 UTC (rev 2306)
@@ -35,7 +35,6 @@
TestSuite suite = new TestSuite("Node Wrapper");
suite.addTestSuite(TC_FieldNodeWrapper.class);
suite.addTestSuite(TC_MethodNodeWrapper.class);
- suite.addTestSuite(TC_ModuleNodeWrapper.class);
return suite;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|