diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpplaybackviewplugin/tsrc/unittest_mpequalizerwidget/src/unittest_mpequalizerwidget.cpp
--- a/mpviewplugins/mpplaybackviewplugin/tsrc/unittest_mpequalizerwidget/src/unittest_mpequalizerwidget.cpp	Fri Apr 30 19:33:32 2010 -0500
+++ b/mpviewplugins/mpplaybackviewplugin/tsrc/unittest_mpequalizerwidget/src/unittest_mpequalizerwidget.cpp	Fri May 14 18:54:37 2010 -0500
@@ -1,5 +1,5 @@
-/**
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -17,11 +17,10 @@
 
 #include <QMetaType>
 #include <QtGui>
-#include <hbapplication.h>
-#include <hbmainwindow.h>
 #include <hbradiobuttonlist.h>
+#include <QTranslator>
+#include <QLocale>
 
-#include "stub/inc/mpequalizerwrapper.h"
 #include "unittest_mpequalizerwidget.h"
 
 // Do this so we can access all member variables.
@@ -39,29 +38,32 @@
  */
 int main(int argc, char *argv[])
 {
-    HbApplication app(argc, argv);
-    HbMainWindow window;
-
+    QApplication app(argc, argv);
     TestMpEqualizerWidget tv;
 
-    char *pass[3];
-    pass[0] = argv[0];
-    pass[1] = "-o";
-    pass[2] = "c:\\data\\unittest_mpequalizerwidget.txt";
+    if ( argc > 1 ) {
+        return QTest::qExec( &tv, argc, argv);
+    }
+    else {
+        char *pass[3];
+        pass[0] = argv[0];
+        pass[1] = "-o";
+        pass[2] = "c:\\data\\unittest_mpequalizerwidget.txt";
 
-    int res = QTest::qExec(&tv, 3, pass);
-
-    return res;
+        return QTest::qExec(&tv, 3, pass);
+    }
 }
 
 TestMpEqualizerWidget::TestMpEqualizerWidget()
-    : mTest(0)
+    : mTest(0),
+      mMpTranslator(0)
 {
 }
 
 TestMpEqualizerWidget::~TestMpEqualizerWidget()
 {
     delete mTest;
+    delete mMpTranslator;
 }
 
 /*!
@@ -69,7 +71,15 @@
  */
 void TestMpEqualizerWidget::initTestCase()
 {
-   
+    QString lang = QLocale::system().name();
+    QString path = QString("z:/resource/qt/translations/");
+    bool translatorLoaded = false;
+
+    mMpTranslator = new QTranslator(this);
+    translatorLoaded = mMpTranslator->load(path + "musicplayer_" + lang);
+    if ( translatorLoaded ) {
+        qApp->installTranslator(mMpTranslator);
+    }
 }   
 
 /*!
@@ -84,6 +94,7 @@
  */
 void TestMpEqualizerWidget::init()
 {
+    MpEngineFactory::createSharedEngine();
     mTest = new MpEqualizerWidget();
 }
 
