Pull request, Antti Holappa #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

GhostTree wants to merge 81 commits into SQATLab2015:master from GhostTree:dev

.besouro/20151008112510477/actions.txt

-Original file line number
+Diff line change
@@ -0,0 +1,12 @@
+    FileOpenedAction 1444292711120 TestCell.java 214 1 1 0
+    RefactoringAction 1444292726004 TestCell.java ADD void test_isCellAlive FIELD
+    RefactoringAction 1444292728532 TestCell.java RENAME test_isCellAlive=>void test_isCellAlive() METHOD
+    RefactoringAction 1444292748358 TestCell.java ADD void initialize() METHOD
+    RefactoringAction 1444292765074 TestCell.java RENAME initialize()=>void initializeCell() METHOD
+    RefactoringAction 1444292789152 TestCell.java ADD Cell testCell FIELD
+    RefactoringAction 1444292801622 TestCell.java ADD import org.unioulu.tol.sqatlab.gameoflife.Cell IMPORT
+    EditAction 1444292831199 TestCell.java 471 3 3 0
+    EditAction 1444292896339 TestCell.java 511 3 4 0
+    CompilationAction 1444292899037 TestCell.java
+    EditAction 1444292925605 TestCell.java 545 3 5 1
+    CompilationAction 1444292928441 TestCell.java

.besouro/20151008112510477/besouroEpisodes.txt

Empty file.

.besouro/20151008112510477/disagreements.txt

Empty file.

.besouro/20151008112510477/randomHeuristicEpisodes.txt

Empty file.

.besouro/20151008112510477/userComments.txt

Empty file.

.besouro/20151008112510477/zorroEpisodes.txt

Empty file.

.besouro/20151008114825807/actions.txt

Large diffs are not rendered by default.

.besouro/20151008114825807/besouroEpisodes.txt

-Original file line number
+Diff line change
@@ -0,0 +1,68 @@
+    1444294453653 test-first 1 347 true
+    1444294453654 test-last 1 347 false
+    1444294561630 test-first 1 96 true
+    1444294561631 test-first 1 96 true
+    1444295254363 refactoring 3 677 true
+    1444295254364 refactoring 3 677 true
+    1444295254365 refactoring 3 677 true
+    1444295254366 refactoring 3 677 true
+    1444295254367 refactoring 3 677 true
+    1444295254368 refactoring 3 677 true
+    1444295254369 refactoring 3 677 true
+    1444295254370 refactoring 3 677 true
+    1444295254371 refactoring 3 677 true
+    1444295254372 refactoring 3 677 true
+    1444295254373 refactoring 3 677 true
+    1444295254374 refactoring 3 677 true
+    1444295254375 refactoring 3 677 true
+    1444295254376 refactoring 3 677 true
+    1444295254377 refactoring 3 677 true
+    1444295254378 refactoring 3 677 true
+    1444295254379 refactoring 3 677 true
+    1444295254380 refactoring 3 677 true
+    1444295254381 refactoring 3 677 true
+    1444295254382 refactoring 3 677 true
+    1444295254383 refactoring 3 677 true
+    1444295254384 refactoring 3 677 true
+    1444295254385 refactoring 3 677 true
+    1444295254386 refactoring 3 677 true
+    1444295254387 refactoring 3 677 true
+    1444295254388 refactoring 3 677 true
+    1444295254389 refactoring 3 677 true
+    1444295254390 refactoring 3 677 true
+    1444295254391 refactoring 3 677 true
+    1444295254392 refactoring 3 677 true
+    1444295254393 refactoring 3 677 true
+    1444295254394 refactoring 3 677 true
+    1444295254395 refactoring 3 677 true
+    1444295254396 refactoring 3 677 true
+    1444295254397 refactoring 3 677 true
+    1444295254398 refactoring 3 677 true
+    1444295254399 refactoring 3 677 true
+    1444295254400 refactoring 3 677 true
+    1444295254401 refactoring 3 677 true
+    1444295254402 refactoring 3 677 true
+    1444295254403 refactoring 3 677 true
+    1444295254404 refactoring 3 677 true
+    1444295254405 refactoring 3 677 true
+    1444295254406 refactoring 3 677 true
+    1444295254407 refactoring 3 677 true
+    1444295254408 refactoring 3 677 true
+    1444295254409 refactoring 3 677 true
+    1444295254410 refactoring 3 677 true
+    1444295254411 refactoring 3 677 true
+    1444295254412 refactoring 3 677 true
+    1444295254413 refactoring 3 677 true
+    1444295254414 refactoring 3 677 true
+    1444295254415 refactoring 3 677 true
+    1444295254416 refactoring 3 677 true
+    1444295254417 refactoring 3 677 true
+    1444295254418 refactoring 3 677 true
+    1444295254419 refactoring 3 677 true
+    1444295254420 refactoring 3 677 true
+    1444295254421 refactoring 3 677 true
+    1444295254422 refactoring 3 677 true
+    1444295254423 refactoring 3 677 true
+    1444295254424 refactoring 3 677 true
+    1444295254425 refactoring 3 677 true
+    1444295254426 refactoring 3 677 true

