kotlin-yairm210-unciv-small-change

Before1package com.unciv.logic.civilization.managers
2
3import com.badlogic.gdx.math.Vector2
4import com.unciv.testing.GdxTestRunner
5import com.unciv.testing.TestGame
6import org.junit.Assert.assertEquals
7import org.junit.Assert.assertTrue
8import org.junit.Before
9import org.junit.Test
10import org.junit.runner.RunWith
…lines 11–117 unchanged (107 lines)
118    }
119
120    @Test
121    fun `should increase golden age cost with more cities`() {
122        // given
123        testGame.makeHexagonalMap(1)
124        testGame.addCity(civ, testGame.getTile(Vector2.Zero), initialPopulation = 10)
125        val happinessRequiredForGoldenAgeOneCity = goldenAgeManager.happinessRequiredForNextGoldenAge()
126
127        // when
128        testGame.addCity(civ, testGame.getTile(Vector2.X), initialPopulation = 10)
129
130        // then
131        val happinessRequiredForGoldenAgeTwoCities = goldenAgeManager.happinessRequiredForNextGoldenAge()
132        assertTrue(happinessRequiredForGoldenAgeOneCity < happinessRequiredForGoldenAgeTwoCities)
133    }
134
…lines 135–148 unchanged (14 lines)

After1package com.unciv.logic.civilization.managers
2
3import com.badlogic.gdx.math.Vector2
4import com.unciv.logic.map.HexCoord
5import com.unciv.testing.GdxTestRunner
6import com.unciv.testing.TestGame
7import org.junit.Assert.assertEquals
8import org.junit.Assert.assertTrue
9import org.junit.Before
10import org.junit.Test
…lines 11–118 unchanged (108 lines)
119    }
120
121    @Test
122    fun `should increase golden age cost with more cities`() {
123        // given
124        testGame.makeHexagonalMap(1)
125        testGame.addCity(civ, testGame.getTile(HexCoord.Zero), initialPopulation = 10)
126        val happinessRequiredForGoldenAgeOneCity = goldenAgeManager.happinessRequiredForNextGoldenAge()
127
128        // when
129        testGame.addCity(civ, testGame.getTile(1,0), initialPopulation = 10)
130
131        // then
132        val happinessRequiredForGoldenAgeTwoCities = goldenAgeManager.happinessRequiredForNextGoldenAge()
133        assertTrue(happinessRequiredForGoldenAgeOneCity < happinessRequiredForGoldenAgeTwoCities)
134    }
135
…lines 136–149 unchanged (14 lines)

Before

source_file

package_header

package "package"

qualified_identifier

identifier "com"

. "."

identifier "unciv"

. "."

identifier "logic"

. "."

identifier "civilization"

. "."

identifier "managers"

import

import "import"

qualified_identifier

identifier "com"

. "."

identifier "badlogic"

. "."

identifier "gdx"

. "."

identifier "math"

. "."

identifier "Vector2"

import

import "import"

qualified_identifier

identifier "com"

. "."

identifier "unciv"

. "."

identifier "testing"

. "."

identifier "GdxTestRunner"

import

import "import"

qualified_identifier

identifier "com"

. "."

identifier "unciv"

. "."

identifier "testing"

. "."

identifier "TestGame"

import

import "import"

qualified_identifier

identifier "org"

. "."

identifier "junit"

. "."

identifier "Assert"

. "."

identifier "assertEquals"

import

import "import"

qualified_identifier

identifier "org"

. "."

identifier "junit"

. "."

identifier "Assert"

. "."

identifier "assertTrue"

import

import "import"

qualified_identifier

identifier "org"

. "."

identifier "junit"

. "."

identifier "Before"

import

import "import"

qualified_identifier

identifier "org"

. "."

identifier "junit"

. "."

identifier "Test"

import

import "import"

qualified_identifier

identifier "org"

. "."

identifier "junit"

. "."

identifier "runner"

. "."

identifier "RunWith"

class_declaration

modifiers

annotation

@ "@"

constructor_invocation

user_type

identifier "RunWith"

value_arguments

( "("

value_argument

navigation_expression

identifier "GdxTestRunner"

:: "::"

identifier "class"

) ")"

class "class"

