Skip to content
This repository was archived by the owner on Aug 17, 2019. It is now read-only.

Commit e050409

Browse files
committed
Remove runmode stuff (for now?)
1 parent 4d766a0 commit e050409

File tree

5 files changed

+0
-323
lines changed

5 files changed

+0
-323
lines changed

src/main/scala/com/ckkloverdos/runmode/FixedRunModeContext.scala

-25
This file was deleted.

src/main/scala/com/ckkloverdos/runmode/RunMode.scala

-154
This file was deleted.

src/main/scala/com/ckkloverdos/runmode/RunModeContext.scala

-30
This file was deleted.

src/main/scala/com/ckkloverdos/runmode/StandardRunModeContext.scala

-37
This file was deleted.

src/test/scala/com/ckkloverdos/resource/ResourceTest.scala

-77
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package com.ckkloverdos.resource
1818

1919
import org.junit.Assert
2020
import org.junit.Test
21-
import com.ckkloverdos.runmode.{StageMode, RunMode, TestMode, StandardRunModeContext}
2221
import com.ckkloverdos.props.Props
2322
import com.ckkloverdos.maybe.Just
2423
import com.ckkloverdos.convert.Converters
@@ -47,8 +46,6 @@ class ResourceTest {
4746
val rcKeyListComma = "listComma"
4847
val rcKeyListColon = "listColon"
4948

50-
val rmc = new StandardRunModeContext(DefaultResourceContext)
51-
5249
implicit val converters = Converters.DefaultConverters
5350

5451
private[this] def _exists(context: StreamResourceContext, rc_path: String, rc_name: String) {
@@ -77,125 +74,51 @@ class ResourceTest {
7774
_exists(DefaultResourceContext, rcA_path, rcA_name)
7875
}
7976

80-
@Test
81-
def testExistsA_rmp {
82-
_exists(rmc.resourceContext, rcA_path, rcA_name)
83-
}
84-
8577
@Test
8678
def testExistsA2 {
8779
_exists(DefaultResourceContext / "", rcA_path, rcA_name)
8880
}
8981

90-
@Test
91-
def testExistsA2_rmp {
92-
_exists(rmc.resourceContext / "", rcA_path, rcA_name)
93-
}
94-
9582
@Test
9683
def testExistsB {
9784
_exists(DefaultResourceContext, rcB_path, rcB_name)
9885
}
9986

100-
@Test
101-
def testExistsB_rmp {
102-
_exists(rmc.resourceContext, rcB_path, rcB_name)
103-
}
104-
10587
@Test
10688
def testExistsB2 {
10789
_exists(DefaultResourceContext / "b", rcB_pathSeenFromB, rcB_name)
10890
}
10991

110-
@Test
111-
def testExistsB2_rmp {
112-
_exists(rmc.resourceContext / "b", rcB_pathSeenFromB, rcB_name)
113-
}
114-
11592
@Test
11693
def testExistsC {
11794
_exists(DefaultResourceContext, rcC_path, rcC_name)
11895
}
11996

120-
@Test
121-
def testExistsC_rmp {
122-
_exists(rmc.resourceContext, rcC_path, rcC_name)
123-
}
124-
12597
@Test
12698
def testExistsC2 {
12799
_exists(DefaultResourceContext / "b", rcC_pathSeenFromB, rcC_name)
128100
}
129101

130-
@Test
131-
def testExistsC2_rmp {
132-
_exists(rmc.resourceContext / "b", rcC_pathSeenFromB, rcC_name)
133-
}
134-
135102
@Test
136103
def testExistsC3 {
137104
_exists(DefaultResourceContext / "b" / "c", rcC_pathSeenFromC, rcC_name)
138105
}
139106

140-
@Test
141-
def testExistsC3_rmp {
142-
_exists(rmc.resourceContext / "b" / "c", rcC_pathSeenFromC, rcC_name)
143-
}
144-
145107
@Test
146108
def testContentOfA {
147109
_content(DefaultResourceContext, rcA_path, rcA_content)
148110
}
149111

150-
@Test
151-
def testContentOfA_rmp {
152-
_content(rmc.resourceContext, rcA_path, rcA_content)
153-
}
154-
155112
@Test
156113
def testContentOfB {
157114
_content(DefaultResourceContext, rcB_path, rcB_content)
158115
}
159116

160-
@Test
161-
def testContentOfB_rmp {
162-
_content(rmc.resourceContext, rcB_path, rcB_content)
163-
}
164-
165117
@Test
166118
def testContentOfC {
167119
_content(DefaultResourceContext, rcC_path, rcC_content)
168120
}
169121

170-
@Test
171-
def testContentOfC_rmp {
172-
_content(rmc.resourceContext, rcC_path, rcC_content)
173-
}
174-
175-
@Test
176-
def testActualRunMode {
177-
val runMode = rmc.runMode
178-
Assert.assertEquals(TestMode, runMode)
179-
}
180-
181-
@Test
182-
def testFakeRunMode {
183-
val saveValue = RunMode.RunModeSysProp.rawValue
184-
185-
try {
186-
// set new run.mode
187-
RunMode.RunModeSysProp.update(StageMode.name)
188-
// get a context that will pick up the new run.mode
189-
val rmc = new StandardRunModeContext(DefaultResourceContext)
190-
val runMode = rmc.runMode
191-
// And although we are in *test*, we infer *stage* because it was explicitly set as such!
192-
Assert.assertEquals(StageMode, runMode)
193-
} finally {
194-
// clean up the mess and let the other tests proceed accordingly
195-
RunMode.RunModeSysProp.update(saveValue)
196-
}
197-
}
198-
199122
@Test
200123
def testPropsGetList {
201124
val maybeProps = Props(rcConfProps)

0 commit comments

Comments
 (0)