.besouro/20151008114825807/disagreements.txt

Empty file.

.besouro/20151008114825807/randomHeuristicEpisodes.txt

-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    1444294453653 test-first 1 347 true
+    1444294561630 test-first 1 96 true
+    1444295254363 refactoring 3 677 true

.besouro/20151008114825807/userComments.txt

Empty file.

.besouro/20151008114825807/zorroEpisodes.txt

-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    1444294453653 test-first 1 347 true
+    1444294561630 test-first 1 107 true
+    1444295254363 refactoring 3 692 true

src/org/unioulu/tol/sqatlab/gameoflife/Cell.java

-Original file line number
+Diff line change
@@ -1,5 +1,28 @@
     package org.unioulu.tol.sqatlab.gameoflife;
     public class Cell {
+    	//Initially start with dead status
+    	private static String Life = "-";
+    	public Cell () {
+    		if ( Math.random() < 0.5 ) {
+    			Life = "-";
+    		} else {
+    			Life = "*";
+    		}
+    	}
+    	public String getStatus () {
+    		return Life;
+    	}
+    	public void setToAlive () {
+    		Life = "*";
+    	}
+    	public void setToDead () {
+    		Life = "-";
+    	}
     }

src/org/unioulu/tol/sqatlab/gameoflife/GameOfLife.java

-Original file line number
+Diff line change
@@ -1,5 +1,40 @@
     package org.unioulu.tol.sqatlab.gameoflife;
+    import java.util.Scanner;
     public class GameOfLife {
+    	private static Boolean running = true;
+    	private static Grid gameGrid;
+    	public static void main(String [] args) {
+    		while (running) {
+    			gameGrid = new Grid(50,50);
+    			int w = gameGrid.getWidth();
+    			int h = gameGrid.getHeight();
+    			//Turns out all cells in the grid are only * (alive) or - (dead)
+    			//Ran out of time for the excercises, so oh well.
+    			for (int i = 0; i < w; i++) {
+    				for (int b = 0; b < h; b++) {
+    					print(gameGrid.getCellStatus(i,b));
+    				}
+    				println("");
+    			}
+    			running = false;
+    		}
+    	}
+    	public static void println(String str) {
+    		System.out.println(str);
+    	}
+    	public static void print(String str) {
+    		System.out.print(str);
+    	}
     }

src/org/unioulu/tol/sqatlab/gameoflife/Grid.java

-Original file line number
+Diff line change
@@ -1,5 +1,45 @@
     package org.unioulu.tol.sqatlab.gameoflife;
