Browse Source

all tests passing

Xcuello 5 years ago
parent
commit
f91e16bb95

+ 1
- 0
.idea/compiler.xml View File

7
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
7
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
8
         <outputRelativeToContentRoot value="true" />
8
         <outputRelativeToContentRoot value="true" />
9
         <module name="Jenkins" />
9
         <module name="Jenkins" />
10
+        <module name="JenkinsTest" />
10
       </profile>
11
       </profile>
11
     </annotationProcessing>
12
     </annotationProcessing>
12
   </component>
13
   </component>

+ 50
- 46
.idea/workspace.xml View File

2
 <project version="4">
2
 <project version="4">
3
   <component name="ChangeListManager">
3
   <component name="ChangeListManager">
4
     <list default="true" id="5fd01bf6-fab3-471b-a672-1f757eb938f8" name="Default Changelist" comment="">
4
     <list default="true" id="5fd01bf6-fab3-471b-a672-1f757eb938f8" name="Default Changelist" comment="">
5
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6
-      <change beforePath="$PROJECT_DIR$/target/classes/FizzBuzz.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/FizzBuzz.class" afterDir="false" />
5
+      <change beforePath="$PROJECT_DIR$/src/test/java/FizzBuzzTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/FizzBuzzTest.java" afterDir="false" />
7
     </list>
6
     </list>
8
     <ignored path="$PROJECT_DIR$/out/" />
7
     <ignored path="$PROJECT_DIR$/out/" />
9
     <ignored path="$PROJECT_DIR$/target/" />
8
     <ignored path="$PROJECT_DIR$/target/" />
35
         </counts>
34
         </counts>
36
       </usages-collector>
35
       </usages-collector>
37
     </session>
36
     </session>
37
+    <session id="2097505278">
38
+      <usages-collector id="statistics.lifecycle.project">
39
+        <counts>
40
+          <entry key="project.open.time.30" value="1" />
41
+          <entry key="project.opened" value="1" />
42
+        </counts>
43
+      </usages-collector>
44
+      <usages-collector id="statistics.file.extensions.edit">
45
+        <counts>
46
+          <entry key="java" value="1" />
47
+        </counts>
48
+      </usages-collector>
49
+      <usages-collector id="statistics.file.types.edit">
50
+        <counts>
51
+          <entry key="JAVA" value="1" />
52
+        </counts>
53
+      </usages-collector>
54
+    </session>
38
   </component>
55
   </component>
39
   <component name="FileEditorManager">
56
   <component name="FileEditorManager">
40
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
57
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
47
           </provider>
64
           </provider>
48
         </entry>
65
         </entry>
49
       </file>
66
       </file>
50
-      <file pinned="false" current-in-tab="true">
67
+      <file pinned="false" current-in-tab="false">
51
         <entry file="file://$PROJECT_DIR$/src/main/java/FizzBuzz.java">
68
         <entry file="file://$PROJECT_DIR$/src/main/java/FizzBuzz.java">
52
           <provider selected="true" editor-type-id="text-editor">
69
           <provider selected="true" editor-type-id="text-editor">
53
-            <state relative-caret-position="120">
54
-              <caret line="8" column="24" selection-start-line="8" selection-start-column="24" selection-end-line="8" selection-end-column="24" />
70
+            <state relative-caret-position="195">
71
+              <caret line="13" column="1" lean-forward="true" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
55
             </state>
72
             </state>
56
           </provider>
73
           </provider>
57
         </entry>
74
         </entry>
58
       </file>
75
       </file>
59
-      <file pinned="false" current-in-tab="false">
60
-        <entry file="file://$PROJECT_DIR$/build.xml">
61
-          <provider selected="true" editor-type-id="text-editor" />
62
-        </entry>
63
-      </file>
64
-      <file pinned="false" current-in-tab="false">
76
+      <file pinned="false" current-in-tab="true">
65
         <entry file="file://$PROJECT_DIR$/src/test/java/FizzBuzzTest.java">
