Revert "TEST: create "test/src" folder,add libraries and ant-script about Junit" 50/24950/1
authorDongHee Yang <donghee.yang@samsung.com>
Thu, 24 Jul 2014 09:31:58 +0000 (02:31 -0700)
committerDongHee Yang <donghee.yang@samsung.com>
Thu, 24 Jul 2014 09:31:58 +0000 (02:31 -0700)
This reverts commit 5ea28b3b80214de0c009438587c4bc803abc3a05.

Change-Id: Ibf4117e9657da75b13f593da2386a8bb31361689

org.tizen.nativeplatform/.classpath
org.tizen.nativeplatform/IDE_unitTest_build.xml [deleted file]
org.tizen.nativeplatform/lib/hamcrest.jar [deleted file]
org.tizen.nativeplatform/lib/junit.jar [deleted file]
org.tizen.nativeplatform/test/src/org/tizen/nativeplatform/ActivatorTest.java [deleted file]

index fbf1969..ad32c83 100644 (file)
@@ -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 (executable)
index 379dfb3..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-<project name="NativePlatformIDE" default="compile" basedir=".">\r
-       <description>\r
-         nativeplatform UnitTest for Tizen SDK\r
-               contact\r
-                jaeminkim@samsung.com\r
-                donghyuk.yang@samsung.com  \r
-    </description>\r
-\r
-       <!-- set global properties for this build -->\r
-       <property name="src.dir" location="src"/>\r
-       <property name="build.dir" location="build"/>\r
-       <property name="lib.dir" location="lib"/>\r
-       <property name="dist.dir"  location="dist"/>\r
-\r
-\r
-       <!-- set global properties for another build -->\r
-       <property name="parentdir" location="../.."/>\r
-       <property name="tizen.sdk" location="c:/tizen-sdk0522"/>\r
-       <property name="ant.build.javac.source" value="1.6"/>\r
-       <property name="ant.build.javac.target" value="1.6"/>\r
-\r
-       <!--Junit -->\r
-       <property name="junit.output.dir" value="junit"/>\r
-       <property name="bin.dir"  value="bin"/>\r
-       <path id="JUnit 4.libraryclasspath">\r
-               <pathelement location="lib/junit.jar"/>\r
-               <pathelement location="lib/hamcrest.jar"/>\r
-       </path>\r
-\r
-       <target name="init-linux-32" if="is-linux-32">\r
-               <property name="swtjar" value="swt-linux-32.jar"/>\r
-               <property name="PLATFORM" value="linux32"/>\r
-               <property name="junit.jvmarg" value="-Dis=is"/>\r
-       </target>\r
-\r
-       <target name="init-linux-64" if="is-linux-64">\r
-               <property name="swtjar" value="swt-linux-64.jar"/>\r
-               <property name="PLATFORM" value="linux64"/>\r
-               <property name="junit.jvmarg" value="-Dis=is"/>\r
-       </target>\r
-\r
-       <target name="init-windows-32" if="is-windows-32">\r
-               <property name="swtjar" value="swt-win32-32.jar"/>\r
-               <property name="PLATFORM" value="windows32"/>\r
-               <property name="junit.jvmarg" value="-Dis=is"/>\r
-       </target>\r
-\r
-       <target name="init-windows-64" if="is-windows-64">\r
-               <property name="swtjar" value="swt-win32-64.jar"/>\r
-               <property name="PLATFORM" value="windows64"/>\r
-               <property name="junit.jvmarg" value="-Dis=is"/>\r
-       </target>\r
-\r
-       <target name="init-macos" if="is-macos">\r
-               <property name="swtjar" value="swt-macos-64.jar"/>\r
-               <property name="PLATFORM" value="macos"/>\r
-               <property name="junit.jvmarg" value="-XstartOnFirstThread"/>\r
-       </target>\r
-\r
-       <target name="init" depends="init-linux-32,init-windows-32,init-linux-64,init-windows-64,init-macos">\r
-               <path id="build-classpath">\r
-                       <fileset dir="${basedir}/lib">\r
-                               <include name="*.jar"/>\r
-                       </fileset>\r
-               </path>\r
-               <mkdir dir="${build.dir}"/>\r
-               <mkdir dir="${dist.dir}"/>\r
-               <mkdir dir="lib"/>\r
-       </target>\r
-\r
-       <target name="compile" depends="init" description="compile the source">\r
-               <unzip dest="${tizen.sdk}/test/ide/lib">\r
-                       <fileset dir="${tizen.sdk}/ide/plugins">\r
-                               <include name="**/org.tizen.common*.jar"/>\r
-                       </fileset>\r
-               </unzip>\r
-\r
-               <mkdir dir="${basedir}/JAR-lib" />\r
-               <mkdir dir="${basedir}/JAR-common-eplugin" />\r
-               <mkdir dir="${basedir}/JAR-nativecommon-eplugin" />\r
-               \r
-               <echo> ############################</echo>\r
-               <echo> compile [ common ]          </echo>\r
-               <echo> ############################</echo>\r
-               <javac destdir="${basedir}/JAR-common-eplugin" debug="on" debuglevel="source,lines,vars" includeantruntime="false" encoding="UTF-8">\r
-                       <src path="${parentdir}"/>\r
-                       <include name="/common-eplugin/org.tizen.common/src/**/*.java"/>\r
-                       <include name="/common-eplugin/org.tizen.common.builder/src/**/*.java"/>\r
-                       <include name="/common-eplugin/org.tizen.common.ui/src/**/*.java"/>\r
-                       <classpath>\r
-                               <dirset file="${tizen.sdk}/test/ide/lib" />\r
-                               <fileset dir="${tizen.sdk}/test/ide/lib">\r
-                                       <include name="**/*.jar" />\r
-                               </fileset>\r
-                               <fileset dir="${tizen.sdk}/ide/plugins">\r
-                                       <include name="**/*.jar" />\r
-                               </fileset>\r
-                       </classpath>\r
-               </javac>\r
-               <jar jarfile="${basedir}/JAR-lib/common-eplugin.jar" basedir="${basedir}/JAR-common-eplugin"/>\r
-               \r
-               <echo> ############################</echo>\r
-               <echo> compile [ nativecommon ]    </echo>\r
-               <echo> ############################</echo>\r
-               <javac destdir="${basedir}/JAR-nativecommon-eplugin" debug="on" debuglevel="source,lines,vars" includeantruntime="false" encoding="UTF-8">\r
-                       <src path="${parentdir}"/>\r
-                       <include name="/nativecommon-eplugin/org.tizen.nativecommon/src/**/*.java"/>\r
-                       <classpath>\r
-                               <fileset dir="${parentdir}/nativecommon-eplugin/org.tizen.nativecommon/lib">\r
-                                       <include name="**/*.jar" />\r
-                               </fileset>\r
-                               <fileset dir="${basedir}/JAR-lib">\r
-                                       <include name="**/*.jar" />\r
-                               </fileset>\r
-                               <fileset dir="${tizen.sdk}/test/ide/lib">\r
-                                       <include name="**/*.jar" />\r
-                               </fileset>\r
-                               <fileset dir="${tizen.sdk}/ide/plugins">\r
-                                       <include name="**/*.jar" />\r
-                               </fileset>\r
-                       </classpath>\r
-               </javac>\r
-               <jar jarfile="${basedir}/JAR-lib/nativecommon-eplugin.jar" basedir="${basedir}/JAR-nativecommon-eplugin"/>\r
-\r
-               <echo> ############################</echo>\r
-               <echo> compile [ nativeplatform ]  </echo>\r
-               <echo> ############################</echo>\r
-               <javac srcdir="${src.dir}" destdir="${build.dir}" debug="on" debuglevel="source,lines,vars" includeantruntime="false">\r
-                       <classpath>\r
-                               <fileset dir="${basedir}/JAR-lib">\r
-                                       <include name="**/*.jar" />\r
-                               </fileset>\r
-                               <fileset dir="${basedir}/lib">\r
-                                       <include name="**/*.jar" />\r
-                               </fileset>\r
-                               <fileset dir="${tizen.sdk}/test/ide/lib">\r
-                                       <include name="**/*.jar" />\r
-                               </fileset>\r
-                               <fileset dir="${tizen.sdk}/ide/plugins">\r
-                                       <include name="**/*.jar" />\r
-                               </fileset>\r
-                               <fileset dir="${tizen.sdk}/ide/dropins">\r
-                                       <include name="**/*.jar" />\r
-                               </fileset>\r
-                       </classpath>\r
-               </javac>\r
-       </target>\r
-\r
-       <echo> ############################</echo>\r
-       <echo> unit test [ nativeplatform ]  </echo>\r
-       <echo> ############################</echo>      \r
-       <target name="unittest"  description="Unit-test">\r
-               <mkdir dir="${junit.output.dir}"/>              <!-- junit -->\r
-               <junit printsummary="true" fork="yes">   \r
-                       <classpath>\r
-                               <path refid="JUnit 4.libraryclasspath"/>\r
-                               <pathelement path="${build.dir}"/>               <!-- build -->\r
-                               <pathelement path="${basedir}/lib/${swtjar}"/>    <!-- swt-win32-32.jar -->\r
-                               <pathelement path="${basedir}/bin"/>\r
-                       </classpath>\r
-                       <formatter type="xml"/>                                         \r
-                       <test name="org.tizen.nativeplatform.ActivatorTest" todir="${junit.output.dir}"/>               \r
-               </junit>                \r
-               <junitreport todir="${junit.output.dir}">\r
-                                       <fileset dir="${junit.output.dir}">\r
-                                               <include name="TEST-*.xml"/>\r
-                                       </fileset>\r
-                                       <report format="frames" todir="${junit.output.dir}"/>\r
-               </junitreport>\r
-       </target>\r
-\r
-       <target name="clean" description="clean up" >\r
-               <delete dir="${build.dir}"/>\r
-               <delete dir="${dist.dir}"/>\r
-               <delete dir="${bin.dir}"/>\r
-               <delete dir="${junit.output.dir}"/>\r
-       </target>\r
-</project>\r
diff --git a/org.tizen.nativeplatform/lib/hamcrest.jar b/org.tizen.nativeplatform/lib/hamcrest.jar
deleted file mode 100755 (executable)
index a661682..0000000
Binary files a/org.tizen.nativeplatform/lib/hamcrest.jar and /dev/null differ
diff --git a/org.tizen.nativeplatform/lib/junit.jar b/org.tizen.nativeplatform/lib/junit.jar
deleted file mode 100755 (executable)
index aaf7444..0000000
Binary files a/org.tizen.nativeplatform/lib/junit.jar and /dev/null differ
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 (file)
index 6d53ddf..0000000
+++ /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);      }
-
-}