+    import java.util.Arrays;
     public class Grid {
+    	private static Cell[][] gridArray = new Cell[1][1];
+    	public Grid() {
+    		// ...
+    	}
+    	public Grid(int width, int height) {
+    		gridArray = new Cell[width][height];
+    		int i = 0;
+    		while ( i < width) {
+    			Arrays.fill(gridArray[i], new Cell());
+    			i++;
+    		}
+    	}
+    	public String getSize () {
+    		String str = gridArray.length + "x" + gridArray[0].length;
+    		return str;
+    	}
+    	public int getWidth() {
+    		return gridArray.length;
+    	}
+    	public int getHeight() {
+    		return gridArray[0].length;
+    	}
+    	public Cell getCell (int x, int y) {
+    		return gridArray[x][y];
+    	}
+    	public String getCellStatus ( int x, int y ) {
+    		return getCell(x,y).getStatus();
+    	}
     }

src/org/unioulu/tol/sqatlab/gameoflife/test/TestCell.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,12 +3,56 @@ @@
     import static org.junit.Assert.*;
     import org.junit.Test;
+    import org.unioulu.tol.sqatlab.gameoflife.Cell;
     public class TestCell {
+    	private Cell testCell = new Cell();
+    	//Initialization function
+    	public void initializeCell() {
+    		testCell = new Cell();
+    	}
+    	@Test
+    	public void test_getCellStatus () {
+    		initializeCell();
+    		String r = testCell.getStatus();
+    		assertEquals( ((Object)r).getClass().getName(),  "java.lang.String" );
+    	}
+    	@Test
+    	public void test_setToAliveAndReturnStatus() {
+    		initializeCell();
+    		testCell.setToAlive();
+    		String r = testCell.getStatus();
+    		assertEquals ( r, "*" );
+    	}
+    	@Test
+    	public void test_setToAliveAndThenToDeadAndReturnStatus() {
+    		initializeCell();
+    		testCell.setToAlive();
+    		testCell.setToDead();
+    		String r = testCell.getStatus();
+    		assertEquals ( r, "-" );
+    	}
     	@Test
-    	public void test() {
-    		fail("Not yet implemented");
+    	//Test to make sure that the cell can get both dead and alive
+    	//status when it is created. Essentially, perform a while-
+    	//loop up until both statuses are recognized.
+    	public void test_randomCellStatusInitialization () {
+    		boolean dead  = false;
+    		boolean alive = false;
+    		while ( dead == false && alive == false ) {
+    			initializeCell();
+    			if (testCell.getStatus() == "*") {
+    				alive = true;
+    			} else {
+    				dead = true;
+    			}
+    		}
     	}
     }

src/org/unioulu/tol/sqatlab/gameoflife/test/TestGrid.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,12 +2,47 @@ @@
     import static org.junit.Assert.*;
     import org.junit.Test;
+    import org.unioulu.tol.sqatlab.gameoflife.Cell;
+    import org.unioulu.tol.sqatlab.gameoflife.Grid;
     public class TestGrid {
+    	private Grid testGrid = new Grid();
+    	//Initialization function
+    	public void initializeGrid ( int w, int h ) {
+    		testGrid = new Grid(w,h);
+    	}
     	@Test
-    	public void test() {
-    		fail("Not yet implemented");
+    	public void test_createA10By10Grid () {
+    		initializeGrid ( 10, 10 );
+    		String size = testGrid.getSize();
+    		assertEquals(size, "10x10");
     	}
+    	@Test
+    	public void test_createA50By43Grid () {
+    		initializeGrid ( 50, 43 );
+    		String size = testGrid.getSize();
+    		assertEquals(size, "50x43");
+    	}
+    	@Test
+    	public void test_getCellFromGrid () {
+    		initializeGrid ( 50, 50 );
+    		testGrid.getCell(10,10);
+    	}
+    	@Test
+    	public void test_getCellStatusFromGrid () {
+    		initializeGrid   ( 50, 50 );
+    		String str = testGrid.getCellStatus ( 20, 10 );
+    		if (str == "*" || str == "-") {
+    			assert(true);
+    		} else {
+    			fail("Life of a cell was not * or -.");
+    		}
+    	}
     }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Pull request, Antti Holappa #3

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Pull request, Antti Holappa #3

Are you sure you want to change the base?

Uh oh!

Pull request, Antti Holappa #3

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!