Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89378fd1 authored by Basavapatna Dattaguru's avatar Basavapatna Dattaguru Committed by Android (Google) Code Review
Browse files

Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb

parents 3b728ca7 d36b1f07

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkPerfTestRunner.java

+3 −6
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2011 The Android Open Source Project

 * Copyright (C) 2008 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -17,8 +17,7 @@ 
package com.android.mediaframeworktest;



import com.android.mediaframeworktest.performance.MediaPlayerPerformance;

/*Video Editor performance Test cases*/

import com.android.mediaframeworktest.performance.VideoEditorPerformance;



import junit.framework.TestSuite;



import android.test.InstrumentationTestRunner;
@@ -41,8 +40,6 @@ public class MediaFrameworkPerfTestRunner extends InstrumentationTestRunner { 
  public TestSuite getAllTests() {

      TestSuite suite = new InstrumentationTestSuite(this);

      suite.addTestSuite(MediaPlayerPerformance.class);

      /*Video Editor performance Test cases*/

      suite.addTestSuite(VideoEditorPerformance.class);

      return suite;

  }

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java

+1 −15
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2011 The Android Open Source Project

 * Copyright (C) 2008 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -32,13 +32,6 @@ import com.android.mediaframeworktest.functional.MediaEqualizerTest; 
import com.android.mediaframeworktest.functional.MediaPresetReverbTest;

import com.android.mediaframeworktest.functional.MediaVirtualizerTest;

import com.android.mediaframeworktest.functional.MediaVisualizerTest;



/*import for VideoEditor Test cases*/

import com.android.mediaframeworktest.functional.MediaItemThumbnailTest;

import com.android.mediaframeworktest.functional.MediaPropertiesTest;

import com.android.mediaframeworktest.functional.VideoEditorAPITest;

import com.android.mediaframeworktest.functional.VideoEditorExportTest;

import com.android.mediaframeworktest.functional.VideoEditorPreviewTest;

import junit.framework.TestSuite;



import android.test.InstrumentationTestRunner;
@@ -76,13 +69,6 @@ public class MediaFrameworkTestRunner extends InstrumentationTestRunner { 
        suite.addTestSuite(MediaPresetReverbTest.class);

        suite.addTestSuite(MediaVirtualizerTest.class);

        suite.addTestSuite(MediaVisualizerTest.class);

        /*Test for Video Editor*/

        suite.addTestSuite(MediaItemThumbnailTest.class);

        suite.addTestSuite(MediaPropertiesTest.class);

        suite.addTestSuite(VideoEditorAPITest.class);

        suite.addTestSuite(VideoEditorExportTest.class);

        suite.addTestSuite(VideoEditorPreviewTest.class);



        return suite;

    }