Browse Source

passing tests

Demetrius Murray 5 years ago
parent
commit
fcb6e02d85
4 changed files with 44 additions and 24 deletions
  1. 0
    6
      .idea/vcs.xml
  2. 41
    15
      .idea/workspace.xml
  3. 3
    3
      src/main/java/FizzBuzz.java
  4. BIN
      target/classes/FizzBuzz.class

+ 0
- 6
.idea/vcs.xml View File

1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<project version="4">
3
-  <component name="VcsDirectoryMappings">
4
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
5
-  </component>
6
-</project>

+ 41
- 15
.idea/workspace.xml View File

1
 <?xml version="1.0" encoding="UTF-8"?>
1
 <?xml version="1.0" encoding="UTF-8"?>
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$/src/main/java/FizzBuzz.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/FizzBuzz.java" afterDir="false" />
6
+    </list>
5
     <ignored path="$PROJECT_DIR$/out/" />
7
     <ignored path="$PROJECT_DIR$/out/" />
6
     <ignored path="$PROJECT_DIR$/target/" />
8
     <ignored path="$PROJECT_DIR$/target/" />
7
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
23
           <entry key="JAVA" value="2" />
25
           <entry key="JAVA" value="2" />
24
         </counts>
26
         </counts>
25
       </usages-collector>
27
       </usages-collector>
28
+      <usages-collector id="statistics.file.types.edit">
29
+        <counts>
30
+          <entry key="JAVA" value="7" />
31
+        </counts>
32
+      </usages-collector>
26
     </session>
33
     </session>
27
   </component>
34
   </component>
28
   <component name="FileEditorManager">
35
   <component name="FileEditorManager">
32
           <provider selected="true" editor-type-id="text-editor" />
39
           <provider selected="true" editor-type-id="text-editor" />
33
         </entry>
40
         </entry>
34
       </file>
41
       </file>
35
-      <file pinned="false" current-in-tab="false">
42
+      <file pinned="false" current-in-tab="true">
36
         <entry file="file://$PROJECT_DIR$/src/main/java/FizzBuzz.java">
43
         <entry file="file://$PROJECT_DIR$/src/main/java/FizzBuzz.java">
37
-          <provider selected="true" editor-type-id="text-editor" />
44
+          <provider selected="true" editor-type-id="text-editor">
45
+            <state relative-caret-position="90">
46
+              <caret line="6" column="24" selection-start-line="6" selection-start-column="24" selection-end-line="6" selection-end-column="24" />
47
+            </state>
48
+          </provider>
38
         </entry>
49
         </entry>
39
       </file>
50
       </file>
40
-      <file pinned="false" current-in-tab="true">
51
+      <file pinned="false" current-in-tab="false">
41
         <entry file="file://$PROJECT_DIR$/src/test/java/FizzBuzzTest.java">
52
         <entry file="file://$PROJECT_DIR$/src/test/java/FizzBuzzTest.java">
42
           <provider selected="true" editor-type-id="text-editor">
53
           <provider selected="true" editor-type-id="text-editor">
43
             <state relative-caret-position="435">
54
             <state relative-caret-position="435">
54
   <component name="Git.Settings">
65
   <component name="Git.Settings">
55
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
66
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
56
   </component>
67
   </component>
68
+  <component name="IdeDocumentHistory">
69
+    <option name="CHANGED_PATHS">
70
+      <list>
71
+        <option value="$PROJECT_DIR$/src/main/java/FizzBuzz.java" />
72
+      </list>
73
+    </option>
74
+  </component>
57
   <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
75
   <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
58
   <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
76
   <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
59
   <component name="JsGulpfileManager">
77
   <component name="JsGulpfileManager">
133
   <component name="PropertiesComponent">
151
   <component name="PropertiesComponent">
134
     <property name="WebServerToolWindowFactoryState" value="false" />
152
     <property name="WebServerToolWindowFactoryState" value="false" />
135
     <property name="aspect.path.notification.shown" value="true" />
153
     <property name="aspect.path.notification.shown" value="true" />
136
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1543607741691" />
154
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1543611320967" />
137
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
155
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
138
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
156
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
139
-    <property name="project.structure.last.edited" value="Modules" />
140
-    <property name="project.structure.proportion" value="0.0" />
141
-    <property name="project.structure.side.proportion" value="0.0" />
157
+    <property name="project.structure.last.edited" value="SDKs" />
158
+    <property name="project.structure.proportion" value="0.15" />
159
+    <property name="project.structure.side.proportion" value="0.2" />
142
   </component>
160
   </component>
143
   <component name="RecentsManager">
161
   <component name="RecentsManager">
144
     <key name="CopyClassDialog.RECENTS_KEY">
162
     <key name="CopyClassDialog.RECENTS_KEY">
182
       <option name="number" value="Default" />
200
       <option name="number" value="Default" />
183
       <option name="presentableId" value="Default" />
