adjust test folder

Author: terryyin

org.cpputest.plugin.unittest/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="lib" path="/Users/yinterry/git/CppUTestEclipsePlugin/org.cpputest.plugin.unittest/lib/jmock-junit4-2.5.1.jar"/>
 	<classpathentry kind="lib" path="/Users/yinterry/git/CppUTestEclipsePlugin/org.cpputest.plugin.unittest/lib/hamcrest-core-1.1.jar"/>

org.cpputest.plugin.unittest/build.properties

@@ -1,4 +1,4 @@
-source.. = src/
+source.. = test/
 output.. = bin/
 bin.includes = test/
 src.includes = test/

org.cpputest.plugin.unittest/src/org/cpputest/plugin/test/CppDefautlMockStubberTest.java renamed to org.cpputest.plugin.unittest/test/org/cpputest/codeGenerator/test/CppDefautlMockStubberTest.java

@@ -1,4 +1,4 @@
-package org.cpputest.plugin.test;
+package org.cpputest.codeGenerator.test;
 
 import static org.junit.Assert.*;
 

org.cpputest.plugin.unittest/src/org/cpputest/plugin/test/CppEmptyStubberTest.java renamed to org.cpputest.plugin.unittest/test/org/cpputest/codeGenerator/test/CppEmptyStubberTest.java

@@ -1,4 +1,4 @@
-package org.cpputest.plugin.test;
+package org.cpputest.codeGenerator.test;
 
 import static org.junit.Assert.*;
 

org.cpputest.plugin.unittest/src/org/cpputest/plugin/test/CppUTestCodeGeneratorTest.java renamed to org.cpputest.plugin.unittest/test/org/cpputest/codeGenerator/test/CppUTestCodeGeneratorTest.java

@@ -1,4 +1,4 @@
-package org.cpputest.plugin.test;
+package org.cpputest.codeGenerator.test;
 
 import static org.junit.Assert.*;
 

org.cpputest.plugin.unittest/src/org/cpputest/parser/impl/test/CppFunctionSignatureReadingTest.java renamed to org.cpputest.plugin.unittest/test/org/cpputest/parser/impl/test/CppFunctionSignatureReadingTest.java

@@ -2,7 +2,7 @@
 
 import static org.junit.Assert.*;
 
-import org.cpputest.codeGenerator.CppUTestPlatform;
+import org.cpputest.codeGenerator.CUTPlatformAdaptor;
 import org.cpputest.plugin.ICppUTestFactory;
 import org.cpputest.plugin.actions.*;
 import org.eclipse.jface.action.IAction;