identifier "GoldenAgeManagerTest"

class_body

{ "{"

property_declaration

val "val"

variable_declaration

identifier "testGame"

= "="

call_expression

identifier "TestGame"

value_arguments

( "("

) ")"

property_declaration

val "val"

variable_declaration

identifier "civ"

= "="

call_expression

navigation_expression

identifier "testGame"

. "."

identifier "addCiv"

value_arguments

( "("

) ")"

property_declaration

val "val"

variable_declaration

identifier "goldenAgeManager"

= "="

call_expression

identifier "GoldenAgeManager"

value_arguments

( "("

) ")"

function_declaration (+22 nodes collapsed)

function_declaration (+40 nodes collapsed)

function_declaration (+50 nodes collapsed)

function_declaration (+56 nodes collapsed)

function_declaration (+51 nodes collapsed)

function_declaration (+49 nodes collapsed)

function_declaration (+65 nodes collapsed)

function_declaration (+68 nodes collapsed)

function_declaration

modifiers

annotation

@ "@"

user_type

identifier "Test"

fun "fun"

identifier "`should increase golden age cost with more cities`"

function_value_parameters

( "("

) ")"

function_body

block

{ "{"

line_comment "// given"

call_expression

navigation_expression

identifier "testGame"

. "."

identifier "makeHexagonalMap"

value_arguments

( "("

value_argument

number_literal "1"

) ")"

call_expression

navigation_expression

identifier "testGame"

. "."

identifier "addCity"

value_arguments

( "("

value_argument

identifier "civ"

, ","

value_argument

call_expression

navigation_expression

identifier "testGame"

. "."

identifier "getTile"

value_arguments

( "("

value_argument

navigation_expression

identifier "Vector2"

. "."

identifier "Zero"

) ")"

, ","

value_argument

identifier "initialPopulation"

= "="

number_literal "10"

) ")"

property_declaration

val "val"

variable_declaration

identifier "happinessRequiredForGoldenAgeOneCity"

= "="

call_expression

navigation_expression

identifier "goldenAgeManager"

. "."

identifier "happinessRequiredForNextGoldenAge"

value_arguments

( "("

) ")"

line_comment "// when"

call_expression

navigation_expression

identifier "testGame"

. "."

identifier "addCity"

value_arguments

( "("

value_argument

identifier "civ"

, ","

value_argument

call_expression

navigation_expression

identifier "testGame"

. "."

identifier "getTile"

value_arguments

( "("

value_argument

navigation_expression

identifier "Vector2"

. "."

identifier "X"

) ")"

, ","

value_argument

identifier "initialPopulation"

= "="

number_literal "10"

) ")"

line_comment "// then"

property_declaration

val "val"

variable_declaration

identifier "happinessRequiredForGoldenAgeTwoCities"

= "="

call_expression

navigation_expression

identifier "goldenAgeManager"

. "."

identifier "happinessRequiredForNextGoldenAge"

value_arguments

( "("

) ")"

call_expression

identifier "assertTrue"

value_arguments

( "("

value_argument

binary_expression

identifier "happinessRequiredForGoldenAgeOneCity"

< "<"

identifier "happinessRequiredForGoldenAgeTwoCities"

) ")"

} "}"

function_declaration (+66 nodes collapsed)

} "}"

After

source_file

package_header

package "package"

qualified_identifier

identifier "com"

. "."

identifier "unciv"

. "."

identifier "logic"

. "."

identifier "civilization"

. "."

identifier "managers"

import

import "import"

qualified_identifier

identifier "com"

. "."

identifier "badlogic"

. "."

identifier "gdx"

. "."

identifier "math"

. "."

identifier "Vector2"

import

import "import"

qualified_identifier

identifier "com"

. "."

identifier "unciv"

. "."

identifier "logic"

. "."

identifier "map"

. "."

identifier "HexCoord"

import

import "import"

qualified_identifier

identifier "com"

. "."

identifier "unciv"

. "."

identifier "testing"

. "."

identifier "GdxTestRunner"

import

import "import"

qualified_identifier

identifier "com"

. "."

identifier "unciv"

. "."

identifier "testing"

. "."

identifier "TestGame"

import

import "import"

