package uk.org.ngo.squeezer.test.server;

import android.os.RemoteException;
import uk.org.ngo.squeezer.IServiceCallback;

public class ServiceCallbackTest extends IServiceCallback.Stub {
    int onPlayerChanged;
    String currentPlayerId;
    String currentPlayerName;
    int onConnectionChanged;
    boolean isConnected;
    boolean isPostConnect;
    boolean isLoginFailed;

    @Override
    public void onPlayerChanged(String playerId, String playerName) throws RemoteException {
        onPlayerChanged++;
        currentPlayerId = playerId;
        currentPlayerName = playerName;
    }

    @Override
    public void onConnectionChanged(boolean isConnected, boolean postConnect, boolean loginFailed) throws RemoteException {
        onConnectionChanged++;
        this.isConnected = isConnected;
        isPostConnect = postConnect;
        isLoginFailed = loginFailed;
    }

    @Override
    public void onPlayStatusChanged(String playStatus) throws RemoteException {
        // TODO Auto-generated method stub
    }

    @Override
    public void onShuffleStatusChanged(int shuffleStatus) throws RemoteException {
        // TODO Auto-generated method stub
    }

    @Override
    public void onRepeatStatusChanged(int repeatStatus) throws RemoteException {
        // TODO Auto-generated method stub
    }

    @Override
    public void onTimeInSongChange(int secondsIn, int secondsTotal) throws RemoteException {
        // TODO Auto-generated method stub
    }

    @Override
    public void onPowerStatusChanged(boolean canPowerOn, boolean canPowerOff)
            throws RemoteException {
        // TODO Auto-generated method stub
    }

}

@@ -114,16 +114,65 @@
 allback;
+%0Aimport uk.org.ngo.squeezer.model.SqueezerPlayer;
 %0A%0Apublic
@@ -264,41 +264,21 @@
    S
-tring currentPlayerId;%0A    String
+queezerPlayer
  cur
@@ -283,28 +283,24 @@
 urrentPlayer
-Name
 ;%0A    int on
@@ -398,16 +398,17 @@
 ailed;%0A%0A
+%0A
     @Ove
@@ -450,41 +450,28 @@
 ed(S
-tring playerId, String
+queezerPlayer
  player
-Name
 ) th
@@ -541,18 +541,16 @@
 ntPlayer
-Id
  = playe
@@ -554,50 +554,8 @@
 ayer
-Id;%0A        currentPlayerName = playerName
 ;%0A  
@@ -1042,24 +1042,41 @@
 atusChanged(
+boolean initial, 
 int shuffleS
@@ -1209,16 +1209,33 @@
 Changed(
+boolean initial, 
 int repe

Fix broken tests Signed-off-by: Kurt Aaholst <kaaholst@gmail.com>