Skip to content

Commit b1226f7

Browse files
authored
Merge pull request #4629 from h1alexbel/4530
bug(#4530): compact package names
2 parents a51ec68 + 806ad1f commit b1226f7

File tree

141 files changed

+333
-322
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+333
-322
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ argument: a copy of the object `sprintf`:
116116
# Says hello to Jeff.
117117
[] > app
118118
QQ.io.stdout > @
119-
QQ.txt.sprintf
119+
QQ.tt.sprintf
120120
"Hello, %s!"
121121
* "Jeffrey"
122122
```
@@ -127,7 +127,7 @@ This program can be written using horizontal notation:
127127

128128
```eo
129129
+alias org.eolang.io.stdout
130-
+alias org.eolang.txt.sprintf
130+
+alias org.eolang.tt.sprintf
131131
132132
# Also says hello to Jeff.
133133
[] > app
@@ -148,7 +148,7 @@ inside `app` and use it to build the output string:
148148
[] > app
149149
QQ.io.stdout (msg "Jeffrey") > @
150150
[name] > msg
151-
QQ.txt.sprintf "Hello, %s!" (* name) > @
151+
QQ.tt.sprintf "Hello, %s!" (* name) > @
152152
```
153153

154154
Now, the object `app` has two "bound" attributes: `@` and `msg`. The attribute
@@ -169,7 +169,7 @@ This is how you iterate:
169169
[i] >>
170170
seq * > @
171171
QQ.io.stdout
172-
QQ.txt.sprintf *1
172+
QQ.tt.sprintf *1
173173
"%d x %1$d = %d\n"
174174
x
175175
x.as-number.times x

eo-integration-tests/src/test/java/integration/JarIT.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,24 @@
1919
import java.nio.file.Paths;
2020
import org.hamcrest.MatcherAssert;
2121
import org.hamcrest.Matchers;
22+
import org.junit.jupiter.api.Disabled;
2223
import org.junit.jupiter.api.Test;
2324
import org.junit.jupiter.api.extension.ExtendWith;
2425

2526
/**
2627
* Integration test that runs simple EO program from packaged jar.
2728
* @since 0.54
29+
* @todo #4530:20min Enable JarIT#runsProgramFromJar after new EO package names will be released.
30+
* Now, in test, we still trying to run it on previous package names: `sys`, `txt`, and so on,
31+
* however, we refactored package names to be more compact: `sm`, `tt`, etc. Once it will be
32+
* released, we must enable this test, it should pass. These tests should be enabled as well:
33+
* `SnippetIT#runsAllSnippets`, `ReadmeSnippetsIT#validatesReadmeSnippets`.
2834
*/
2935
@SuppressWarnings("JTCOP.RuleAllTestsHaveProductionClass")
3036
@ExtendWith(MktmpResolver.class)
3137
final class JarIT {
3238

39+
@Disabled
3340
@Test
3441
@ExtendWith(WeAreOnline.class)
3542
@ExtendWith(MayBeSlow.class)

eo-integration-tests/src/test/java/integration/ReadmeSnippetsIT.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.util.stream.Stream;
2121
import org.hamcrest.MatcherAssert;
2222
import org.hamcrest.Matchers;
23+
import org.junit.jupiter.api.Disabled;
2324
import org.junit.jupiter.api.Tag;
2425
import org.junit.jupiter.api.extension.ExtendWith;
2526
import org.junit.jupiter.params.ParameterizedTest;
@@ -33,6 +34,7 @@
3334
@SuppressWarnings("JTCOP.RuleAllTestsHaveProductionClass")
3435
final class ReadmeSnippetsIT {
3536

37+
@Disabled
3638
@Tag("snippets")
3739
@ParameterizedTest
3840
@ExtendWith(MktmpResolver.class)

eo-integration-tests/src/test/java/integration/SnippetIT.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.hamcrest.MatcherAssert;
2323
import org.hamcrest.Matchers;
2424
import org.junit.jupiter.api.Assumptions;
25+
import org.junit.jupiter.api.Disabled;
2526
import org.junit.jupiter.api.extension.ExtendWith;
2627
import org.junit.jupiter.params.ParameterizedTest;
2728

@@ -32,6 +33,7 @@
3233
@SuppressWarnings("JTCOP.RuleAllTestsHaveProductionClass")
3334
@ExtendWith(MktmpResolver.class)
3435
final class SnippetIT {
36+
@Disabled
3537
@ParameterizedTest
3638
@ExtendWith(WeAreOnline.class)
3739
@ExtendWith(MayBeSlow.class)

eo-integration-tests/src/test/resources/org/eolang/snippets/decorated.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ file: org/eolang/snippets/foo.eo
88
args: ["org.eolang.snippets.foo"]
99
eo: |
1010
+alias org.eolang.io.stdout
11-
+decorate string txt.text
11+
+decorate string tt.text
1212
+package org.eolang.snippets
1313
1414
# No comments.

eo-integration-tests/src/test/resources/org/eolang/snippets/fibo.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ file: org/eolang/snippets/fibo.eo
88
args: ["org.eolang.snippets.fibo"]
99
eo: |
1010
+alias org.eolang.io.stdout
11-
+alias org.eolang.txt.sprintf
11+
+alias org.eolang.tt.sprintf
1212
+package org.eolang.snippets
1313
1414
# No comments.

eo-integration-tests/src/test/resources/org/eolang/snippets/simple.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ args: ["simple", "Jeff"]
1212
target: "eoc"
1313
eo: |
1414
+alias org.eolang.io.stdout
15-
+alias org.eolang.txt.sprintf
15+
+alias org.eolang.tt.sprintf
1616
1717
# No comments.
1818
[args] > simple

eo-maven-plugin/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ whether it's leap or not:
1717
not. (eq. (mod. y 100) 0)
1818
eq. (mod. y 400) 0
1919
QQ.io.stdout > @
20-
QQ.txt.sprintf
20+
QQ.tt.sprintf
2121
"%d is %sa leap year!"
2222
(args.get 0).as-int > year!
2323
if (leap year:y) "" "not "

eo-maven-plugin/src/it/fibonacci/src/main/eo/org/eolang/examples/app.eo

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
+package org.eolang.examples
55
+alias org.eolang.examples.fibonacci
66
+alias org.eolang.io.stdout
7-
+alias org.eolang.txt.sprintf
8-
+alias org.eolang.txt.sscanf
7+
+alias org.eolang.tt.sprintf
8+
+alias org.eolang.tt.sscanf
99
+architect yegor256@gmail.com
1010

1111
# Application.
1212
[args] > app
1313
number > n
1414
at. > nn!
15-
QQ.txt.sscanf
15+
QQ.tt.sscanf
1616
"%d"
1717
args.at 0
1818
0
1919
at. > e!
20-
QQ.txt.sscanf
20+
QQ.tt.sscanf
2121
"%d"
2222
args.at 1
2323
0

eo-maven-plugin/src/main/java/org/eolang/maven/MjUnspile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public final class MjUnspile extends MjSafe {
4141
* Inner auto generated classes.
4242
* <p>These globs are used for inner classes which may look like:
4343
* - EOorg/EOeolang/EOnumber$1$2$4.class
44-
* - EOorg/EOeolang/EOsys/EOsocket$EOΦorgeolangsyssocketα0ρ.class</p>
44+
* - EOorg/EOeolang/EOsm/EOsocket$EOΦorgeolangsyssocketα0ρ.class</p>
4545
*/
4646
private static final Collection<String> INNER = List.of(
4747
"**/EO*$[1-9]*.class", "**/*$EOΦ*.class"

0 commit comments

Comments
 (0)