77
         <entry file="file://$PROJECT_DIR$/src/test/java/FizzBuzzTest.java">
66
           <provider selected="true" editor-type-id="text-editor">
78
           <provider selected="true" editor-type-id="text-editor">
67
-            <state relative-caret-position="345">
68
-              <caret line="31" column="16" selection-start-line="31" selection-start-column="16" selection-end-line="31" selection-end-column="16" />
79
+            <state relative-caret-position="465">
80
+              <caret line="31" column="17" selection-start-line="31" selection-start-column="17" selection-end-line="31" selection-end-column="17" />
69
               <folding>
81
               <folding>
70
                 <element signature="imports" expanded="true" />
82
                 <element signature="imports" expanded="true" />
71
               </folding>
83
               </folding>
83
       <list>
95
       <list>
84
         <option value="$PROJECT_DIR$/pom.xml" />
96
         <option value="$PROJECT_DIR$/pom.xml" />
85
         <option value="$PROJECT_DIR$/src/main/java/FizzBuzz.java" />
97
         <option value="$PROJECT_DIR$/src/main/java/FizzBuzz.java" />
98
+        <option value="$PROJECT_DIR$/src/test/java/FizzBuzzTest.java" />
86
       </list>
99
       </list>
87
     </option>
100
     </option>
88
   </component>
101
   </component>
99
       </MavenImportingSettings>
112
       </MavenImportingSettings>
100
     </option>
113
     </option>
101
   </component>
114
   </component>
102
-  <component name="ProjectFrameBounds" fullScreen="true">
103
-    <option name="y" value="303" />
104
-    <option name="width" value="1240" />
105
-    <option name="height" value="777" />
115
+  <component name="ProjectFrameBounds">
116
+    <option name="y" value="23" />
117
+    <option name="width" value="1280" />
118
+    <option name="height" value="694" />
106
   </component>
119
   </component>
107
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
120
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
108
   <component name="ProjectView">
121
   <component name="ProjectView">
110
       <foldersAlwaysOnTop value="true" />
123
       <foldersAlwaysOnTop value="true" />
111
     </navigator>
124
     </navigator>
112
     <panes>
125
     <panes>
113
-      <pane id="PackagesPane" />
114
       <pane id="ProjectPane">
126
       <pane id="ProjectPane">
115
         <subPane>
127
         <subPane>
116
           <expand>
128
           <expand>
121
             <path>
133
             <path>
122
               <item name="JenkinsTest" type="b2602c69:ProjectViewProjectNode" />
134
               <item name="JenkinsTest" type="b2602c69:ProjectViewProjectNode" />
123
               <item name="Jenkins" type="462c0819:PsiDirectoryNode" />
135
               <item name="Jenkins" type="462c0819:PsiDirectoryNode" />
124
-              <item name=".idea" type="462c0819:PsiDirectoryNode" />
125
-            </path>
126
-            <path>
127
-              <item name="JenkinsTest" type="b2602c69:ProjectViewProjectNode" />
128
-              <item name="Jenkins" type="462c0819:PsiDirectoryNode" />
129
               <item name="src" type="462c0819:PsiDirectoryNode" />
136
               <item name="src" type="462c0819:PsiDirectoryNode" />
130
             </path>
137
             </path>
131
             <path>
138
             <path>
158
           <select />
165
           <select />
159
         </subPane>
166
         </subPane>
160
       </pane>
167
       </pane>
168
+      <pane id="PackagesPane" />
161
       <pane id="Scope" />
169
       <pane id="Scope" />
162
     </panes>
170
     </panes>
163
   </component>
171
   </component>
164
   <component name="PropertiesComponent">
172
   <component name="PropertiesComponent">
165
     <property name="WebServerToolWindowFactoryState" value="false" />
173
     <property name="WebServerToolWindowFactoryState" value="false" />