@@ -23,7 +23,7 @@
 public class CppUTestActionTest {
 	Mockery context = new JUnit4Mockery();
 	final ICppUTestFactory factory = context.mock(ICppUTestFactory.class);
-	final CppUTestPlatform platform = context.mock(CppUTestPlatform.class);
+	final CUTPlatformAdaptor platform = context.mock(CUTPlatformAdaptor.class);
 	final IWorkbenchWindow window = context.mock(IWorkbenchWindow.class);
 
 	@Test

org.cpputest.plugin.unittest/src/org/cpputest/parser/impl/test/CppLikeCodeTokenSplitterTest.java renamed to org.cpputest.plugin.unittest/test/org/cpputest/parser/impl/test/CppLikeCodeTokenSplitterTest.java

@@ -6,7 +6,7 @@
 import org.cpputest.codeGenerator.CppCodeFormater;
 import org.cpputest.codeGenerator.CppDefaultMockStubber;
 import org.cpputest.codeGenerator.CppEmptyStubber;
-import org.cpputest.codeGenerator.CppUTestPlatform;
+import org.cpputest.codeGenerator.CUTPlatformAdaptor;
 import org.cpputest.codeGenerator.Stubber;
 import org.cpputest.plugin.CppUTestEclipsePlatform;
 import org.cpputest.plugin.CppUTestFactory;
@@ -21,7 +21,7 @@ public class CppUTestFactoryTest {
 
 	@Test
 	public void testCreatePlatform() {
-		CppUTestPlatform platform = factory.createPlatformAdaptor(null);
+		CUTPlatformAdaptor platform = factory.createPlatformAdaptor(null);
 		assertTrue(CppUTestEclipsePlatform.class.isInstance(platform));
 	}
 

org.cpputest.plugin.unittest/src/org/cpputest/parser/impl/test/PotentialLanguagePartsTest.java renamed to org.cpputest.plugin.unittest/test/org/cpputest/parser/impl/test/PotentialLanguagePartsTest.java

@@ -1,7 +1,7 @@
 package org.cpputest.plugin.test;
 
 import org.cpputest.codeGenerator.CppCode;
-import org.cpputest.codeGenerator.SourceCodeResource;
+import org.cpputest.codeGenerator.SourceCodeProvider;
 import org.cpputest.codeGenerator.Stubber;
 import org.cpputest.codeGenerator.WhoCreateStubFromSourceCode;
 import org.cpputest.plugin.CppUTestSourceCodeStubberForEditor;
@@ -20,7 +20,7 @@ public class CppUTestSourceCodeStubberForEditorTest {
 	final String EXPECTED_STUB = "stub";
 	final String SOURCE_CODE = "code";
 	final String ALL_CODE = "all code";
-	final SourceCodeResource resource = context.mock(SourceCodeResource.class);
+	final SourceCodeProvider resource = context.mock(SourceCodeProvider.class);
 	final WhoCreateStubFromSourceCode codeGenerator = context.mock(WhoCreateStubFromSourceCode.class);
 	final Stubber stubber = context.mock(Stubber.class);
 	@Test

org.cpputest.plugin.unittest/src/org/cpputest/parser/impl/test/SignatureBuilderTest.java renamed to org.cpputest.plugin.unittest/test/org/cpputest/parser/impl/test/SignatureBuilderTest.java

@@ -2,7 +2,7 @@
 
 import org.cpputest.codeGenerator.CppCode;
 import org.cpputest.codeGenerator.CppCodeFormater;
-import org.cpputest.codeGenerator.CppUTestPlatform;
+import org.cpputest.codeGenerator.CUTPlatformAdaptor;
 import org.cpputest.codeGenerator.Stubber;
 import org.cpputest.plugin.CppUTestStubCodeUI;
 import org.cpputest.plugin.SourceCodeStubberForEditor;
@@ -20,7 +20,7 @@ public class CppUTestStubCodeUITest {
 	final String EXPECTED_STUB = "stub";
 	final String SOURCE_CODE = "code";
 	final String ALL_CODE = "all code";
-	final CppUTestPlatform platform = context.mock(CppUTestPlatform.class);
+	final CUTPlatformAdaptor platform = context.mock(CUTPlatformAdaptor.class);
 	final SourceCodeStubberForEditor stubbers = context.mock(SourceCodeStubberForEditor.class);
 	final CppCodeFormater formater = context.mock(CppCodeFormater.class);
 	final Stubber stubber = context.mock(Stubber.class);

org.cpputest.plugin.unittest/src/org/cpputest/parser/test/CppSourceCodeReaderEndToEndTest.java renamed to org.cpputest.plugin.unittest/test/org/cpputest/parser/test/CppSourceCodeReaderEndToEndTest.java

@@ -0,0 +1,8 @@
+package org.cpputest.codeGenerator;
+
+public interface CUTPlatformAdaptor {
+
+	void copyToClipboard(String string);
+
+	void messageBox(String string);
+}

org.cpputest.plugin.unittest/src/org/cpputest/plugin/actions/test/CppUTestActionCopyDefaultMockToClipboardTest.java renamed to org.cpputest.plugin.unittest/test/org/cpputest/plugin/actions/test/CppUTestActionCopyDefaultMockToClipboardTest.java

@@ -0,0 +1,11 @@
+package org.cpputest.codeGenerator;
+
+public interface SourceCodeProvider {
+
+	public abstract String getFullText();
+
+	public abstract int getCursorPosition();
+
+	public abstract String getSelectedText();
+
+}

org.cpputest.plugin.unittest/src/org/cpputest/plugin/actions/test/CppUTestActionCopyEmptyStubToClipboardTest.java renamed to org.cpputest.plugin.unittest/test/org/cpputest/plugin/actions/test/CppUTestActionCopyEmptyStubToClipboardTest.java

@@ -4,9 +4,6 @@
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
-/**
- * The activator class controls the plug-in life cycle
- */
 public class Activator extends AbstractUIPlugin {
 
 	// The plug-in ID
@@ -15,9 +12,6 @@ public class Activator extends AbstractUIPlugin {
 	// The shared instance
 	private static Activator plugin;
 
-	/**
-	 * The constructor
-	 */
 	public Activator() {
 	}
 

org.cpputest.plugin.unittest/src/org/cpputest/plugin/actions/test/CppUTestActionTest.java renamed to org.cpputest.plugin.unittest/test/org/cpputest/plugin/actions/test/CppUTestActionTest.java

@@ -1,7 +1,7 @@
 package org.cpputest.plugin;
 
-import org.cpputest.codeGenerator.CppUTestPlatform;
-import org.cpputest.codeGenerator.SourceCodeResource;
+import org.cpputest.codeGenerator.CUTPlatformAdaptor;
+import org.cpputest.codeGenerator.SourceCodeProvider;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.text.IDocument;
@@ -15,7 +15,7 @@
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.texteditor.AbstractTextEditor;
 
-public class CppUTestEclipsePlatform implements CppUTestPlatform, SourceCodeResource {
+public class CppUTestEclipsePlatform implements CUTPlatformAdaptor, SourceCodeProvider {
 	private static final String PLUGIN_NAME = "CppUTest";
 	IWorkbenchWindow workbenchWindow;
 

org.cpputest.plugin.unittest/test/org/cpputest/plugin/generaltest/CppCodeParserTest.java

@@ -4,7 +4,7 @@
 import org.cpputest.codeGenerator.CppCodeFormater;
 import org.cpputest.codeGenerator.CppDefaultMockStubber;
 import org.cpputest.codeGenerator.CppEmptyStubber;
-import org.cpputest.codeGenerator.CppUTestPlatform;
+import org.cpputest.codeGenerator.CUTPlatformAdaptor;
 import org.cpputest.codeGenerator.CppUTestStubCreator;
 import org.cpputest.codeGenerator.Stubber;
 import org.cpputest.parser.CppSourceCodeReader;
@@ -23,7 +23,7 @@ public class CppUTestFactory implements ICppUTestFactory {
 //	}
 
 	@Override
-	public CppUTestPlatform createPlatformAdaptor(IWorkbenchWindow window) {
+	public CUTPlatformAdaptor createPlatformAdaptor(IWorkbenchWindow window) {
 		platform = new CppUTestEclipsePlatform(window);
 		return platform;
 	}

org.cpputest.plugin.unittest/test/org/cpputest/plugin/generaltest/CppUTestActionTest.java

@@ -1,15 +1,15 @@
 package org.cpputest.plugin;
 
 import org.cpputest.codeGenerator.CppCode;
-import org.cpputest.codeGenerator.SourceCodeResource;
+import org.cpputest.codeGenerator.SourceCodeProvider;
 import org.cpputest.codeGenerator.Stubber;
 import org.cpputest.codeGenerator.WhoCreateStubFromSourceCode;
 
 public class CppUTestSourceCodeStubberForEditor implements SourceCodeStubberForEditor {
-	private final SourceCodeResource resource;
+	private final SourceCodeProvider resource;
 	private final WhoCreateStubFromSourceCode codeGenerator;
 
-	public CppUTestSourceCodeStubberForEditor(SourceCodeResource resource,
+	public CppUTestSourceCodeStubberForEditor(SourceCodeProvider resource,
 			WhoCreateStubFromSourceCode codeGenerator) {
 				this.resource = resource;
 				this.codeGenerator = codeGenerator;

org.cpputest.plugin.unittest/test/org/cpputest/plugin/generaltest/CppUTestCodeGeneratorTest.java

@@ -2,15 +2,15 @@
 
 import org.cpputest.codeGenerator.CppCode;
 import org.cpputest.codeGenerator.CppCodeFormater;
-import org.cpputest.codeGenerator.CppUTestPlatform;
+import org.cpputest.codeGenerator.CUTPlatformAdaptor;
 import org.cpputest.codeGenerator.Stubber;
 
 public class CppUTestStubCodeUI implements StubCodeUI {
-	public final CppUTestPlatform platform;
+	public final CUTPlatformAdaptor platform;
 	public SourceCodeStubberForEditor sourceCodeStubber;
 	public final CppCodeFormater formater;
 
-	public CppUTestStubCodeUI(CppUTestPlatform platform, SourceCodeStubberForEditor sourceCodeStubber, CppCodeFormater formater) {
+	public CppUTestStubCodeUI(CUTPlatformAdaptor platform, SourceCodeStubberForEditor sourceCodeStubber, CppCodeFormater formater) {
 		this.platform = platform;
 		this.sourceCodeStubber = sourceCodeStubber;
 		this.formater = formater;