@@ -94,6 +105,7 @@
 {
     delete mTest;
     mTest = 0;
+    MpEngineFactory::close();
 }
 
 /*!
@@ -101,7 +113,7 @@
  */
 void TestMpEqualizerWidget::testInitialize()
 {
-    QVERIFY(mTest->mEqualizerWrapper != 0 );    
+    QVERIFY(mTest->mMpEngine != 0 );    
 }
 
 /*!
@@ -109,7 +121,6 @@
  */
 void TestMpEqualizerWidget::testPrepareDialog()
 {
-    //With Equalizer not ready
     mTest->prepareDialog();
     QVERIFY(mTest->mOriginalPreset == -1 );    
     QVERIFY(mTest->timeout() == HbDialog::NoTimeout);
@@ -117,41 +128,23 @@
     QVERIFY(mTest->frameType() == HbPopup::Strong);
     QVERIFY(mTest->headingWidget() != 0);
     QVERIFY(mTest->actions().count() != 0);
-    QVERIFY(mTest->contentWidget() == 0);
-    
-    
-    //With Equalizer ready
-    cleanup();
-    init();
-    mTest->equalizerReady();
-    mTest->prepareDialog();
     QVERIFY(mTest->mPresetsList != 0);
     QCOMPARE(qobject_cast<HbRadioButtonList*>(mTest->contentWidget()), mTest->mPresetsList);
     QVERIFY(mTest->mPresetsList->selected() == 0);
 }
 
 /*!
- Tests equalizerReady.
- */
-void TestMpEqualizerWidget::testEqualizerReady()
-{
-    mTest->equalizerReady();
-    
-    QVERIFY(mTest->mEqualizerReady);
-}
-
-/*!
  Tests presetSelected.
  */
 void TestMpEqualizerWidget::testPresetSelected()
 {
     //Off preset must call DisableEqualizer
     mTest->presetSelected(0);
-    QVERIFY(mTest->mEqualizerWrapper->mDisableEquqlizerCount == 1);
+    QVERIFY(mTest->mMpEngine->mDisableEquqlizerCount == 1);
 
     //Any other preset must be applied
     mTest->presetSelected(3);
-    QVERIFY(mTest->mEqualizerWrapper->mApplyPresetCount == 1);
+    QVERIFY(mTest->mMpEngine->mApplyPresetCount == 1);
 }
 
 /*!
@@ -159,32 +152,31 @@
  */
 void TestMpEqualizerWidget::testCancelSelected()
 {
-    mTest->equalizerReady();
     mTest->prepareDialog();
     
     //Cancel, when Current preset selected != Original Preset
     
     //When Original Preset == -1 "Off"
-    mTest->mEqualizerWrapper->mActivePreset = 4;
+    mTest->mMpEngine->mActivePreset = 4;
     mTest->mOriginalPreset = -1;
     mTest->cancelSelected(true);
-    QVERIFY(mTest->mEqualizerWrapper->mDisableEquqlizerCount == 1);
-    QCOMPARE(mTest->mEqualizerWrapper->mActivePreset, mTest->mOriginalPreset);
+    QVERIFY(mTest->mMpEngine->mDisableEquqlizerCount == 1);
+    QCOMPARE(mTest->mMpEngine->mActivePreset, mTest->mOriginalPreset);
     
     //When Original Preset != -1 "Any other different than Off"
-    mTest->mEqualizerWrapper->mActivePreset = 4;
+    mTest->mMpEngine->mActivePreset = 4;
     mTest->mOriginalPreset = 2;
     mTest->cancelSelected(true);
-    QVERIFY(mTest->mEqualizerWrapper->mApplyPresetCount == 1);
-    QCOMPARE(mTest->mEqualizerWrapper->mActivePreset, mTest->mOriginalPreset);
+    QVERIFY(mTest->mMpEngine->mApplyPresetCount == 1);
+    QCOMPARE(mTest->mMpEngine->mActivePreset, mTest->mOriginalPreset);
         
     //Cancel, when Current preset selected == Original Preset
-    mTest->mEqualizerWrapper->mActivePreset = 3;
+    mTest->mMpEngine->mActivePreset = 3;
     mTest->mOriginalPreset = 3;
     mTest->cancelSelected(true);
-    QVERIFY(mTest->mEqualizerWrapper->mApplyPresetCount == 1);
-    QVERIFY(mTest->mEqualizerWrapper->mDisableEquqlizerCount == 1);
-    QCOMPARE(mTest->mEqualizerWrapper->mActivePreset, mTest->mOriginalPreset);
+    QVERIFY(mTest->mMpEngine->mApplyPresetCount == 1);
+    QVERIFY(mTest->mMpEngine->mDisableEquqlizerCount == 1);
+    QCOMPARE(mTest->mMpEngine->mActivePreset, mTest->mOriginalPreset);
 }
 
 /*!
@@ -192,12 +184,38 @@
  */
 void TestMpEqualizerWidget::testOkSelected()
 {
-    mTest->equalizerReady();
-    
-    mTest->mEqualizerWrapper->mActivePreset = 2;
+    mTest->mMpEngine->mActivePreset = 2;
     mTest->mOriginalPreset = -1;
     mTest->okSelected(true);
-    QCOMPARE(mTest->mEqualizerWrapper->mActivePreset, mTest->mOriginalPreset);   
+    QCOMPARE(mTest->mMpEngine->mActivePreset, mTest->mOriginalPreset);   
+}
+
+/*!
+ Tests getLogicalName.
+ */
+void TestMpEqualizerWidget::testGetLogicalName()
+{
+    QString logicalName;
+    
+    // test Bass Booster
+    logicalName = mTest->getLogicalName( QString("Bass Booster") );
+    QCOMPARE(logicalName, hbTrId("txt_mus_list_bass_booster"));
+
+    // test Classic
+    logicalName = mTest->getLogicalName( QString("Classic") );
+    QCOMPARE(logicalName, hbTrId("txt_mus_list_classical"));
+
+    // test Pop
+    logicalName = mTest->getLogicalName( QString("Pop") );
+    QCOMPARE(logicalName, hbTrId("txt_mus_list_pop"));
+
+    // test Jazz
+    logicalName = mTest->getLogicalName( QString("Jazz") );
+    QCOMPARE(logicalName, hbTrId("txt_mus_list_jazz"));
+
+    // test Rock
+    logicalName = mTest->getLogicalName( QString("Rock") );
+    QCOMPARE(logicalName, hbTrId("txt_mus_list_rock"));
 }
 
 // End of file