Skip to content

Commit 81ae988

Browse files
EliasVahlbergEliasVahlberg
committed
FINAL
1 parent 3aafad6 commit 81ae988

34 files changed

+1296
-526
lines changed

‎AOOP_Project.iml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,8 @@
77
<sourceFolder url="file://$MODULE_DIR$/src/evhh/Testing" isTestSource="true" />
88
<sourceFolder url="file://$MODULE_DIR$/Assets" type="java-test-resource" />
99
<sourceFolder url="file://$MODULE_DIR$/SavedData" type="java-test-resource" />
10-
<sourceFolder url="file://$MODULE_DIR$/src/evhh/Testing/JUnit" isTestSource="true" />
11-
<sourceFolder url="file://$MODULE_DIR$/src/evhh/Testing/TestAssets" type="java-test-resource" />
12-
<sourceFolder url="file://$MODULE_DIR$/src/evhh/Testing/evhh" isTestSource="true" />
13-
<sourceFolder url="file://$MODULE_DIR$/src/evhh/Testing/evhh/model" isTestSource="true" />
14-
<sourceFolder url="file://$MODULE_DIR$/src/evhh/Testing/functional" isTestSource="true" />
15-
<sourceFolder url="file://$MODULE_DIR$/src/evhh/Testing/functional/testingcomponents" isTestSource="true" />
16-
<sourceFolder url="file://$MODULE_DIR$/src/evhh/Testing/functional/testingprefabs" isTestSource="true" />
10+
<sourceFolder url="file://$MODULE_DIR$/Testing" isTestSource="true" />
11+
<sourceFolder url="file://$MODULE_DIR$/Testing/TestAssets" type="java-test-resource" />
1712
</content>
1813
<orderEntry type="inheritedJdk" />
1914
<orderEntry type="sourceFolder" forTests="false" />

‎Test Results - GameInstanceTest_(2).html‎

Lines changed: 723 additions & 0 deletions
Large diffs are not rendered by default.

‎src/evhh/Testing/evhh/model/GameInstanceTest.java‎ renamed to ‎Testing/JUnit/GameInstanceTest.java‎

Lines changed: 231 additions & 134 deletions
Large diffs are not rendered by default.

‎src/evhh/Testing/TestAssets/img1.png‎ renamed to ‎Testing/TestAssets/img1.png‎

File renamed without changes.

‎src/evhh/Testing/TestAssets/img2.png‎ renamed to ‎Testing/TestAssets/img2.png‎

File renamed without changes.

‎src/evhh/Testing/TestAssets/img3.png‎ renamed to ‎Testing/TestAssets/img3.png‎

File renamed without changes.

‎src/evhh/Testing/functional/BaseFunctionalityTest.java‎ renamed to ‎Testing/functional/BaseFunctionalityTest.java‎

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class BaseFunctionalityTest
3131
public static final int DEFAULT_GRID_WIDTH = 16;
3232
public static final int DEFAULT_GRID_HEIGHT = 16;
3333
public static final int DEFAULT_CELL_SIZE = 32;
34-
public static final String GRID_SAVE_PATH = System.getProperty("user.dir")+"\\SavedData\\grid1.ser";
34+
public static final String GRID_SAVE_PATH = System.getProperty("user.dir") + "\\SavedData\\grid1.ser";
3535

3636
public static GameObject soundObject;
3737

@@ -40,29 +40,31 @@ public static void main(String[] args)
4040
GameInstance game1 = new GameInstance("Game1");
4141
FrameRenderer frameRenderer = new FrameRenderer(
4242
new GameFrame(
43-
DEFAULT_GRID_WIDTH*DEFAULT_CELL_SIZE,
44-
DEFAULT_GRID_WIDTH*DEFAULT_CELL_SIZE,
43+
DEFAULT_GRID_WIDTH * DEFAULT_CELL_SIZE,
44+
DEFAULT_GRID_WIDTH * DEFAULT_CELL_SIZE,
4545
game1.getGameInstanceName()),
46-
DEFAULT_GRID_WIDTH,
47-
DEFAULT_GRID_HEIGHT,
48-
DEFAULT_CELL_SIZE);
46+
DEFAULT_GRID_WIDTH,
47+
DEFAULT_GRID_HEIGHT,
48+
DEFAULT_CELL_SIZE);
4949
game1.setFrameRenderer(frameRenderer);
5050
game1.addRendererTimer(100);
51-
game1.loadTextureAssets(System.getProperty("user.dir")+"\\Assets\\Images");
51+
game1.loadTextureAssets(System.getProperty("user.dir") + "\\Assets\\Images");
5252
game1.setUpdateTimer(100);
5353

