Moving bits into src/main and src/test. Reinstatement of actual test

workingness coming shortly.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@995 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
Michael Bayne
2010-11-18 05:01:16 +00:00
parent c2cddf5249
commit ec27a1122d
495 changed files with 39 additions and 27 deletions
@@ -1,9 +0,0 @@
<?xml version="1.0"?>
<!-- test spot scene parser -->
<scene name="Test Scene" version="42" defaultEntranceId="3">
<portal portalId="1" x="1" y="25" orient="3" name="East portal"
targetSceneName="East scene" targetPortalName="West portal"/>
<portal portalId="2" x="25" y="1" orient="5" name="North portal"
targetSceneName="North scene" targetPortalName="South portal"/>
</scene>
-8
View File
@@ -1,8 +0,0 @@
<?xml version="1.0"?>
<!-- test scene parser -->
<scene name="Test Scene" version="42">
<neighbor>Some neighbor</neighbor>
<neighbor>Some other neighbor</neighbor>
<neighbor>Yet another neighbor</neighbor>
</scene>
@@ -1,130 +0,0 @@
//
// $Id: TestClient.java 3381 2005-03-03 19:36:34Z mdb $
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2010 Three Rings Design, Inc., All Rights Reserved
// http://www.threerings.net/code/narya/
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published
// by the Free Software Foundation; either version 2.1 of the License, or
// (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
package com.threerings.parlor;
import com.threerings.util.Name;
import com.threerings.presents.client.Client;
import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.util.CrowdContext;
import com.threerings.parlor.client.Invitation;
import com.threerings.parlor.client.InvitationHandler;
import com.threerings.parlor.client.InvitationResponseObserver;
import com.threerings.parlor.client.ParlorDirector;
import com.threerings.parlor.game.data.GameConfig;
import com.threerings.parlor.util.ParlorContext;
import static com.threerings.parlor.Log.log;
public class TestClient extends com.threerings.crowd.client.TestClient
implements InvitationHandler, InvitationResponseObserver
{
public TestClient (String username)
{
super(username);
// create the handles on our various services
_pardtr = new ParlorDirector(_ctx);
// register ourselves as the invitation handler
_pardtr.setInvitationHandler(this);
}
@Override
public void clientDidLogon (Client client)
{
// we intentionally don't call super()
log.info("Client did logon [client=" + client + "].");
// get a casted reference to our body object
_body = (BodyObject)client.getClientObject();
// if we're the inviter, do some inviting
if (_body.username.equals("inviter")) {
// send the invitation
TestConfig config = new TestConfig();
_pardtr.invite(new Name("invitee"), config, this);
}
}
public void invitationReceived (Invitation invite)
{
log.info("Invitation received [invite=" + invite + "].");
// accept the invitation. we're game...
invite.accept();
}
public void invitationCancelled (Invitation invite)
{
log.info("Invitation cancelled [invite=" + invite + "].");
}
public void invitationAccepted (Invitation invite)
{
log.info("Invitation accepted [invite=" + invite + "].");
}
public void invitationRefused (Invitation invite, String message)
{
log.info("Invitation refused [invite=" + invite +
", message=" + message + "].");
}
public void invitationCountered (Invitation invite, GameConfig config)
{
log.info("Invitation countered [invite=" + invite +
", config=" + config + "].");
}
@Override
protected CrowdContext createContext ()
{
return (_ctx = new ParlorContextImpl());
}
public static void main (String[] args)
{
// create our test client
TestClient tclient = new TestClient(
System.getProperty("username", "test"));
// start it running
tclient.run();
}
protected class ParlorContextImpl
extends com.threerings.crowd.client.TestClient.CrowdContextImpl
implements ParlorContext
{
public ParlorDirector getParlorDirector ()
{
return _pardtr;
}
}
protected ParlorContext _ctx;
protected ParlorDirector _pardtr;
protected BodyObject _body;
}
@@ -1,70 +0,0 @@
//
// $Id: TestConfig.java 4193 2006-06-13 23:06:48Z ray $
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2010 Three Rings Design, Inc., All Rights Reserved
// http://www.threerings.net/code/narya/
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published
// by the Free Software Foundation; either version 2.1 of the License, or
// (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
package com.threerings.parlor;
import com.threerings.crowd.client.PlaceController;
import com.threerings.parlor.game.client.GameConfigurator;
import com.threerings.parlor.game.data.GameConfig;
public class TestConfig extends GameConfig
{
/** The foozle parameter. */
public int foozle;
@Override
public int getGameId ()
{
return 0;
}
@Override
public String getGameIdent ()
{
return "test";
}
@Override
public GameConfigurator createConfigurator ()
{
return null;
}
@Override
public PlaceController createController ()
{
return new TestController();
}
@Override
public String getManagerClassName ()
{
return "com.threerings.parlor.test.TestManager";
}
@Override
protected void toString (StringBuilder buf)
{
super.toString(buf);
buf.append(", foozle=").append(foozle);
}
}
@@ -1,37 +0,0 @@
//
// $Id: TestController.java 3440 2005-03-30 01:09:30Z mdb $
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2010 Three Rings Design, Inc., All Rights Reserved
// http://www.threerings.net/code/narya/
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published
// by the Free Software Foundation; either version 2.1 of the License, or
// (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
package com.threerings.parlor;
import com.threerings.crowd.client.PlaceView;
import com.threerings.crowd.util.CrowdContext;
import com.threerings.parlor.game.client.GameController;
public class TestController extends GameController
{
@Override
public PlaceView createPlaceView (CrowdContext ctx)
{
// nothing doing
return null;
}
}
@@ -1,29 +0,0 @@
//
// $Id: TestManager.java 3381 2005-03-03 19:36:34Z mdb $
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2010 Three Rings Design, Inc., All Rights Reserved
// http://www.threerings.net/code/narya/
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published
// by the Free Software Foundation; either version 2.1 of the License, or
// (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
package com.threerings.parlor;
import com.threerings.parlor.game.server.GameManager;
public class TestManager extends GameManager
{
// nothing doing
}
@@ -1,54 +0,0 @@
//
// $Id: TestServer.java 3099 2004-08-27 02:21:06Z mdb $
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2010 Three Rings Design, Inc., All Rights Reserved
// http://www.threerings.net/code/narya/
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published
// by the Free Software Foundation; either version 2.1 of the License, or
// (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
package com.threerings.parlor;
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.threerings.crowd.server.CrowdServer;
import com.threerings.parlor.server.ParlorManager;
import static com.threerings.parlor.Log.log;
/**
* A test server for the Parlor services.
*/
public class TestServer extends CrowdServer
{
/** Main entry point for test server. */
public static void main (String[] args)
{
Injector injector = Guice.createInjector(new Module());
TestServer server = injector.getInstance(TestServer.class);
try {
server.init(injector);
server.run();
} catch (Exception e) {
log.warning("Unable to initialize server.", e);
}
}
// we need the parlor manager injected to bootstrap its services
@Inject protected ParlorManager _parmgr;
}
@@ -1,82 +0,0 @@
//
// $Id: TestConfig.java 4193 2006-06-13 23:06:48Z ray $
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2010 Three Rings Design, Inc., All Rights Reserved
// http://www.threerings.net/code/narya/
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published
// by the Free Software Foundation; either version 2.1 of the License, or
// (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
package com.threerings.parlor.rating.util;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Random;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* Tests the {@link Percentiler} class.
*/
public class PercentilerTest
{
@Test public void testTiler ()
{
Percentiler tiler = createGaussian();
// check some basic stuff
assertTrue(tiler.getMinScore() < tiler.getMaxScore());
// dump the tiler
StringWriter out = new StringWriter();
tiler.dump(new PrintWriter(out));
String run1 = out.toString();
// serialize, unserialize and dump again
Percentiler t2 = new Percentiler(tiler.toBytes());
out = new StringWriter();
t2.dump(new PrintWriter(out));
String run2 = out.toString();
// should be equal
assertEquals(run1, run2);
}
@Test public void testGetPercentile ()
{
Percentiler tiler = createGaussian();
assertEquals(0, tiler.getPercentile(tiler.getMinScore()));
assertEquals(0, tiler.getPercentile(tiler.getMinScore()-1));
assertEquals(100, tiler.getPercentile(tiler.getMaxScore()));
assertEquals(100, tiler.getPercentile(tiler.getMaxScore()+1));
}
protected Percentiler createGaussian ()
{
// create a percentiler
Percentiler tiler = new Percentiler();
Random rando = new Random();
// add some random values
for (int ii = 0; ii < 500; ii++) {
tiler.recordValue((float)rando.nextGaussian() + 5.0f, false);
}
tiler.recomputePercentiles();
return tiler;
}
}
@@ -1,60 +0,0 @@
//
// $Id: DummyClientSceneRepository.java 3099 2004-08-27 02:21:06Z mdb $
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2010 Three Rings Design, Inc., All Rights Reserved
// http://www.threerings.net/code/narya/
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published
// by the Free Software Foundation; either version 2.1 of the License, or
// (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
package com.threerings.whirled;
import java.io.IOException;
import com.threerings.whirled.client.persist.SceneRepository;
import com.threerings.whirled.data.SceneModel;
import com.threerings.whirled.util.NoSuchSceneException;
import static com.threerings.whirled.Log.log;
/**
* The dummy scene repository just pretends to load and store scenes, but
* in fact it just creates new blank scenes when requested to load a scene
* and does nothing when requested to save one.
*/
public class DummyClientSceneRepository implements SceneRepository
{
// documentation inherited
public SceneModel loadSceneModel (int sceneId)
throws IOException, NoSuchSceneException
{
log.info("Creating dummy scene model [id=" + sceneId + "].");
return new SceneModel();
}
// documentation inherited
public void storeSceneModel (SceneModel model)
throws IOException
{
// nothing doing
}
// documentation inherited
public void deleteSceneModel (int sceneId)
throws IOException
{
// nothing doing
}
}
@@ -1,116 +0,0 @@
//
// $Id: TestClient.java 3355 2005-02-17 01:54:54Z mdb $
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2010 Three Rings Design, Inc., All Rights Reserved
// http://www.threerings.net/code/narya/
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published
// by the Free Software Foundation; either version 2.1 of the License, or
// (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
package com.threerings.whirled;
import com.threerings.presents.client.Client;
import com.threerings.crowd.client.LocationObserver;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.crowd.data.PlaceObject;
import com.threerings.crowd.util.CrowdContext;
import com.threerings.whirled.client.SceneDirector;
import com.threerings.whirled.client.persist.SceneRepository;
import com.threerings.whirled.data.Scene;
import com.threerings.whirled.data.SceneImpl;
import com.threerings.whirled.data.SceneModel;
import com.threerings.whirled.util.SceneFactory;
import com.threerings.whirled.util.WhirledContext;
import static com.threerings.crowd.Log.log;
public class TestClient extends com.threerings.crowd.client.TestClient
implements LocationObserver
{
public TestClient (String username)
{
super(username);
// create the handles for our various services
_screp = new DummyClientSceneRepository();
SceneFactory sfact = new SceneFactory() {
public Scene createScene (SceneModel model, PlaceConfig config) {
return new SceneImpl(model, config);
}
};
_scdir = new SceneDirector(_ctx, _locdir, _screp, sfact);
// we want to know about location changes
_locdir.addLocationObserver(this);
}
@Override
public void clientDidLogon (Client client)
{
// we specifically do not call super()
log.info("Client did logon [client=" + client + "].");
// request to move to scene 0
_ctx.getSceneDirector().moveTo(0);
}
public boolean locationMayChange (int placeId)
{
// we're easy
return true;
}
public void locationDidChange (PlaceObject place)
{
log.info("At new location [plobj=" + place + ", scene=" + _scdir.getScene() + "].");
}
public void locationChangeFailed (int placeId, String reason)
{
log.warning("Location change failed [plid=" + placeId + ", reason=" + reason + "].");
}
@Override
protected CrowdContext createContext ()
{
return (_ctx = new WhirledContextImpl());
}
public static void main (String[] args)
{
// create our test client
TestClient tclient = new TestClient("test");
// start it running
tclient.run();
}
protected class WhirledContextImpl
extends com.threerings.crowd.client.TestClient.CrowdContextImpl
implements WhirledContext
{
public SceneDirector getSceneDirector ()
{
return _scdir;
}
}
protected WhirledContext _ctx;
protected SceneDirector _scdir;
protected SceneRepository _screp;
}
@@ -1,42 +0,0 @@
//
// $Id: TestConfig.java 3099 2004-08-27 02:21:06Z mdb $
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2010 Three Rings Design, Inc., All Rights Reserved
// http://www.threerings.net/code/narya/
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published
// by the Free Software Foundation; either version 2.1 of the License, or
// (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
package com.threerings.whirled;
import com.threerings.crowd.client.PlaceController;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.whirled.server.SceneManager;
public class TestConfig extends PlaceConfig
{
@Override
public PlaceController createController ()
{
return new TestController();
}
@Override
public String getManagerClassName ()
{
return SceneManager.class.getName();
}
}
@@ -1,36 +0,0 @@
//
// $Id: TestController.java 3440 2005-03-30 01:09:30Z mdb $
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2010 Three Rings Design, Inc., All Rights Reserved
// http://www.threerings.net/code/narya/
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published
// by the Free Software Foundation; either version 2.1 of the License, or
// (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
package com.threerings.whirled;
import com.threerings.crowd.client.PlaceController;
import com.threerings.crowd.client.PlaceView;
import com.threerings.crowd.util.CrowdContext;
public class TestController extends PlaceController
{
@Override
protected PlaceView createPlaceView (CrowdContext ctx)
{
// nothing doing
return null;
}
}
@@ -1,76 +0,0 @@
//
// $Id: SpotSceneParserTest.java 4143 2006-05-23 23:22:20Z ray $
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2010 Three Rings Design, Inc., All Rights Reserved
// http://www.threerings.net/code/narya/
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published
// by the Free Software Foundation; either version 2.1 of the License, or
// (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
package com.threerings.whirled.spot.tools.xml;
import junit.framework.Test;
import junit.framework.TestCase;
import com.samskivert.test.TestUtil;
import com.threerings.whirled.data.SceneModel;
import com.threerings.whirled.spot.data.Location;
import com.threerings.whirled.tools.xml.SceneParser;
import com.threerings.stage.data.StageLocation;
public class SpotSceneParserTest extends TestCase
{
public SpotSceneParserTest ()
{
super(SpotSceneParserTest.class.getName());
}
@Override
public void runTest ()
{
try {
SceneParser parser = new SceneParser("scene");
parser.registerAuxRuleSet(new SpotSceneRuleSet() {
@Override
protected Location createLocation () {
return new StageLocation(); // breaks package, but ok
}
});
String tspath = TestUtil.getResourcePath(TEST_SCENE_PATH);
SceneModel scene = parser.parseScene(tspath);
System.out.println("Parsed " + scene + ".");
} catch (Exception e) {
e.printStackTrace();
fail("Test threw exception");
}
}
public static Test suite ()
{
return new SpotSceneParserTest();
}
public static void main (String[] args)
{
SpotSceneParserTest test = new SpotSceneParserTest();
test.runTest();
}
protected static final String TEST_SCENE_PATH =
"rsrc/whirled/spot/tools/xml/scene.xml";
}
@@ -1,66 +0,0 @@
//
// $Id: SceneParserTest.java 3099 2004-08-27 02:21:06Z mdb $
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2010 Three Rings Design, Inc., All Rights Reserved
// http://www.threerings.net/code/narya/
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published
// by the Free Software Foundation; either version 2.1 of the License, or
// (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
package com.threerings.whirled.tools.xml;
import junit.framework.Test;
import junit.framework.TestCase;
import com.samskivert.test.TestUtil;
import com.threerings.whirled.data.SceneModel;
public class SceneParserTest extends TestCase
{
public SceneParserTest ()
{
super(SceneParserTest.class.getName());
}
@Override
public void runTest ()
{
try {
SceneParser parser = new SceneParser("scene");
String tspath = TestUtil.getResourcePath(TEST_SCENE_PATH);
SceneModel scene = parser.parseScene(tspath);
System.out.println("Parsed " + scene + ".");
} catch (Exception e) {
e.printStackTrace();
fail("Test threw exception");
}
}
public static Test suite ()
{
return new SceneParserTest();
}
public static void main (String[] args)
{
SceneParserTest test = new SceneParserTest();
test.runTest();
}
protected static final String TEST_SCENE_PATH =
"rsrc/whirled/tools/xml/scene.xml";
}