Merge "Revert "TEST: create "test/src" folder,add libraries and ant-script about Junit"" into tizentizen_3.0.m14.2_ivi

5 files changed, 0 insertions, 216 deletions

diff --git a/org.tizen.nativeplatform/.classpath b/org.tizen.nativeplatform/.classpath
index fbf1969d..ad32c83a 100644
--- a/org.tizen.nativeplatform/.classpath
+++ b/org.tizen.nativeplatform/.classpath
@@ -2,8 +2,6 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="test/src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.tizen.nativeplatform/IDE_unitTest_build.xml b/org.tizen.nativeplatform/IDE_unitTest_build.xml
deleted file mode 100755
index 379dfb3b..00000000
--- a/org.tizen.nativeplatform/IDE_unitTest_build.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<project name="NativePlatformIDE" default="compile" basedir=".">

-	<description>

-         nativeplatform UnitTest for Tizen SDK

-		contact

-		 jaeminkim@samsung.com

-		 donghyuk.yang@samsung.com  

-    </description>

-

-	<!-- set global properties for this build -->

-	<property name="src.dir" location="src"/>

-	<property name="build.dir" location="build"/>

-	<property name="lib.dir" location="lib"/>

-	<property name="dist.dir"  location="dist"/>

-

-

-	<!-- set global properties for another build -->

-	<property name="parentdir" location="../.."/>

-	<property name="tizen.sdk" location="c:/tizen-sdk0522"/>

-	<property name="ant.build.javac.source" value="1.6"/>

-	<property name="ant.build.javac.target" value="1.6"/>

-

-	<!--Junit -->

-	<property name="junit.output.dir" value="junit"/>

-	<property name="bin.dir"  value="bin"/>

-	<path id="JUnit 4.libraryclasspath">

-		<pathelement location="lib/junit.jar"/>

-		<pathelement location="lib/hamcrest.jar"/>

-	</path>

-

-	<target name="init-linux-32" if="is-linux-32">

-		<property name="swtjar" value="swt-linux-32.jar"/>

-		<property name="PLATFORM" value="linux32"/>

-		<property name="junit.jvmarg" value="-Dis=is"/>

-	</target>

-

-	<target name="init-linux-64" if="is-linux-64">

-		<property name="swtjar" value="swt-linux-64.jar"/>

-		<property name="PLATFORM" value="linux64"/>

-		<property name="junit.jvmarg" value="-Dis=is"/>

-	</target>

-

-	<target name="init-windows-32" if="is-windows-32">

-		<property name="swtjar" value="swt-win32-32.jar"/>

-		<property name="PLATFORM" value="windows32"/>

-		<property name="junit.jvmarg" value="-Dis=is"/>

-	</target>

-

-	<target name="init-windows-64" if="is-windows-64">

-		<property name="swtjar" value="swt-win32-64.jar"/>

-		<property name="PLATFORM" value="windows64"/>

-		<property name="junit.jvmarg" value="-Dis=is"/>

-	</target>

-

-	<target name="init-macos" if="is-macos">

-		<property name="swtjar" value="swt-macos-64.jar"/>

-		<property name="PLATFORM" value="macos"/>

-		<property name="junit.jvmarg" value="-XstartOnFirstThread"/>

-	</target>

-

-	<target name="init" depends="init-linux-32,init-windows-32,init-linux-64,init-windows-64,init-macos">

-		<path id="build-classpath">

-			<fileset dir="${basedir}/lib">

-				<include name="*.jar"/>

-			</fileset>

-		</path>

-		<mkdir dir="${build.dir}"/>

-		<mkdir dir="${dist.dir}"/>

-		<mkdir dir="lib"/>

-	</target>

-

-	<target name="compile" depends="init" description="compile the source">

-		<unzip dest="${tizen.sdk}/test/ide/lib">

-			<fileset dir="${tizen.sdk}/ide/plugins">

-				<include name="**/org.tizen.common*.jar"/>

-			</fileset>

-		</unzip>

-

-		<mkdir dir="${basedir}/JAR-lib" />

-		<mkdir dir="${basedir}/JAR-common-eplugin" />

-		<mkdir dir="${basedir}/JAR-nativecommon-eplugin" />

-		

-		<echo> ############################</echo>

-		<echo> compile [ common ]          </echo>

-		<echo> ############################</echo>

-		<javac destdir="${basedir}/JAR-common-eplugin" debug="on" debuglevel="source,lines,vars" includeantruntime="false" encoding="UTF-8">

-			<src path="${parentdir}"/>

-			<include name="/common-eplugin/org.tizen.common/src/**/*.java"/>

-			<include name="/common-eplugin/org.tizen.common.builder/src/**/*.java"/>

-			<include name="/common-eplugin/org.tizen.common.ui/src/**/*.java"/>

-			<classpath>

-				<dirset file="${tizen.sdk}/test/ide/lib" />

-				<fileset dir="${tizen.sdk}/test/ide/lib">

-					<include name="**/*.jar" />

-				</fileset>

-				<fileset dir="${tizen.sdk}/ide/plugins">

-					<include name="**/*.jar" />

-				</fileset>

-			</classpath>

-		</javac>