5454
/*********/
5555
boolean loadingSave;
5656
int reply = JOptionPane.showConfirmDialog(null, "Do you want to load saved grid?", "Load Save", JOptionPane.YES_NO_OPTION);
57-
if (reply == JOptionPane.YES_OPTION) {
57+
if (reply == JOptionPane.YES_OPTION)
58+
{
5859
JOptionPane.showMessageDialog(null, "Loading saved grid");
5960
loadingSave = true;
60-
} else {
61+
} else
62+
{
6163
JOptionPane.showMessageDialog(null, "Creating new Grid");
6264
loadingSave = false;
6365
}
6466
/*********/
65-
if(loadingSave)
67+
if (loadingSave)
6668
{
6769
try
6870
{
@@ -72,11 +74,10 @@ public static void main(String[] args)
7274
System.err.println(e);
7375
createTestInstance(game1);
7476
}
75-
}
76-
else
77+
} else
7778
{
7879
createTestInstance(game1);
79-
saveGameWithDelay(5000,game1);
80+
saveGameWithDelay(5000, game1);
8081
}
8182

8283

@@ -87,33 +88,34 @@ public static void main(String[] args)
8788

8889
game1.start();
8990
game1.refreshSpritesInRenderer();
90-
((AudioComponent)soundObject.getComponent(AudioComponent.class)).play(0);
91+
((AudioComponent) soundObject.getComponent(AudioComponent.class)).play(0);
9192
}
9293

9394

9495
public static void createTestInstance(GameInstance game1)
9596
{
9697
game1.setUserInputManager(new UserInputManager(game1));
9798
game1.setMainGrid(new Grid(DEFAULT_GRID_WIDTH, DEFAULT_GRID_HEIGHT));
98-
WallPrefab wallPrefab = new WallPrefab(game1.getTexture("wall"), "wall",100);
99-
MovingSquare movingSquare = new MovingSquare( game1.getTexture("blank"), "blank", 120,500);
99+
WallPrefab wallPrefab = new WallPrefab(game1.getTexture("wall"), "wall", 100);
100+
MovingSquare movingSquare = new MovingSquare(game1.getTexture("blank"), "blank", 120, 500);
100101

101102
for (int i = 5; i < 14; i++)
102-
game1.addGameObject(wallPrefab.getInstance(game1.getMainGrid(),i, i), i, i);
103+
game1.addGameObject(wallPrefab.getInstance(game1.getMainGrid(), i, i), i, i);
103104

104-
game1.addGameObject(movingSquare.getInstance(game1.getMainGrid(),1, 1), 1, 1);
105+
game1.addGameObject(movingSquare.getInstance(game1.getMainGrid(), 1, 1), 1, 1);
105106
movingSquare.setDeltaTime(400);
106-
game1.addGameObject(movingSquare.getInstance(game1.getMainGrid(),2, 2), 2, 2);
107+
game1.addGameObject(movingSquare.getInstance(game1.getMainGrid(), 2, 2), 2, 2);
107108
movingSquare.setDeltaTime(300);
108-
game1.addGameObject(movingSquare.getInstance(game1.getMainGrid(),3, 3), 3, 3);
109-
TestPlayerPrefab playerPrefab = new TestPlayerPrefab(game1.getTexture("player"), "player", 150,game1.getUserInputManager());
110-
game1.addGameObject(playerPrefab.getInstance(game1.getMainGrid(),15, 15), 15, 15);
111-
soundObject = new GameObject(game1.getMainGrid(),false,13,13);
109+
game1.addGameObject(movingSquare.getInstance(game1.getMainGrid(), 3, 3), 3, 3);
110+
TestPlayerPrefab playerPrefab = new TestPlayerPrefab(game1.getTexture("player"), "player", 150, game1.getUserInputManager());
111+
game1.addGameObject(playerPrefab.getInstance(game1.getMainGrid(), 15, 15), 15, 15);
112+
soundObject = new GameObject(game1.getMainGrid(), false, 13, 13);
112113
game1.getFrameRenderer().setAudioListener(new AudioListener());
113-
File[] audioFiles= new File[1];
114+
File[] audioFiles = new File[1];
114115
audioFiles[0] = new File(System.getProperty("user.dir") + "/Assets/Music/MOOSIK.wav");
115-
soundObject.addComponent(new AudioComponent(soundObject,game1.getFrameRenderer().getAudioListener(),audioFiles));
116+
soundObject.addComponent(new AudioComponent(soundObject, game1.getFrameRenderer().getAudioListener(), audioFiles));
116117
}
118+
117119
public static void saveGameWithDelay(int delay, GameInstance game1)
118120
{
119121
TimerTask timerTask = new TimerTask()
@@ -135,7 +137,7 @@ public void run()
135137
};
136138

137139
Timer timer = new Timer();
138-
timer.schedule(timerTask,delay);
140+
timer.schedule(timerTask, delay);
139141
}
140142

141143
}

‎src/evhh/Testing/functional/ExtendedMapEditorTest.java‎ renamed to ‎Testing/functional/ExtendedMapEditorTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ public class ExtendedMapEditorTest
2323