166
     <property name="aspect.path.notification.shown" value="true" />
174
     <property name="aspect.path.notification.shown" value="true" />
167
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1543683926917" />
175
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1543684937586" />
176
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
168
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
177
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
169
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
178
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
170
     <property name="project.structure.last.edited" value="SDKs" />
179
     <property name="project.structure.last.edited" value="SDKs" />
219
       <updated>1543607345787</updated>
228
       <updated>1543607345787</updated>
220
       <workItem from="1543607355822" duration="3372000" />
229
       <workItem from="1543607355822" duration="3372000" />
221
       <workItem from="1543682036630" duration="1027000" />
230
       <workItem from="1543682036630" duration="1027000" />
231
+      <workItem from="1543684599795" duration="247000" />
222
     </task>
232
     </task>
223
     <servers />
233
     <servers />
224
   </component>
234
   </component>
240
     </history-entry>
250
     </history-entry>
241
   </component>
251
   </component>
242
   <component name="TimeTrackingManager">
252
   <component name="TimeTrackingManager">
243
-    <option name="totallyTimeSpent" value="4399000" />
253
+    <option name="totallyTimeSpent" value="4646000" />
244
   </component>
254
   </component>
245
   <component name="ToolWindowManager">
255
   <component name="ToolWindowManager">
246
-    <frame x="0" y="0" width="1280" height="800" extended-state="0" />
247
-    <editor active="true" />
256
+    <frame x="0" y="23" width="1280" height="694" extended-state="0" />
248
     <layout>
257
     <layout>
249
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24555735" />
258
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24959612" />
250
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
259
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
251
       <window_info id="Image Layers" order="2" />
260
       <window_info id="Image Layers" order="2" />
252
       <window_info id="Designer" order="3" />
261
       <window_info id="Designer" order="3" />
255
       <window_info id="Favorites" order="6" side_tool="true" />
264
       <window_info id="Favorites" order="6" side_tool="true" />
256
       <window_info anchor="bottom" id="Message" order="0" />
265
       <window_info anchor="bottom" id="Message" order="0" />
257
       <window_info anchor="bottom" id="Find" order="1" />
266
       <window_info anchor="bottom" id="Find" order="1" />
258
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.36633664" />
267
+      <window_info anchor="bottom" id="Run" order="2" weight="0.36633664" />
259
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
268
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
260
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
269
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
261
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
270
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
262
       <window_info anchor="bottom" id="TODO" order="6" />
271
       <window_info anchor="bottom" id="TODO" order="6" />
263
       <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
272
       <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
264
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
273
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
265
-      <window_info anchor="bottom" id="Terminal" order="9" weight="0.22065064" />
274
+      <window_info anchor="bottom" id="Terminal" order="9" weight="0.2192691" />
266
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
275
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
267
       <window_info anchor="bottom" id="Messages" order="11" weight="0.32928064" />
276
       <window_info anchor="bottom" id="Messages" order="11" weight="0.32928064" />
268
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
277
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
269
-      <window_info anchor="right" id="Ant Build" order="1" visible="true" weight="0.24151857" />
278
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.24151857" />
270
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
279
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
271
       <window_info anchor="right" id="Palette" order="3" />
280
       <window_info anchor="right" id="Palette" order="3" />
272
       <window_info anchor="right" id="Capture Analysis" order="4" />
281
       <window_info anchor="right" id="Capture Analysis" order="4" />
285
   <component name="antWorkspaceConfiguration">
294
   <component name="antWorkspaceConfiguration">
286
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
295
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
287
     <option name="FILTER_TARGETS" value="false" />
296
     <option name="FILTER_TARGETS" value="false" />
288
-    <buildFile url="file://$PROJECT_DIR$/build.xml">
289
-      <expanded value="true" />
290
-    </buildFile>
291
   </component>
297
   </component>
292
   <component name="editorHistoryManager">
298
   <component name="editorHistoryManager">