-		<jar jarfile="${basedir}/JAR-lib/common-eplugin.jar" basedir="${basedir}/JAR-common-eplugin"/>

-		

-		<echo> ############################</echo>

-		<echo> compile [ nativecommon ]    </echo>

-		<echo> ############################</echo>

-		<javac destdir="${basedir}/JAR-nativecommon-eplugin" debug="on" debuglevel="source,lines,vars" includeantruntime="false" encoding="UTF-8">

-			<src path="${parentdir}"/>

-			<include name="/nativecommon-eplugin/org.tizen.nativecommon/src/**/*.java"/>

-			<classpath>

-				<fileset dir="${parentdir}/nativecommon-eplugin/org.tizen.nativecommon/lib">

-					<include name="**/*.jar" />

-				</fileset>

-				<fileset dir="${basedir}/JAR-lib">

-					<include name="**/*.jar" />

-				</fileset>

-				<fileset dir="${tizen.sdk}/test/ide/lib">

-					<include name="**/*.jar" />

-				</fileset>

-				<fileset dir="${tizen.sdk}/ide/plugins">

-					<include name="**/*.jar" />

-				</fileset>

-			</classpath>

-		</javac>

-		<jar jarfile="${basedir}/JAR-lib/nativecommon-eplugin.jar" basedir="${basedir}/JAR-nativecommon-eplugin"/>

-

-		<echo> ############################</echo>

-		<echo> compile [ nativeplatform ]  </echo>

-		<echo> ############################</echo>

-		<javac srcdir="${src.dir}" destdir="${build.dir}" debug="on" debuglevel="source,lines,vars" includeantruntime="false">

-			<classpath>

-				<fileset dir="${basedir}/JAR-lib">

-					<include name="**/*.jar" />

-				</fileset>

-				<fileset dir="${basedir}/lib">

-					<include name="**/*.jar" />

-				</fileset>

-				<fileset dir="${tizen.sdk}/test/ide/lib">

-					<include name="**/*.jar" />

-				</fileset>

-				<fileset dir="${tizen.sdk}/ide/plugins">

-					<include name="**/*.jar" />

-				</fileset>

-				<fileset dir="${tizen.sdk}/ide/dropins">

-					<include name="**/*.jar" />

-				</fileset>

-			</classpath>

-		</javac>

-	</target>

-

-	<echo> ############################</echo>

-	<echo> unit test [ nativeplatform ]  </echo>

-	<echo> ############################</echo>	

-	<target name="unittest"  description="Unit-test">

-		<mkdir dir="${junit.output.dir}"/>		<!-- junit -->

-		<junit printsummary="true" fork="yes">   

-			<classpath>

-				<path refid="JUnit 4.libraryclasspath"/>

-				<pathelement path="${build.dir}"/>               <!-- build -->

-				<pathelement path="${basedir}/lib/${swtjar}"/>    <!-- swt-win32-32.jar -->

-				<pathelement path="${basedir}/bin"/>

-			</classpath>

-			<formatter type="xml"/>						

-			<test name="org.tizen.nativeplatform.ActivatorTest" todir="${junit.output.dir}"/>		

-		</junit>		

-		<junitreport todir="${junit.output.dir}">

-					<fileset dir="${junit.output.dir}">

-						<include name="TEST-*.xml"/>

-					</fileset>

-					<report format="frames" todir="${junit.output.dir}"/>

-		</junitreport>

-	</target>

-

-	<target name="clean" description="clean up" >

-		<delete dir="${build.dir}"/>

-		<delete dir="${dist.dir}"/>

-		<delete dir="${bin.dir}"/>

-		<delete dir="${junit.output.dir}"/>

-	</target>

-</project>

diff --git a/org.tizen.nativeplatform/lib/hamcrest.jar b/org.tizen.nativeplatform/lib/hamcrest.jar
deleted file mode 100755
index a6616826..00000000
--- a/org.tizen.nativeplatform/lib/hamcrest.jar
+++ /dev/null
diff --git a/org.tizen.nativeplatform/lib/junit.jar b/org.tizen.nativeplatform/lib/junit.jar
deleted file mode 100755
index aaf74448..00000000
--- a/org.tizen.nativeplatform/lib/junit.jar
+++ /dev/null
diff --git a/org.tizen.nativeplatform/test/src/org/tizen/nativeplatform/ActivatorTest.java b/org.tizen.nativeplatform/test/src/org/tizen/nativeplatform/ActivatorTest.java
deleted file mode 100644
index 6d53ddf7..00000000
--- a/org.tizen.nativeplatform/test/src/org/tizen/nativeplatform/ActivatorTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.tizen.nativeplatform;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-public class ActivatorTest {
-
-	@Test
-	public void testActivator() {
-		assertEquals(1,1);
-	}
-
-	@Test
-	public void testStartBundleContext() {
-		assertEquals(1,1);
-	}
-
-	@Test
-	public void testStopBundleContext() {
-		assertEquals(1,1);
-	}
-
-	@Test
-	public void testGetDefault() {
-		assertEquals(1,1);	}
-
-	@Test
-	public void testGetImageDescriptor() {
-		assertEquals(1,1);	}
-
-	@Test
-	public void testGetPluginId() {
-		assertEquals(1,1);	}
-
-}