201
       <option name="presentableId" value="Default" />
184
       <updated>1543607345787</updated>
202
       <updated>1543607345787</updated>
185
-      <workItem from="1543607355822" duration="282000" />
203
+      <workItem from="1543607355822" duration="1902000" />
186
     </task>
204
     </task>
187
     <servers />
205
     <servers />
188
   </component>
206
   </component>
190
     <history-entry file="FizzBuzzTest - 2018.11.30 at 14h 50m 54s.xml">
208
     <history-entry file="FizzBuzzTest - 2018.11.30 at 14h 50m 54s.xml">
191
       <configuration name="FizzBuzzTest" configurationId="JUnit" />
209
       <configuration name="FizzBuzzTest" configurationId="JUnit" />
192
     </history-entry>
210
     </history-entry>
211
+    <history-entry file="FizzBuzzTest - 2018.11.30 at 14h 56m 17s.xml">
212
+      <configuration name="FizzBuzzTest" configurationId="JUnit" />
213
+    </history-entry>
193
   </component>
214
   </component>
194
   <component name="TimeTrackingManager">
215
   <component name="TimeTrackingManager">
195
-    <option name="totallyTimeSpent" value="282000" />
216
+    <option name="totallyTimeSpent" value="1902000" />
196
   </component>
217
   </component>
197
   <component name="ToolWindowManager">
218
   <component name="ToolWindowManager">
198
     <frame x="0" y="23" width="1240" height="777" extended-state="6" />
219
     <frame x="0" y="23" width="1240" height="777" extended-state="6" />
208
       <window_info anchor="bottom" id="Messages" weight="0.32930514" />
229
       <window_info anchor="bottom" id="Messages" weight="0.32930514" />
209
       <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
230
       <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
210
       <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
231
       <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
211
-      <window_info anchor="bottom" id="Terminal" />
232
+      <window_info active="true" anchor="bottom" id="Terminal" visible="true" weight="0.32930514" />
212
       <window_info anchor="bottom" id="Event Log" side_tool="true" />
233
       <window_info anchor="bottom" id="Event Log" side_tool="true" />
213
       <window_info anchor="bottom" id="Message" order="0" />
234
       <window_info anchor="bottom" id="Message" order="0" />
214
       <window_info anchor="bottom" id="Find" order="1" />
235
       <window_info anchor="bottom" id="Find" order="1" />
215
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.26283988" />
236
+      <window_info anchor="bottom" id="Run" order="2" weight="0.26283988" />
216
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
237
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
217
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
238
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
218
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
239
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
238
     <entry file="file://$PROJECT_DIR$/pom.xml">
259
     <entry file="file://$PROJECT_DIR$/pom.xml">
239
       <provider selected="true" editor-type-id="text-editor" />
260
       <provider selected="true" editor-type-id="text-editor" />
240
     </entry>
261
     </entry>
241
-    <entry file="file://$PROJECT_DIR$/src/main/java/FizzBuzz.java">
242
-      <provider selected="true" editor-type-id="text-editor" />
243
-    </entry>
244
     <entry file="file://$PROJECT_DIR$/src/test/java/FizzBuzzTest.java">
262
     <entry file="file://$PROJECT_DIR$/src/test/java/FizzBuzzTest.java">
245
       <provider selected="true" editor-type-id="text-editor">
263
       <provider selected="true" editor-type-id="text-editor">
246
         <state relative-caret-position="435">
264
         <state relative-caret-position="435">
251
         </state>
269
         </state>
252
       </provider>
270
       </provider>
253
     </entry>
271
     </entry>
272
+    <entry file="file://$PROJECT_DIR$/src/main/java/FizzBuzz.java">
273
+      <provider selected="true" editor-type-id="text-editor">
274
+        <state relative-caret-position="90">
275
+          <caret line="6" column="24" selection-start-line="6" selection-start-column="24" selection-end-line="6" selection-end-column="24" />
276
+        </state>
277
+      </provider>
278
+    </entry>
254
   </component>
279
   </component>
255
   <component name="masterDetails">
280
   <component name="masterDetails">
256
     <states>
281
     <states>
328
       </state>
353
       </state>
329
       <state key="ProjectLibrariesConfigurable.UI">
354
       <state key="ProjectLibrariesConfigurable.UI">
330
         <settings>
355
         <settings>
356
+          <last-edited>Maven: junit:junit:4.13-beta-1</last-edited>
331
           <splitter-proportions>
357
           <splitter-proportions>
332
             <option name="proportions">
358
             <option name="proportions">
333
               <list>
359
               <list>

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

4
         if(num%3 == 0 && num%5 == 0){
4
         if(num%3 == 0 && num%5 == 0){
5
             return "FizzBuzz";
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+1);
11
+            return Integer.toString(num);
12
         }
12
         }
13
     }
13
     }
14
 }
14
 }

BIN
target/classes/FizzBuzz.class View File