299
+    <entry file="file://$PROJECT_DIR$/build.xml" />
300
+    <entry file="file://$PROJECT_DIR$/src/main/java/FizzBuzz.java">
301
+      <provider selected="true" editor-type-id="text-editor">
302
+        <state relative-caret-position="195">
303
+          <caret line="13" column="1" lean-forward="true" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
304
+        </state>
305
+      </provider>
306
+    </entry>
293
     <entry file="file://$PROJECT_DIR$/pom.xml">
307
     <entry file="file://$PROJECT_DIR$/pom.xml">
294
       <provider selected="true" editor-type-id="text-editor">
308
       <provider selected="true" editor-type-id="text-editor">
295
         <state relative-caret-position="75">
309
         <state relative-caret-position="75">
297
         </state>
311
         </state>
298
       </provider>
312
       </provider>
299
     </entry>
313
     </entry>
300
-    <entry file="file://$PROJECT_DIR$/build.xml">
301
-      <provider selected="true" editor-type-id="text-editor" />
302
-    </entry>
303
     <entry file="file://$PROJECT_DIR$/src/test/java/FizzBuzzTest.java">
314
     <entry file="file://$PROJECT_DIR$/src/test/java/FizzBuzzTest.java">
304
       <provider selected="true" editor-type-id="text-editor">
315
       <provider selected="true" editor-type-id="text-editor">
305
-        <state relative-caret-position="345">
306
-          <caret line="31" column="16" selection-start-line="31" selection-start-column="16" selection-end-line="31" selection-end-column="16" />
316
+        <state relative-caret-position="465">
317
+          <caret line="31" column="17" selection-start-line="31" selection-start-column="17" selection-end-line="31" selection-end-column="17" />
307
           <folding>
318
           <folding>
308
             <element signature="imports" expanded="true" />
319
             <element signature="imports" expanded="true" />
309
           </folding>
320
           </folding>
310
         </state>
321
         </state>
311
       </provider>
322
       </provider>
312
     </entry>
323
     </entry>
313
-    <entry file="file://$PROJECT_DIR$/src/main/java/FizzBuzz.java">
314
-      <provider selected="true" editor-type-id="text-editor">
315
-        <state relative-caret-position="120">
316
-          <caret line="8" column="24" selection-start-line="8" selection-start-column="24" selection-end-line="8" selection-end-column="24" />
317
-        </state>
318
-      </provider>
319
-    </entry>
320
   </component>
324
   </component>
321
   <component name="masterDetails">
325
   <component name="masterDetails">
322
     <states>
326
     <states>

+ 3
- 3
src/main/java/FizzBuzz.java View File

2
 
2
 
3
     public String fizzBuzz(int num){
3
     public String fizzBuzz(int num){
4
         if(num%3 == 0 && num%5 == 0){
4
         if(num%3 == 0 && num%5 == 0){
5
-            return "FizzBuzzes";
5
+            return "FizzBuzz";
6
         } else if (num%5 == 0){
6
         } else if (num%5 == 0){
7
-            return "Buzzes";
7
+            return "Buzz";
8
         } else if ((num%3 == 0)){
8
         } else if ((num%3 == 0)){
9
-            return "Fizzes";
9
+            return "Fizz";
10
         } else {
10
         } else {
11
             return Integer.toString(num);
11
             return Integer.toString(num);
12
         }
12
         }

+ 1
- 1
src/test/java/FizzBuzzTest.java View File

29
     }
29
     }
30
 
30
 
31
     @Test
31
     @Test
32
-    public void testFizzBuzz_else1(){
32
+    public void  testFizzBuzz_else1(){
33
         String actual = fb.fizzBuzz(2);
33
         String actual = fb.fizzBuzz(2);
34
         String expected = "2";
34
         String expected = "2";
35
 
35
 

BIN
target/classes/FizzBuzz.class View File


BIN
target/test-classes/FizzBuzzTest.class View File