2424
public static void main(String[] args)
2525
{
26-
Grid grid1 = new Grid(16,16);
26+
Grid grid1 = new Grid(16, 16);
2727

28-
HashMap<String, BufferedImage> map = AssetLoader.LoadImageAssets(System.getProperty("user.dir")+"\\Assets\\Images", new String[]{".png",".jpg"});
28+
HashMap<String, BufferedImage> map = AssetLoader.LoadImageAssets(System.getProperty("user.dir") + "\\Assets\\Images", new String[]{".png", ".jpg"});
2929
System.out.println(map);
3030

31-
WallPrefab wallPrefab = new WallPrefab(map.get("wall"), "wall",210);
32-
MovingSquare movingSquare = new MovingSquare(map.get("blank"), "blank",220 ,500);
33-
MovingSquare movingSquare2 = new MovingSquare(map.get("blankmarked"), "blankmarked",230, 400);
34-
MovingSquare movingSquare3 = new MovingSquare(map.get("player"), "player", 240,300);
35-
MovingSquare movingSquare4 = new MovingSquare(map.get("specialcrate"), "specialcrate",250, 200);
31+
WallPrefab wallPrefab = new WallPrefab(map.get("wall"), "wall", 210);
32+
MovingSquare movingSquare = new MovingSquare(map.get("blank"), "blank", 220, 500);
33+
MovingSquare movingSquare2 = new MovingSquare(map.get("blankmarked"), "blankmarked", 230, 400);
34+
MovingSquare movingSquare3 = new MovingSquare(map.get("player"), "player", 240, 300);
35+
MovingSquare movingSquare4 = new MovingSquare(map.get("specialcrate"), "specialcrate", 250, 200);
3636

37-
ObjectPrefab[] prefabs = {wallPrefab,movingSquare,movingSquare2 ,movingSquare3,movingSquare4,};
38-
MapEditor mapEditor = new MapEditor(grid1,32,prefabs);
37+
ObjectPrefab[] prefabs = {wallPrefab, movingSquare, movingSquare2, movingSquare3, movingSquare4,};
38+
MapEditor mapEditor = new MapEditor(grid1, 32, prefabs);
3939

4040
}
4141
}

‎src/evhh/Testing/functional/testingcomponents/SimpleMove.java‎ renamed to ‎Testing/functional/testingcomponents/SimpleMove.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
package functional.testingcomponents;
2+
23
import evhh.common.TimeReference;
34
import evhh.model.GameComponent;
45
import evhh.model.GameObject;
@@ -24,46 +25,45 @@ public SimpleMove(GameObject parent, long deltaTime)
2425
}
2526

2627

27-
2828
/**
29-
@precondition deltaTime!=0
29+
* @precondition deltaTime!=0
3030
*/
3131
public void move()
3232
{
3333
//Since it is transient
34-
if(timeReference ==null)
34+
if (timeReference == null)
3535
timeReference = new TimeReference();
36-
assert deltaTime!=0 : "Division by 0";
37-
long n = timeReference.getDeltaTime() / deltaTime;
38-
timeReference.incrementStartTime(n*deltaTime);
36+
assert deltaTime != 0 : "Division by 0";
37+
long n = timeReference.getDeltaTime() / deltaTime;
38+
timeReference.incrementStartTime(n * deltaTime);
3939
for (int i = 0; i < n; i++)
4040
{
4141
int w = getGameObject().getGrid().getGridWidth();
42-
if(parent.getGrid().isEmpty((getX()+1)%w, getY()))
43-
getGameObject().setPosition((getX()+1)%w, getY());
42+
if (parent.getGrid().isEmpty((getX() + 1) % w, getY()))
43+
getGameObject().setPosition((getX() + 1) % w, getY());
4444
}
4545
}
4646

4747
@Override
4848
public void onStart()
4949
{
50-
if(timeReference ==null)
50+
if (timeReference == null)
5151
timeReference = new TimeReference();
5252
timeReference.start();
5353
}
5454

5555
@Override
5656
public void update()
5757
{
58-
if(timeReference ==null)
58+
if (timeReference == null)
5959
timeReference = new TimeReference();
6060
move();
6161
}
6262

6363
@Override
6464
public void onExit()
6565
{
66-
if(timeReference ==null)
66+
if (timeReference == null)
6767
timeReference = new TimeReference();
6868

6969
}

‎src/evhh/Testing/functional/testingcomponents/TestComponent.java‎ renamed to ‎Testing/functional/testingcomponents/TestComponent.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* @date: 2021-05-27
1212
* @time: 11:35
1313
**********************************************************************************************************************/
14-
public class TestComponent extends GameComponent
14+
public class TestComponent extends GameComponent
1515
{
1616

1717
public boolean ranStart = true;

0 commit comments

Comments
 (0)