qualified_identifier

identifier "org"

. "."

identifier "junit"

. "."

identifier "Assert"

. "."

identifier "assertEquals"

import

import "import"

qualified_identifier

identifier "org"

. "."

identifier "junit"

. "."

identifier "Assert"

. "."

identifier "assertTrue"

import

import "import"

qualified_identifier

identifier "org"

. "."

identifier "junit"

. "."

identifier "Before"

import

import "import"

qualified_identifier

identifier "org"

. "."

identifier "junit"

. "."

identifier "Test"

import

import "import"

qualified_identifier

identifier "org"

. "."

identifier "junit"

. "."

identifier "runner"

. "."

identifier "RunWith"

class_declaration

modifiers

annotation

@ "@"

constructor_invocation

user_type

identifier "RunWith"

value_arguments

( "("

value_argument

navigation_expression

identifier "GdxTestRunner"

:: "::"

identifier "class"

) ")"

class "class"

identifier "GoldenAgeManagerTest"

class_body

{ "{"

property_declaration

val "val"

variable_declaration

identifier "testGame"

= "="

call_expression

identifier "TestGame"

value_arguments

( "("

) ")"

property_declaration

val "val"

variable_declaration

identifier "civ"

= "="

call_expression

navigation_expression

identifier "testGame"

. "."

identifier "addCiv"

value_arguments

( "("

) ")"

property_declaration

val "val"

variable_declaration

identifier "goldenAgeManager"

= "="

call_expression

identifier "GoldenAgeManager"

value_arguments

( "("

) ")"

function_declaration (+22 nodes collapsed)

function_declaration (+40 nodes collapsed)

function_declaration (+50 nodes collapsed)

function_declaration (+56 nodes collapsed)

function_declaration (+51 nodes collapsed)

function_declaration (+49 nodes collapsed)

function_declaration (+65 nodes collapsed)

function_declaration (+68 nodes collapsed)

function_declaration

modifiers

annotation

@ "@"

user_type

identifier "Test"

fun "fun"

identifier "`should increase golden age cost with more cities`"

function_value_parameters

( "("

) ")"

function_body

block

{ "{"

line_comment "// given"

call_expression

navigation_expression

identifier "testGame"

. "."

identifier "makeHexagonalMap"

value_arguments

( "("

value_argument

number_literal "1"

) ")"

call_expression

navigation_expression

identifier "testGame"

. "."

identifier "addCity"

value_arguments

( "("

value_argument

identifier "civ"

, ","

value_argument

call_expression

navigation_expression

identifier "testGame"

. "."

identifier "getTile"

value_arguments

( "("

value_argument

navigation_expression

identifier "HexCoord"

. "."

identifier "Zero"

) ")"

, ","

value_argument

identifier "initialPopulation"

= "="

number_literal "10"

) ")"

property_declaration

val "val"

variable_declaration

identifier "happinessRequiredForGoldenAgeOneCity"

= "="

call_expression

navigation_expression

identifier "goldenAgeManager"

. "."

identifier "happinessRequiredForNextGoldenAge"

value_arguments

( "("

) ")"

line_comment "// when"

call_expression

navigation_expression

identifier "testGame"

. "."

identifier "addCity"

value_arguments

( "("

value_argument

identifier "civ"

, ","

value_argument

call_expression

navigation_expression

identifier "testGame"

. "."

identifier "getTile"

value_arguments

( "("

value_argument

number_literal "1"

, ","

value_argument

number_literal "0"

) ")"

, ","

value_argument

identifier "initialPopulation"

= "="

number_literal "10"

) ")"

line_comment "// then"

property_declaration

val "val"

variable_declaration

identifier "happinessRequiredForGoldenAgeTwoCities"

= "="

call_expression

navigation_expression

identifier "goldenAgeManager"

. "."

identifier "happinessRequiredForNextGoldenAge"

value_arguments

( "("

) ")"

call_expression

identifier "assertTrue"

value_arguments

( "("

value_argument

binary_expression

identifier "happinessRequiredForGoldenAgeOneCity"

< "<"

identifier "happinessRequiredForGoldenAgeTwoCities"

) ")"

} "}"

function_declaration (+66 nodes collapsed)

} "}"