Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] feat(#3461): Use Expect for EOnumber Atoms #3789

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions eo-runtime/src/main/java/EOorg/EOeolang/EOnumber$EOplus.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

import org.eolang.AtVoid;
import org.eolang.Atom;
import org.eolang.Expect;
import org.eolang.Attr;
import org.eolang.Data;
import org.eolang.Dataized;
Expand All @@ -56,11 +57,11 @@ public final class EOnumber$EOplus extends PhDefault implements Atom {

@Override
public Phi lambda() {
return new Data.ToPhi(
Double.sum(
new Dataized(this.take(Attr.RHO)).asNumber(),
new Dataized(this.take("x")).asNumber()
)
);
Double left = new Dataized(this.take(Attr.RHO)).asNumber();
Double right = Expect.at(this, "x")
.that(phi -> new Dataized(phi).asNumber())
.otherwise("number.plus expects its second argument to be a number")
.it();
return new Data.ToPhi(Double.sum(left, right));
}
}
72 changes: 72 additions & 0 deletions eo-runtime/src/test/java/EOorg/EOeolang/EOnumber$EOplusTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2016-2025 Objectionary.com
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/

/*
* @checkstyle PackageNameCheck (10 lines)
* @checkstyle TrailingCommentCheck (3 lines)
*/
package EOorg.EOeolang; // NOPMD

import org.eolang.Attr;
import org.eolang.Data;
import org.eolang.Dataized;
import org.eolang.ExAbstract;
import org.eolang.PhWith;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

/**
* Test case for {@link EOnumber$EOplus}.
*
* @since 0.51
* @checkstyle TypeNameCheck (3 lines)
*/
@SuppressWarnings("PMD.AvoidDollarSigns")
final class EOnumber$EOplusTest {

@Test
void throwsCorrectError() {
MatcherAssert.assertThat(
"the message in the error is correct",
Assertions.assertThrows(
ExAbstract.class,
() -> new Dataized(
new PhWith(
new PhWith(
new EOnumber$EOplus(),
Attr.RHO,
new Data.ToPhi(42)
),
"x",
new Data.ToPhi(true)
)
).take(),
"addition with TRUE fails with a proper message that explains what happened"
).getMessage(),
Matchers.containsString("number.plus expects its second argument to be a number")
);
}
}
Loading